]> git.mxchange.org Git - friendica.git/log
friendica.git
12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 21 May 2012 01:30:52 +0000 (18:30 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Mon, 21 May 2012 01:30:02 +0000 (18:30 -0700)]
rev update

12 years agoMerge pull request #303 from simonlnu/master
Simon [Sun, 20 May 2012 18:38:25 +0000 (11:38 -0700)]
Merge pull request #303 from simonlnu/master

fix brown paper bag with dispy light

12 years agofix dispy light
Simon L'nu [Sun, 20 May 2012 18:37:20 +0000 (14:37 -0400)]
fix dispy light

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, 20 May 2012 18:33:15 +0000 (14:33 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  search with leading @ performs directory search (# for tag search), nothing for text search
  Darkzero-NS + 'Friendicaland' countries.
  set comment permissions explicitly to parent permissions

* master:

12 years agosearch with leading @ performs directory search (# for tag search), nothing for text...
friendica [Sun, 20 May 2012 04:53:27 +0000 (21:53 -0700)]
search with leading @ performs directory search (# for tag search), nothing for text search

12 years agoDarkzero-NS + 'Friendicaland' countries.
Thomas Willingham [Sun, 20 May 2012 00:44:07 +0000 (01:44 +0100)]
Darkzero-NS + 'Friendicaland' countries.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 20 May 2012 00:22:00 +0000 (17:22 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoset comment permissions explicitly to parent permissions
friendica [Sat, 19 May 2012 23:42:24 +0000 (16:42 -0700)]
set comment permissions explicitly to parent permissions

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 19 May 2012 22:53:57 +0000 (18:53 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Darkzero, another missing part of "everything"
  Diabook-dark - some more cleaning up
  Okay, so maybe not *everything*
  Give Darkzero some loving.
  backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
  sql script to ccnvert all tables to innodb

* master:

12 years agoDarkzero, another missing part of "everything"
Thomas Willingham [Sat, 19 May 2012 16:30:55 +0000 (17:30 +0100)]
Darkzero, another missing part of "everything"

12 years agoDiabook-dark - some more cleaning up
Thomas Willingham [Sat, 19 May 2012 16:20:27 +0000 (17:20 +0100)]
Diabook-dark - some more cleaning up

12 years agoOkay, so maybe not *everything*
Thomas Willingham [Sat, 19 May 2012 14:17:35 +0000 (15:17 +0100)]
Okay, so maybe not *everything*

12 years agoGive Darkzero some loving.
Thomas Willingham [Sat, 19 May 2012 13:51:10 +0000 (14:51 +0100)]
Give Darkzero some loving.

Everything that used to be hidden with light text on light backgrounds is legible now.

12 years agobackend support for 'x' deliveries per process - x is configurable, more importantly...
friendica [Sat, 19 May 2012 09:42:11 +0000 (02:42 -0700)]
backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 19 May 2012 07:46:49 +0000 (00:46 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agosql script to ccnvert all tables to innodb
friendica [Sat, 19 May 2012 07:45:45 +0000 (00:45 -0700)]
sql script to ccnvert all tables to innodb

12 years agoMerge pull request #302 from simonlnu/master
Simon [Sat, 19 May 2012 07:16:44 +0000 (00:16 -0700)]
Merge pull request #302 from simonlnu/master

fix -desc again

12 years agofix -desc again
Simon L'nu [Sat, 19 May 2012 07:15:35 +0000 (03:15 -0400)]
fix -desc again

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

* remotes/upstream/master:
  profile change activity link bug

* master:

12 years agoprofile change activity link bug
friendica [Sat, 19 May 2012 00:55:11 +0000 (17:55 -0700)]
profile change activity link bug

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 18 May 2012 16:12:40 +0000 (12:12 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  apply max-width to images in posts, duepuntozero
  theming for default group selector
  catch more places to apply default group
  make it difficult to setup a private forum with no privacy
  more private forums, default privacy group for new contacts
  tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work

* master:

12 years agoapply max-width to images in posts, duepuntozero
friendica [Fri, 18 May 2012 08:46:02 +0000 (01:46 -0700)]
apply max-width to images in posts, duepuntozero

12 years agotheming for default group selector
friendica [Fri, 18 May 2012 08:38:11 +0000 (01:38 -0700)]
theming for default group selector

12 years agocatch more places to apply default group
friendica [Fri, 18 May 2012 08:03:46 +0000 (01:03 -0700)]
catch more places to apply default group

12 years agomake it difficult to setup a private forum with no privacy
friendica [Fri, 18 May 2012 06:05:41 +0000 (23:05 -0700)]
make it difficult to setup a private forum with no privacy

12 years agomore private forums, default privacy group for new contacts
friendica [Fri, 18 May 2012 05:44:52 +0000 (22:44 -0700)]
more private forums, default privacy group for new contacts

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 18 May 2012 03:01:46 +0000 (23:01 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  setup delivery chain for private groups (work in progress)
  bring in the *much better* xml parser from the original zot branch
  rev update
  merged from wrong project
  initial commit

* master:

12 years agotell browser not to cache permission denied (private) photos so that after authentica...
friendica [Fri, 18 May 2012 02:59:46 +0000 (19:59 -0700)]
tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work

12 years agosetup delivery chain for private groups (work in progress)
friendica [Fri, 18 May 2012 02:35:24 +0000 (19:35 -0700)]
setup delivery chain for private groups (work in progress)

12 years agobring in the *much better* xml parser from the original zot branch
friendica [Thu, 17 May 2012 04:29:57 +0000 (21:29 -0700)]
bring in the *much better* xml parser from the original zot branch

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 16 May 2012 20:55:00 +0000 (13:55 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Wed, 16 May 2012 20:52:11 +0000 (13:52 -0700)]
rev update

12 years agoMerge pull request #301 from simonlnu/master
Simon [Wed, 16 May 2012 17:34:30 +0000 (10:34 -0700)]
Merge pull request #301 from simonlnu/master

fix admin links

12 years agofix admin links...
Simon L'nu [Wed, 16 May 2012 17:33:20 +0000 (13:33 -0400)]
fix admin links...

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agomerged from wrong project
friendica [Wed, 16 May 2012 12:08:15 +0000 (05:08 -0700)]
merged from wrong project

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 16 May 2012 11:59:15 +0000 (04:59 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #300 from simonlnu/master
Simon [Wed, 16 May 2012 09:52:35 +0000 (02:52 -0700)]
Merge pull request #300 from simonlnu/master

*sigh*. fix dark *again*

12 years ago*sigh*. fix dark *again*
Simon L'nu [Wed, 16 May 2012 09:51:29 +0000 (05:51 -0400)]
*sigh*. fix dark *again*

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge pull request #299 from simonlnu/master
Simon [Wed, 16 May 2012 09:33:10 +0000 (02:33 -0700)]
Merge pull request #299 from simonlnu/master

get rid of the monstrosity for .button. need to find alternate solution

12 years agoget rid of the monstrosity for .button. need to find alternate solution
Simon L'nu [Wed, 16 May 2012 09:32:08 +0000 (05:32 -0400)]
get rid of the monstrosity for .button. need to find alternate solution

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 16 May 2012 09:29:34 +0000 (05:29 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Wed, 16 May 2012 06:15:29 +0000 (23:15 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #298 from simonlnu/master
Simon [Wed, 16 May 2012 06:01:20 +0000 (23:01 -0700)]
Merge pull request #298 from simonlnu/master

slight re-design of wall stuff and css/font cleaning

12 years agoslight re-design of wall stuff and css/font cleaning
Simon L'nu [Wed, 16 May 2012 05:58:55 +0000 (01:58 -0400)]
slight re-design of wall stuff and css/font cleaning

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge https://github.com/friendica/dir into dpull
friendica [Wed, 16 May 2012 05:30:47 +0000 (22:30 -0700)]
Merge https://github.com/friendica/dir into dpull

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 16 May 2012 03:40:35 +0000 (23:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update tinymce to 3.5.0.1
  rev update
  DE strings
  slackr drop shadows extended
  Allow plugins to modify the contact photo menu
  rev update

* master:

12 years agoupdate tinymce to 3.5.0.1
friendica [Wed, 16 May 2012 00:18:46 +0000 (17:18 -0700)]
update tinymce to 3.5.0.1

12 years agorev update
friendica [Wed, 16 May 2012 00:05:28 +0000 (17:05 -0700)]
rev update

12 years agoinitial commit
friendica [Tue, 15 May 2012 12:09:26 +0000 (05:09 -0700)]
initial commit

12 years agoDE strings
Tobias Diekershoff [Tue, 15 May 2012 08:44:01 +0000 (10:44 +0200)]
DE strings

12 years agoslackr drop shadows extended
friendica [Tue, 15 May 2012 04:45:37 +0000 (21:45 -0700)]
slackr drop shadows extended

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 15 May 2012 03:36:27 +0000 (20:36 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoMerge pull request #297 from mexon/upstream
friendica [Tue, 15 May 2012 01:57:55 +0000 (18:57 -0700)]
Merge pull request #297 from mexon/upstream

Allow plugins to modify the contact photo menu

12 years agoAllow plugins to modify the contact photo menu
Matthew Exon [Sun, 13 May 2012 08:15:54 +0000 (10:15 +0200)]
Allow plugins to modify the contact photo menu

12 years agorev update
friendica [Mon, 14 May 2012 23:32:21 +0000 (16:32 -0700)]
rev update

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 14 May 2012 23:29:06 +0000 (19:29 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #296 from simonlnu/master
Simon [Mon, 14 May 2012 04:33:07 +0000 (21:33 -0700)]
Merge pull request #296 from simonlnu/master

finish dispy light colour fixes

12 years agofinish dipsy light colour fixes
Simon L'nu [Mon, 14 May 2012 04:30:25 +0000 (00:30 -0400)]
finish dipsy light colour fixes

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, 14 May 2012 04:26:34 +0000 (00:26 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 13 May 2012 23:40:46 +0000 (16:40 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Sun, 13 May 2012 23:40:02 +0000 (16:40 -0700)]
rev update

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 13 May 2012 22:50:04 +0000 (18:50 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: small fixes
  rename get_language() to get_browser_language()
  slackr drop shadows
  language detection library
  rev update

* master:

12 years agodiabook-theme: small fixes
tommy tomson [Sun, 13 May 2012 18:51:39 +0000 (20:51 +0200)]
diabook-theme: small fixes

12 years agorename get_language() to get_browser_language()
friendica [Sun, 13 May 2012 11:52:29 +0000 (04:52 -0700)]
rename get_language() to get_browser_language()

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sun, 13 May 2012 05:20:03 +0000 (22:20 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoslackr drop shadows
friendica [Sun, 13 May 2012 05:19:29 +0000 (22:19 -0700)]
slackr drop shadows

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 12 May 2012 22:56:13 +0000 (18:56 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master:

12 years agoMerge pull request #295 from simonlnu/master
Simon [Sat, 12 May 2012 22:55:37 +0000 (15:55 -0700)]
Merge pull request #295 from simonlnu/master

css fixes; new screenshots

12 years agocss fixes; new screenshots
Simon L'nu [Sat, 12 May 2012 22:53:01 +0000 (18:53 -0400)]
css fixes; new screenshots

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 12 May 2012 22:50:53 +0000 (18:50 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Ĝisdatigis la esperantlingvan tradukaĵon al 100%.

* master:

12 years agoMerge pull request #294 from mschmitt/master
friendica [Sat, 12 May 2012 22:01:05 +0000 (15:01 -0700)]
Merge pull request #294 from mschmitt/master

Esperanto at 100% again

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 12 May 2012 19:55:03 +0000 (15:55 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: fix in earthlayers
  diabook-theme: some fixes

* master:

12 years agoĜisdatigis la esperantlingvan tradukaĵon al 100%.
Martin Schmitt [Sat, 12 May 2012 14:56:31 +0000 (16:56 +0200)]
Ĝisdatigis la esperantlingvan tradukaĵon al 100%.

12 years agodiabook-theme: fix in earthlayers
tommy tomson [Sat, 12 May 2012 14:11:46 +0000 (16:11 +0200)]
diabook-theme: fix in earthlayers

12 years agodiabook-theme: some fixes
tommy tomson [Sat, 12 May 2012 11:50:22 +0000 (13:50 +0200)]
diabook-theme: some fixes

12 years agoMerge pull request #293 from simonlnu/master
Simon [Sat, 12 May 2012 11:32:55 +0000 (04:32 -0700)]
Merge pull request #293 from simonlnu/master

finished migrating dispy light - maybe

12 years agofinished migrating dispy light - maybe
Simon L'nu [Sat, 12 May 2012 11:29:36 +0000 (07:29 -0400)]
finished migrating dispy light - maybe

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
12 years agolanguage detection library
friendica [Sat, 12 May 2012 08:55:18 +0000 (01:55 -0700)]
language detection library

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Sat, 12 May 2012 08:28:04 +0000 (01:28 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Sat, 12 May 2012 08:27:33 +0000 (01:27 -0700)]
rev update

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 12 May 2012 00:39:06 +0000 (20:39 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Darkzero - fixed notifications bar.
  diabook-theme: update mapquery and small fix
  diabook-theme: add "population density 2010"-layer to EarthLayers-box
  fix search/new against possible email leakage
  better test of email reply visibility
  diabook-theme:small fix
  moderated comment templates
  diabook-theme: small fix
  diabook-theme: include prv_message autocomplete
  fix PM replies after autocomplete changes
  add photos to PM autocomplete, improved appearance
  rev update
  diabook-theme: small fix

* master:

12 years agoDarkzero - fixed notifications bar.
Thomas Willingham [Fri, 11 May 2012 23:32:47 +0000 (00:32 +0100)]
Darkzero - fixed notifications bar.

12 years agodiabook-theme: update mapquery and small fix
tommy tomson [Fri, 11 May 2012 14:41:16 +0000 (16:41 +0200)]
diabook-theme: update mapquery and small fix

12 years agodiabook-theme: add "population density 2010"-layer to EarthLayers-box
tommy tomson [Fri, 11 May 2012 12:56:59 +0000 (14:56 +0200)]
diabook-theme: add "population density 2010"-layer to EarthLayers-box

12 years agofix search/new against possible email leakage
friendica [Fri, 11 May 2012 12:19:29 +0000 (05:19 -0700)]
fix search/new against possible email leakage

12 years agobetter test of email reply visibility
friendica [Fri, 11 May 2012 12:11:53 +0000 (05:11 -0700)]
better test of email reply visibility

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 11 May 2012 11:05:25 +0000 (04:05 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agodiabook-theme:small fix
tommy tomson [Fri, 11 May 2012 11:04:25 +0000 (13:04 +0200)]
diabook-theme:small fix

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 11 May 2012 10:42:05 +0000 (03:42 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agomoderated comment templates
friendica [Fri, 11 May 2012 10:41:29 +0000 (03:41 -0700)]
moderated comment templates

12 years agodiabook-theme: small fix
tommy tomson [Fri, 11 May 2012 07:01:58 +0000 (09:01 +0200)]
diabook-theme: small fix

12 years agodiabook-theme: include prv_message autocomplete
tommy tomson [Fri, 11 May 2012 06:39:39 +0000 (08:39 +0200)]
diabook-theme: include prv_message autocomplete

12 years agofix PM replies after autocomplete changes
friendica [Fri, 11 May 2012 03:01:13 +0000 (20:01 -0700)]
fix PM replies after autocomplete changes

12 years agoadd photos to PM autocomplete, improved appearance
friendica [Fri, 11 May 2012 02:29:01 +0000 (19:29 -0700)]
add photos to PM autocomplete, improved appearance

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Fri, 11 May 2012 01:50:37 +0000 (18:50 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agorev update
friendica [Fri, 11 May 2012 01:50:11 +0000 (18:50 -0700)]
rev update

12 years agoMerge remote-tracking branch 'origin/master'
tommy tomson [Fri, 11 May 2012 00:40:09 +0000 (02:40 +0200)]
Merge remote-tracking branch 'origin/master'

12 years agodiabook-theme: small fix
tommy tomson [Fri, 11 May 2012 00:39:54 +0000 (02:39 +0200)]
diabook-theme: small fix

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 10 May 2012 23:53:11 +0000 (19:53 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Diabook-dark.  More touchups.
  specified background image does not exist
  diabook-theme: some fixes
  priv mail autocomplete, improved contrast for darkzero, etc.
  email autocomplete
  diabook-theme: some css/bug-fixes

* master: