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
Michael Vogel
f2e648d62f
Merge remote branch 'upstream/master'
2012-05-09 14:56:48 +02: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
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
d2c2063084
DE update for the strings
2012-05-08 09:56:05 +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
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
friendica
b3b303f037
Merge branch 'ac'
2012-05-06 20:08:20 -07:00
friendica
b74a776162
I'll leave the private mail recipient autocomplete partially done. Need a good UI/JS person to finish it off.
2012-05-06 20:06:39 -07:00
friendica
8a10af3bce
Merge https://github.com/friendica/friendica into pull
2012-05-06 19:56:27 -07:00
friendica
851264161f
mail autcomplete testing
2012-05-06 19:55:39 -07:00
friendica
57920849c4
email recip autocomplete
2012-05-06 19:53:34 -07:00
friendica
8e46c43ee1
rev update
2012-05-06 19:52:22 -07:00
tommy tomson
e417f083b5
diabook-theme: small fix
2012-05-07 02:49:44 +02:00
tommy tomson
3d0a0b6abf
diabook-theme: add "Earth Layers"-box at right_side
2012-05-07 02:24:43 +02:00
tommy tomson
66b9b60792
diabook-theme: twitterbox-bugfix
2012-05-06 23:26:44 +02:00
tommy tomson
f09b3cfbf8
diabook: small fix
2012-05-06 12:25:09 +02:00
tommy tomson
8bdbfdc853
Merge remote-tracking branch 'origin/master'
2012-05-06 12:09:22 +02:00
tommy tomson
abbb4c2f36
diabook-theme: bugfix
2012-05-06 12:08:46 +02:00
Simon
b4bd8258e2
Merge pull request #290 from simonlnu/master
...
font and width tweaking
2012-05-06 03:08:08 -07:00
Simon L'nu
f32c3d74a4
fixing widths to be more dynamic where possible. font size fixes. add README.md
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-05-06 06:05:31 -04:00
Simon L'nu
7e7372fc5a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
bad sql left after the mailbox in/out merge
* master:
2012-05-06 04:51:15 -04:00
friendica
47c3b43afd
Merge https://github.com/friendica/friendica into pull
2012-05-05 17:54:19 -07:00
friendica
49ccefd6c7
bad sql left after the mailbox in/out merge
2012-05-05 17:53:23 -07:00
