Commit graph

5618 commits

Author SHA1 Message Date
friendica e7813f22af slackr drop shadows 2012-05-12 22:19:29 -07:00
Simon L'nu f267a283b4 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:

* master:
2012-05-12 18:56:13 -04:00
Simon b506c6f073 Merge pull request #295 from simonlnu/master
css fixes; new screenshots
2012-05-12 15:55:37 -07:00
Simon L'nu 93dc96e2cf css fixes; new screenshots
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 18:53:01 -04:00
Simon L'nu 8853e53e29 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  Ĝisdatigis la esperantlingvan tradukaĵon al 100%.

* master:
2012-05-12 18:50:53 -04:00
friendica 72d8e0459d Merge pull request #294 from mschmitt/master
Esperanto at 100% again
2012-05-12 15:01:05 -07:00
Simon L'nu 89df33f0a8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-theme: fix in earthlayers
  diabook-theme: some fixes

* master:
2012-05-12 15:55:03 -04:00
Martin Schmitt ae300bceb9 Ĝisdatigis la esperantlingvan tradukaĵon al 100%. 2012-05-12 16:56:31 +02:00
tommy tomson 9699d9cd01 diabook-theme: fix in earthlayers 2012-05-12 16:11:46 +02:00
tommy tomson 2882012e1b diabook-theme: some fixes 2012-05-12 13:50:22 +02:00
Simon f434bd7f0a Merge pull request #293 from simonlnu/master
finished migrating dispy light - maybe
2012-05-12 04:32:55 -07:00
Simon L'nu c6897d0dc4 finished migrating dispy light - maybe
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-12 07:29:36 -04:00
friendica 62727012d3 language detection library 2012-05-12 01:55:18 -07:00
friendica 99e4ea19e7 Merge https://github.com/friendica/friendica into pull 2012-05-12 01:28:04 -07:00
friendica aa83198611 rev update 2012-05-12 01:27:33 -07:00
Simon L'nu 534a93f81c 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:
2012-05-11 20:39:06 -04:00
Thomas Willingham 2454028ef6 Darkzero - fixed notifications bar. 2012-05-12 00:32:47 +01:00
tommy tomson 48c48d644f diabook-theme: update mapquery and small fix 2012-05-11 16:41:16 +02:00
tommy tomson 74e79a06a8 diabook-theme: add "population density 2010"-layer to EarthLayers-box 2012-05-11 14:56:59 +02:00
friendica 4e0b0d4e43 fix search/new against possible email leakage 2012-05-11 05:19:29 -07:00
friendica 20229ce187 better test of email reply visibility 2012-05-11 05:11:53 -07:00
friendica 49cd3f615d Merge https://github.com/friendica/friendica into pull 2012-05-11 04:05:25 -07:00
tommy tomson f9d5e602ac diabook-theme:small fix 2012-05-11 13:04:25 +02:00
friendica 7600b9b1ee Merge https://github.com/friendica/friendica into pull 2012-05-11 03:42:05 -07:00
friendica 496782e468 moderated comment templates 2012-05-11 03:41:29 -07:00
tommy tomson e13e5070a7 diabook-theme: small fix 2012-05-11 09:01:58 +02:00
tommy tomson a81faead6e diabook-theme: include prv_message autocomplete 2012-05-11 08:39:39 +02:00
friendica 8a5dcf64d8 fix PM replies after autocomplete changes 2012-05-10 20:01:13 -07:00
friendica 547007e199 add photos to PM autocomplete, improved appearance 2012-05-10 19:29:01 -07:00
friendica 01b5136007 Merge https://github.com/friendica/friendica into pull 2012-05-10 18:50:37 -07:00
friendica 8600afafe2 rev update 2012-05-10 18:50:11 -07:00
tommy tomson b2bd25a470 Merge remote-tracking branch 'origin/master' 2012-05-11 02:40:09 +02:00
tommy tomson ccc825ccbc diabook-theme: small fix 2012-05-11 02:39:54 +02:00
Simon L'nu 9c53a311de 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:
2012-05-10 19:53:11 -04:00
Thomas Willingham e7b8e839ae Diabook-dark. More touchups. 2012-05-10 17:14:27 +01:00
friendica c5f6755bdd specified background image does not exist 2012-05-10 05:49:48 -07:00
tommy tomson 3ac5d19b92 diabook-theme: some fixes 2012-05-10 12:19:51 +02:00
friendica c9bb888611 priv mail autocomplete, improved contrast for darkzero, etc. 2012-05-10 02:01:08 -07:00
friendica 93ae6ee97b Merge https://github.com/friendica/friendica into pull 2012-05-10 01:46:29 -07:00
friendica 774c51cc19 email autocomplete 2012-05-10 01:45:51 -07:00
tommy tomson 7b41c0a555 Merge remote-tracking branch 'origin/master' 2012-05-10 09:54:47 +02:00
tommy tomson 69b43582d0 diabook-theme: some css/bug-fixes 2012-05-10 09:54:16 +02:00
Simon da4c4c0c03 Merge pull request #292 from simonlnu/master
don't make -desc so obnoxious looking
2012-05-09 23:32:59 -07:00
Simon L'nu a077e63fa5 don't make -desc so obnoxious looking
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-10 02:27:48 -04:00
Simon L'nu 25d5eae955 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update
  rev update

* master:
2012-05-10 02:16:49 -04:00
friendica 4a42414135 rev update 2012-05-09 18:15:27 -07:00
friendica 8be8db39de rev update 2012-05-09 17:56:05 -07:00
Simon L'nu 39a7926015 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:
2012-05-09 14:00:54 -04:00
friendica 53157bb954 send browser back to correct page (with query args) after posting 2012-05-09 04:18:01 -07:00
friendica 70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00