]> git.mxchange.org Git - friendica.git/log
friendica.git
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 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 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 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:

12 years agoDiabook-dark. More touchups.
Thomas Willingham [Thu, 10 May 2012 16:14:27 +0000 (17:14 +0100)]
Diabook-dark.  More touchups.

12 years agospecified background image does not exist
friendica [Thu, 10 May 2012 12:49:48 +0000 (05:49 -0700)]
specified background image does not exist

12 years agodiabook-theme: some fixes
tommy tomson [Thu, 10 May 2012 10:19:51 +0000 (12:19 +0200)]
diabook-theme: some fixes

12 years agopriv mail autocomplete, improved contrast for darkzero, etc.
friendica [Thu, 10 May 2012 09:01:08 +0000 (02:01 -0700)]
priv mail autocomplete, improved contrast for darkzero, etc.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Thu, 10 May 2012 08:46:29 +0000 (01:46 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoemail autocomplete
friendica [Thu, 10 May 2012 08:45:51 +0000 (01:45 -0700)]
email autocomplete

12 years agoMerge remote-tracking branch 'origin/master'
tommy tomson [Thu, 10 May 2012 07:54:47 +0000 (09:54 +0200)]
Merge remote-tracking branch 'origin/master'

12 years agodiabook-theme: some css/bug-fixes
tommy tomson [Thu, 10 May 2012 07:54:16 +0000 (09:54 +0200)]
diabook-theme: some css/bug-fixes

12 years agoMerge pull request #292 from simonlnu/master
Simon [Thu, 10 May 2012 06:32:59 +0000 (23:32 -0700)]
Merge pull request #292 from simonlnu/master

don't make -desc so obnoxious looking

12 years agodon't make -desc so obnoxious looking
Simon L'nu [Thu, 10 May 2012 06:27:48 +0000 (02:27 -0400)]
don't make -desc so obnoxious looking

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

* remotes/upstream/master:
  rev update
  rev update

* master:

12 years agorev update
friendica [Thu, 10 May 2012 01:15:27 +0000 (18:15 -0700)]
rev update

12 years agorev update
friendica [Thu, 10 May 2012 00:56:05 +0000 (17:56 -0700)]
rev update

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Wed, 9 May 2012 18:00:54 +0000 (14:00 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  send browser back to correct page (with query args) after posting
  slight improvement in a couple of queries
  Diabook-dark - do things the right way instead of the stupid way.
  Fix TinyMCE, but needs adding to theme.php
  Fix jquery.fancybox, but still needs adding to theme.php
  Diabook-dark cleaned up a bit.
  don't provide 'show more' on remote friends in common unless there are actually more
  make it optional to optimize the item table after expire
  wrap private message autocomplete in an ifdef to make it easier to test/develop
  DE update for the strings
  make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation

* master:

12 years agosend browser back to correct page (with query args) after posting
friendica [Wed, 9 May 2012 11:18:01 +0000 (04:18 -0700)]
send browser back to correct page (with query args) after posting

12 years agoslight improvement in a couple of queries
friendica [Wed, 9 May 2012 05:46:40 +0000 (22:46 -0700)]
slight improvement in a couple of queries

12 years agoDiabook-dark - do things the right way instead of the stupid way.
Thomas Willingham [Wed, 9 May 2012 03:54:17 +0000 (04:54 +0100)]
Diabook-dark - do things the right way instead of the stupid way.

12 years agoFix TinyMCE, but needs adding to theme.php
Thomas Willingham [Wed, 9 May 2012 02:42:09 +0000 (03:42 +0100)]
Fix TinyMCE, but needs adding to theme.php

12 years agoFix jquery.fancybox, but still needs adding to theme.php
Thomas Willingham [Wed, 9 May 2012 02:31:56 +0000 (03:31 +0100)]
Fix jquery.fancybox, but still needs adding to theme.php

12 years agoDiabook-dark cleaned up a bit.
Thomas Willingham [Wed, 9 May 2012 02:21:26 +0000 (03:21 +0100)]
Diabook-dark cleaned up a bit.

12 years agodon't provide 'show more' on remote friends in common unless there are actually more
friendica [Wed, 9 May 2012 00:40:56 +0000 (17:40 -0700)]
don't provide 'show more' on remote friends in common unless there are actually more

12 years agomake it optional to optimize the item table after expire
friendica [Tue, 8 May 2012 22:33:01 +0000 (15:33 -0700)]
make it optional to optimize the item table after expire

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 8 May 2012 08:15:19 +0000 (01:15 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agowrap private message autocomplete in an ifdef to make it easier to test/develop
friendica [Tue, 8 May 2012 08:14:24 +0000 (01:14 -0700)]
wrap private message autocomplete in an ifdef to make it easier to test/develop

12 years agoDE update for the strings
Tobias Diekershoff [Tue, 8 May 2012 07:56:05 +0000 (09:56 +0200)]
DE update for the strings

12 years agomake mod-follow hookable (e.g. service class limits) and also begin to prepare it...
friendica [Tue, 8 May 2012 06:09:57 +0000 (23:09 -0700)]
make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 8 May 2012 01:53:57 +0000 (21:53 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  finished dry run - now for real test
  diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.
  don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration
  If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of stuck processes trying to connect with dead or dying servers significantly.
  separate poll_interval from delivery_interval - default is the same.

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Tue, 8 May 2012 01:48:26 +0000 (18:48 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agofinished dry run - now for real test
friendica [Tue, 8 May 2012 01:36:28 +0000 (18:36 -0700)]
finished dry run - now for real test

12 years agodiabook-themes: state of the boxes at right_aside are now stored in db, instead of...
tommy tomson [Tue, 8 May 2012 01:29:25 +0000 (03:29 +0200)]
diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.

12 years agodon't throw "did not contain xml" error if it's a valid rss that doesn't have the...
friendica [Mon, 7 May 2012 23:51:09 +0000 (16:51 -0700)]
don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration

12 years agoIf a contact has had delivery issues in the last 15 minutes, send new posts straight...
friendica [Mon, 7 May 2012 22:54:49 +0000 (15:54 -0700)]
If a contact has had delivery issues in the last 15 minutes, send new posts straight to the queue
and don't even try to connect. Also defer polling for stuck contacts. Should reduce the number of
stuck processes trying to connect with dead or dying servers significantly.

12 years agoseparate poll_interval from delivery_interval - default is the same.
friendica [Mon, 7 May 2012 11:21:54 +0000 (04:21 -0700)]
separate poll_interval from delivery_interval - default is the same.

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 7 May 2012 08:40:54 +0000 (04:40 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  reset permissions to forum default when adding forum delivery chain

* master:

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 7 May 2012 06:07:41 +0000 (23:07 -0700)]
Merge https://github.com/friendica/friendica into pull

12 years agoreset permissions to forum default when adding forum delivery chain
friendica [Mon, 7 May 2012 06:06:21 +0000 (23:06 -0700)]
reset permissions to forum default when adding forum delivery chain

12 years agoMerge pull request #291 from simonlnu/master
Simon [Mon, 7 May 2012 05:22:29 +0000 (22:22 -0700)]
Merge pull request #291 from simonlnu/master

minor css tweaks

12 years agomore css tweaks. nothing major
Simon L'nu [Mon, 7 May 2012 05:20:32 +0000 (01:20 -0400)]
more css tweaks. nothing major

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

* remotes/upstream/master:
  I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
  mail autcomplete testing
  email recip autocomplete
  rev update
  diabook-theme: small fix
  diabook-theme: add "Earth Layers"-box at right_side
  diabook-theme: twitterbox-bugfix
  diabook: small fix
  diabook-theme: bugfix

* master:

12 years agoMerge branch 'ac'
friendica [Mon, 7 May 2012 03:08:20 +0000 (20:08 -0700)]
Merge branch 'ac'

12 years agoI'll leave the private mail recipient autocomplete partially done. Need a good UI...
friendica [Mon, 7 May 2012 03:06:39 +0000 (20:06 -0700)]
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.

12 years agoMerge https://github.com/friendica/friendica into pull
friendica [Mon, 7 May 2012 02:56:27 +0000 (19:56 -0700)]
Merge https://github.com/friendica/friendica into pull