]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 08:43:48 +0000 (01:43 -0700)]
Merge branch 'pull'

12 years agolanguage issues in enotify
friendica [Mon, 26 Mar 2012 08:43:26 +0000 (01:43 -0700)]
language issues in enotify

12 years agosmall fix in diabook :: add local friendica to right_aside
tommy tomson [Mon, 26 Mar 2012 08:33:28 +0000 (10:33 +0200)]
small fix in diabook :: add local friendica to right_aside

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 07:53:32 +0000 (00:53 -0700)]
Merge branch 'pull'

12 years agocomix screenshot
friendica [Mon, 26 Mar 2012 07:52:54 +0000 (00:52 -0700)]
comix screenshot

12 years agomore theme screenshots
friendica [Mon, 26 Mar 2012 07:47:52 +0000 (00:47 -0700)]
more theme screenshots

12 years agoMerge pull request #171 from simonlnu/master
Simon [Mon, 26 Mar 2012 07:41:22 +0000 (00:41 -0700)]
Merge pull request #171 from simonlnu/master

changes in contact_edit.tpl

12 years ago[fix] contact_edit.tpl syntax; reduce cols to fit better
Simon L'nu [Mon, 26 Mar 2012 07:39:06 +0000 (03:39 -0400)]
[fix] contact_edit.tpl syntax; reduce cols to fit better

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 07:38:19 +0000 (03:38 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  add screenshots to diabook

* master:

12 years agoadd screenshots to diabook
tommy tomson [Mon, 26 Mar 2012 07:37:14 +0000 (09:37 +0200)]
add screenshots to diabook

12 years agoMerge pull request #170 from simonlnu/master
Simon [Mon, 26 Mar 2012 07:02:51 +0000 (00:02 -0700)]
Merge pull request #170 from simonlnu/master

fix search box in dispys

12 years agofix the search box
Simon L'nu [Mon, 26 Mar 2012 07:01:13 +0000 (03:01 -0400)]
fix the search box

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 06:51:40 +0000 (02:51 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  small fix
  don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.
  position the theme-preview on settings page
  more wordsmithing of the Friendica invitation email
  screenshot gallery
  theme preview for end users

* master:

12 years agosmall fix
tommy tomson [Mon, 26 Mar 2012 05:02:27 +0000 (07:02 +0200)]
small fix

12 years agodon't include friend suggestions for people with the same name as current contacts...
friendica [Mon, 26 Mar 2012 04:43:17 +0000 (21:43 -0700)]
don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin.

12 years agoposition the theme-preview on settings page
friendica [Mon, 26 Mar 2012 04:12:10 +0000 (21:12 -0700)]
position the theme-preview on settings page

12 years agomore wordsmithing of the Friendica invitation email
friendica [Mon, 26 Mar 2012 03:52:34 +0000 (20:52 -0700)]
more wordsmithing of the Friendica invitation email

12 years agoscreenshot gallery
friendica [Mon, 26 Mar 2012 03:08:28 +0000 (20:08 -0700)]
screenshot gallery

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 02:48:17 +0000 (19:48 -0700)]
Merge branch 'pull'

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 02:47:56 +0000 (22:47 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  typo datarry -> datarray

* master:

12 years agoMerge pull request #167 from unary/typo
Simon [Mon, 26 Mar 2012 02:47:39 +0000 (19:47 -0700)]
Merge pull request #167 from unary/typo

typo datarry -> datarray

12 years agoMerge pull request #169 from simonlnu/master
Simon [Mon, 26 Mar 2012 02:46:59 +0000 (19:46 -0700)]
Merge pull request #169 from simonlnu/master

search box

12 years agoadd in the search box
Simon L'nu [Mon, 26 Mar 2012 02:45:44 +0000 (22:45 -0400)]
add in the search box

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 26 Mar 2012 02:40:24 +0000 (22:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  theme screenshots

* master:

12 years agotheme preview for end users
friendica [Mon, 26 Mar 2012 02:05:14 +0000 (19:05 -0700)]
theme preview for end users

12 years agoMerge branch 'pull'
friendica [Mon, 26 Mar 2012 01:19:58 +0000 (18:19 -0700)]
Merge branch 'pull'

12 years agotheme screenshots
friendica [Mon, 26 Mar 2012 00:55:43 +0000 (17:55 -0700)]
theme screenshots

12 years agominor fix to dispy theme.php
Simon L'nu [Sun, 25 Mar 2012 21:13:24 +0000 (17:13 -0400)]
minor fix to dispy theme.php

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 25 Mar 2012 21:07:43 +0000 (17:07 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #168 from simonlnu/master
Simon [Sun, 25 Mar 2012 21:07:33 +0000 (14:07 -0700)]
Merge pull request #168 from simonlnu/master

fix dispy-dark

12 years agourgent fix to dispy-dark theme.php
Simon L'nu [Sun, 25 Mar 2012 21:06:38 +0000 (17:06 -0400)]
urgent fix to dispy-dark theme.php

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 25 Mar 2012 21:06:17 +0000 (17:06 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  small fixes
  enotify plugin hook
  NOTIFY_SYSTEM

* master:

12 years agotypo datarry -> datarray
Michael Johnston [Sun, 25 Mar 2012 20:00:11 +0000 (16:00 -0400)]
typo datarry -> datarray

12 years agosmall fixes
tommy tomson [Sun, 25 Mar 2012 17:43:42 +0000 (19:43 +0200)]
small fixes

12 years agoenotify plugin hook
friendica [Sun, 25 Mar 2012 12:06:11 +0000 (05:06 -0700)]
enotify plugin hook

12 years agoNOTIFY_SYSTEM
friendica [Sun, 25 Mar 2012 11:37:09 +0000 (04:37 -0700)]
NOTIFY_SYSTEM

12 years agoMerge pull request #166 from simonlnu/master
Simon [Sun, 25 Mar 2012 07:32:55 +0000 (00:32 -0700)]
Merge pull request #166 from simonlnu/master

fpostit; up versions to 1.0;

12 years agodispy-dark not experimental. start implementing fpostit
Simon L'nu [Sun, 25 Mar 2012 07:22:16 +0000 (03:22 -0400)]
dispy-dark not experimental. start implementing fpostit

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 25 Mar 2012 07:18:21 +0000 (03:18 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:

12 years agoMerge pull request #165 from tomtom84/master
tomtom84 [Sun, 25 Mar 2012 06:50:05 +0000 (23:50 -0700)]
Merge pull request #165 from tomtom84/master

fixes in diabook-derivates

12 years agomove community_pages to right_aside, fixes in css
tommy tomson [Sun, 25 Mar 2012 06:47:17 +0000 (08:47 +0200)]
move community_pages to right_aside, fixes in css

12 years agoMerge branch 'pull'
friendica [Sun, 25 Mar 2012 06:05:33 +0000 (23:05 -0700)]
Merge branch 'pull'

12 years agoimproved the inivitations and added a bit of sales pitch.
friendica [Sun, 25 Mar 2012 06:04:18 +0000 (23:04 -0700)]
improved the inivitations and added a bit of sales pitch.

12 years agoincrease version to 1.0 for dispys \o/
Simon L'nu [Sun, 25 Mar 2012 05:12:28 +0000 (01:12 -0400)]
increase version to 1.0 for dispys \o/

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #164 from simonlnu/master
Simon [Sun, 25 Mar 2012 05:04:23 +0000 (22:04 -0700)]
Merge pull request #164 from simonlnu/master

implement filer/file-as

12 years agoimplement filer/file-as
Simon L'nu [Sun, 25 Mar 2012 05:01:59 +0000 (01:01 -0400)]
implement filer/file-as

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 25 Mar 2012 04:59:25 +0000 (00:59 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bug #329 - compress the plugin list on the friendica info page
  bug #346 - add oembed maxwidth to oembed request

* master:

12 years agobug #329 - compress the plugin list on the friendica info page
friendica [Sun, 25 Mar 2012 04:50:04 +0000 (21:50 -0700)]
bug #329 - compress the plugin list on the friendica info page

12 years agobug #346 - add oembed maxwidth to oembed request
friendica [Sun, 25 Mar 2012 04:26:50 +0000 (21:26 -0700)]
bug #346 - add oembed maxwidth to oembed request

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 24 Mar 2012 23:38:54 +0000 (19:38 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  prevent duplicate friend suggestions
  block filed items from deletion
  add the bang
  network filter is now a permission group
  small fix in css
  add right_aside to diabook-blue
  add connectable services to right_aside
  add PostIt to right_aside, fixes in css

* master:

12 years agoprevent duplicate friend suggestions
friendica [Sat, 24 Mar 2012 22:53:53 +0000 (15:53 -0700)]
prevent duplicate friend suggestions

12 years agoblock filed items from deletion
friendica [Sat, 24 Mar 2012 11:16:27 +0000 (04:16 -0700)]
block filed items from deletion

12 years agoadd the bang
friendica [Sat, 24 Mar 2012 10:11:45 +0000 (03:11 -0700)]
add the bang

12 years agoMerge branch 'pull'
friendica [Sat, 24 Mar 2012 09:32:15 +0000 (02:32 -0700)]
Merge branch 'pull'

12 years agonetwork filter is now a permission group
friendica [Sat, 24 Mar 2012 08:33:50 +0000 (01:33 -0700)]
network filter is now a permission group

12 years agosmall fix in css
tommy tomson [Sat, 24 Mar 2012 07:56:26 +0000 (08:56 +0100)]
small fix in css

12 years agoMerge pull request #163 from tomtom84/master
tomtom84 [Sat, 24 Mar 2012 07:15:31 +0000 (00:15 -0700)]
Merge pull request #163 from tomtom84/master

fixes in diabook-derivates

12 years agoadd right_aside to diabook-blue
tommy tomson [Sat, 24 Mar 2012 07:13:48 +0000 (08:13 +0100)]
add right_aside to diabook-blue

12 years agoMerge pull request #162 from tomtom84/master
tomtom84 [Sat, 24 Mar 2012 05:20:25 +0000 (22:20 -0700)]
Merge pull request #162 from tomtom84/master

fixes in theme diabook

12 years agoadd connectable services to right_aside
tommy tomson [Sat, 24 Mar 2012 05:17:14 +0000 (06:17 +0100)]
add connectable services to right_aside

12 years agoMerge pull request #161 from tomtom84/master
tomtom84 [Sat, 24 Mar 2012 03:06:48 +0000 (20:06 -0700)]
Merge pull request #161 from tomtom84/master

fixes in theme diabook

12 years agoadd PostIt to right_aside, fixes in css
tommy tomson [Sat, 24 Mar 2012 03:05:21 +0000 (04:05 +0100)]
add PostIt to right_aside, fixes in css

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 23 Mar 2012 14:41:55 +0000 (10:41 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (25 commits)
  diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
  user settings: don't show emoticons
  fix in css right_aside
  small fix
  fix 1024resolution
  add right_aside to theme diabook
  ability to change tags in edited posts
  normalise comparison link on delegation page
  quattro(-green) styling the 'filed under: remove' text
  it's only item.filer ;-)
  non static filer text
  new lines removed
  removed some new lines to cut down number of changed files
  removed unneccessary stuff
  removed problem from previous commit
  tests for the template engine
  adding filer functionality to quattro(-green)
  missing tooltip for "file as"
  prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms
  add file_as-option to diabook-derivates
  ...

* master:

12 years agoMerge pull request #160 from fabrixxm/master
tomtom84 [Fri, 23 Mar 2012 14:41:32 +0000 (07:41 -0700)]
Merge pull request #160 from fabrixxm/master

work on diabook theme and settings

12 years agodiabook: theme.php
Fabio Comuni [Fri, 23 Mar 2012 13:09:06 +0000 (14:09 +0100)]
diabook: theme.php
remove code duplication
last photos check for user "hidewall"
remove unneeded regex
move js code to close popup in main.js (missing stop event propagation in popup links)

12 years agouser settings: don't show emoticons
Fabio Comuni [Fri, 23 Mar 2012 11:07:22 +0000 (12:07 +0100)]
user settings: don't show emoticons

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Fri, 23 Mar 2012 09:45:10 +0000 (10:45 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agofix in css right_aside
tommy tomson [Fri, 23 Mar 2012 09:16:11 +0000 (10:16 +0100)]
fix in css right_aside

12 years agosmall fix
tommy tomson [Fri, 23 Mar 2012 06:28:48 +0000 (07:28 +0100)]
small fix

12 years agoMerge pull request #159 from tomtom84/master
tomtom84 [Fri, 23 Mar 2012 06:03:55 +0000 (23:03 -0700)]
Merge pull request #159 from tomtom84/master

fixes in theme diabook

12 years agofix 1024resolution
tommy tomson [Fri, 23 Mar 2012 06:02:21 +0000 (07:02 +0100)]
fix 1024resolution

12 years agoMerge pull request #158 from tomtom84/master
friendica [Fri, 23 Mar 2012 03:19:44 +0000 (20:19 -0700)]
Merge pull request #158 from tomtom84/master

add right_aside to theme diabook ... need author

12 years agoadd right_aside to theme diabook
tommy tomson [Fri, 23 Mar 2012 01:36:34 +0000 (02:36 +0100)]
add right_aside to theme diabook

12 years agoability to change tags in edited posts
friendica [Thu, 22 Mar 2012 23:17:10 +0000 (16:17 -0700)]
ability to change tags in edited posts

12 years agoMerge remote-tracking branch 'friendica/master'
Fabio Comuni [Thu, 22 Mar 2012 13:56:23 +0000 (14:56 +0100)]
Merge remote-tracking branch 'friendica/master'

12 years agoMerge branch 'pull'
friendica [Thu, 22 Mar 2012 13:20:32 +0000 (06:20 -0700)]
Merge branch 'pull'

12 years agonormalise comparison link on delegation page
friendica [Thu, 22 Mar 2012 13:19:27 +0000 (06:19 -0700)]
normalise comparison link on delegation page

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 13:10:53 +0000 (14:10 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoquattro(-green) styling the 'filed under: remove' text
Tobias Diekershoff [Thu, 22 Mar 2012 13:09:21 +0000 (14:09 +0100)]
quattro(-green) styling the 'filed under: remove' text

12 years agoMerge pull request #157 from campino/master
friendica [Thu, 22 Mar 2012 12:49:08 +0000 (05:49 -0700)]
Merge pull request #157 from campino/master

Tests for the template engine

12 years agoit's only item.filer ;-)
Tobias Diekershoff [Thu, 22 Mar 2012 12:46:05 +0000 (13:46 +0100)]
it's only item.filer ;-)

12 years agoMerge branch 'quattrofiler'
Tobias Diekershoff [Thu, 22 Mar 2012 12:42:10 +0000 (13:42 +0100)]
Merge branch 'quattrofiler'

12 years agonon static filer text
Tobias Diekershoff [Thu, 22 Mar 2012 12:41:41 +0000 (13:41 +0100)]
non static filer text

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 12:38:59 +0000 (13:38 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agonew lines removed
Alexander Kampmann [Thu, 22 Mar 2012 12:05:34 +0000 (13:05 +0100)]
new lines removed

12 years agoremoved some new lines to cut down number of changed files
Alexander Kampmann [Thu, 22 Mar 2012 12:03:28 +0000 (13:03 +0100)]
removed some new lines to cut down number of changed files

12 years agoremoved unneccessary stuff
Alexander Kampmann [Thu, 22 Mar 2012 11:52:24 +0000 (12:52 +0100)]
removed unneccessary stuff

12 years agoMerge branch 'master' of git://github.com/friendica/friendica
Alexander Kampmann [Thu, 22 Mar 2012 11:50:02 +0000 (12:50 +0100)]
Merge branch 'master' of git://github.com/friendica/friendica

Conflicts:
boot.php
database.sql
include/template_processor.php
update.php

12 years agoremoved problem from previous commit
Alexander Kampmann [Thu, 22 Mar 2012 11:45:11 +0000 (12:45 +0100)]
removed problem from previous commit

12 years agotests for the template engine
Alexander Kampmann [Thu, 22 Mar 2012 11:43:03 +0000 (12:43 +0100)]
tests for the template engine

12 years agoadding filer functionality to quattro(-green)
Tobias Diekershoff [Thu, 22 Mar 2012 11:41:51 +0000 (12:41 +0100)]
adding filer functionality to quattro(-green)

12 years agomissing tooltip for "file as"
friendica [Thu, 22 Mar 2012 11:07:37 +0000 (04:07 -0700)]
missing tooltip for "file as"

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 10:54:09 +0000 (11:54 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agoprevent re-registrations using a deleted username - not an issue with Friendica but...
friendica [Thu, 22 Mar 2012 08:46:52 +0000 (01:46 -0700)]
prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms

12 years agoMerge pull request #156 from tomtom84/master
tomtom84 [Thu, 22 Mar 2012 05:57:29 +0000 (22:57 -0700)]
Merge pull request #156 from tomtom84/master

fixes in diabook-derivates

12 years agoadd file_as-option to diabook-derivates
tommy tomson [Thu, 22 Mar 2012 05:54:18 +0000 (06:54 +0100)]
add file_as-option to diabook-derivates

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 22 Mar 2012 05:29:55 +0000 (01:29 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  support lowercase :-p smilie
  work around doubled linefeeds in tinymce3.5b2
  add icons to aside diabook, fixes in css
  revert permissions relaxation on community
  add comix-plain
  smooth the comix comment box
  make autocomplete work with updated tinymce
  ika to ica
  private file in repository
  facepark is unsupported ATM
  remove stray template variable from old code
  add comix theme
  use password field for DB input
  added Vijay's theme from facepark.in
  added README to mcefixes to explain what is going on.
  update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks
  more friend suggestions

* master:

12 years agoMerge branch 'master' of https://github.com/friendica/friendica
Tobias Diekershoff [Thu, 22 Mar 2012 05:27:13 +0000 (06:27 +0100)]
Merge branch 'master' of https://github.com/friendica/friendica

12 years agosupport lowercase :-p smilie
friendica [Thu, 22 Mar 2012 04:45:45 +0000 (21:45 -0700)]
support lowercase :-p smilie

12 years agoMerge branch 'pull'
friendica [Thu, 22 Mar 2012 04:43:10 +0000 (21:43 -0700)]
Merge branch 'pull'