Commit graph

5461 commits

Author SHA1 Message Date
zottel c43a03e21b Merge remote branch 'upstream/master' 2012-05-11 08:36:24 +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
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
zottel 4709960189 Merge remote branch 'upstream/master' 2012-05-10 09:58:52 +02: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
zottel d92be9d93c Merge remote branch 'upstream/master' 2012-05-09 09:27:23 +02:00
friendica 70a07086ad slight improvement in a couple of queries 2012-05-08 22:46:40 -07:00
Thomas Willingham 89d3ce7b5d Diabook-dark - do things the right way instead of the stupid way. 2012-05-09 04:54:17 +01:00
Thomas Willingham d2bbd92889 Fix TinyMCE, but needs adding to theme.php 2012-05-09 03:42:09 +01:00
Thomas Willingham 8a1f8515ca Fix jquery.fancybox, but still needs adding to theme.php 2012-05-09 03:31:56 +01:00
Thomas Willingham a0293ae442 Diabook-dark cleaned up a bit. 2012-05-09 03:21:26 +01:00
friendica a048fd806a don't provide 'show more' on remote friends in common unless there are actually more 2012-05-08 17:40:56 -07:00
friendica 10812e0c19 make it optional to optimize the item table after expire 2012-05-08 15:33:01 -07:00
friendica da4a360a6e Merge https://github.com/friendica/friendica into pull 2012-05-08 01:15:19 -07:00
friendica c141909f33 wrap private message autocomplete in an ifdef to make it easier to test/develop 2012-05-08 01:14:24 -07:00
Tobias Diekershoff d2c2063084 DE update for the strings 2012-05-08 09:56:05 +02:00
zottel 78429926bc Merge remote branch 'upstream/master' 2012-05-08 09:05:38 +02:00
friendica df35746639 make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation 2012-05-07 23:09:57 -07:00
Simon L'nu 34d3d45589 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:
2012-05-07 21:53:57 -04:00
friendica b128a37cee Merge https://github.com/friendica/friendica into pull 2012-05-07 18:48:26 -07:00
friendica f0b7a8ae35 finished dry run - now for real test 2012-05-07 18:36:28 -07:00
tommy tomson 88443ed3fb diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie. 2012-05-08 03:29:25 +02:00
friendica 8a4e3cc370 don't throw "did not contain xml" error if it's a valid rss that doesn't have the <?xml declaration 2012-05-07 16:51:09 -07:00
friendica 189a31e628 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.
2012-05-07 15:54:49 -07:00
friendica e8b9b8a403 separate poll_interval from delivery_interval - default is the same. 2012-05-07 04:21:54 -07:00
Simon L'nu dbbcddf845 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  reset permissions to forum default when adding forum delivery chain

* master:
2012-05-07 04:40:54 -04:00
zottel a2ea560bf3 Merge remote branch 'upstream/master' 2012-05-07 09:11:45 +02:00
friendica c7f3e626d0 Merge https://github.com/friendica/friendica into pull 2012-05-06 23:07:41 -07:00
friendica 8c26640835 reset permissions to forum default when adding forum delivery chain 2012-05-06 23:06:21 -07:00
Simon fb05cd6f18 Merge pull request #291 from simonlnu/master
minor css tweaks
2012-05-06 22:22:29 -07:00
Simon L'nu e554530430 more css tweaks. nothing major
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-07 01:20:32 -04:00
Simon L'nu c36e39b18e 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:
2012-05-07 00:55:53 -04:00