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
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
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
Simon L'nu
0c4099966a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
diabook-theme: small fix
diabook-theme: twitter-box-update at right_aside
diabook-theme: can now set the twitter search term in theme-settings & small fixes
consolidate item deletion so we can fix orphaned categories and file_as tags.
DE: new email templates translated
workaround to clean up orphaned filetags
only show remove category to item owner
Option to set theme width added. Minor layout changes
* master:
2012-05-05 20:08:19 -04:00
tommy tomson
e1ab3a93cc
diabook-theme: small fix
2012-05-06 00:36:46 +02:00
tommy tomson
c421f35da7
diabook-theme: twitter-box-update at right_aside
2012-05-06 00:10:35 +02:00
tommy tomson
f297751437
diabook-theme: can now set the twitter search term in theme-settings & small fixes
2012-05-05 20:01:38 +02:00
Vasudev Kamath
b5e857c0e7
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-05 20:48:16 +05:30
friendica
8ae83201cf
consolidate item deletion so we can fix orphaned categories and file_as tags.
2012-05-05 07:05:32 -07:00
friendica
8f26e698e6
Merge pull request #289 from cvogeley/master
...
Option to set theme width added. Minor layout changes
2012-05-05 05:04:05 -07:00
f9f62ee7ec
DE: new email templates translated
2012-05-05 09:11:25 +02:00
friendica
d0dd22af57
workaround to clean up orphaned filetags
2012-05-04 17:43:47 -07:00
friendica
7c6e8b30b2
only show remove category to item owner
2012-05-04 16:45:10 -07:00
zottel
3cd428152d
Merge remote branch 'upstream/master'
2012-05-05 00:54:00 +02:00
Christian Vogeley
7f061c255c
Option to set theme width added. Minor layout changes
2012-05-05 00:45:35 +02:00
Simon L'nu
250bf57e1e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
...
* remotes/upstream/master:
* master:
2012-05-04 17:43:04 -04:00
Simon
62ea9130fe
Merge pull request #288 from simonlnu/master
...
multiple fixes
2012-05-04 14:13:03 -07:00
