This website requires JavaScript.
53157bb954
send browser back to correct page (with query args) after posting
2012-05-09 04:18:01 -07:00
d92be9d93c
Merge remote branch 'upstream/master'
2012-05-09 09:27:23 +02:00
70a07086ad
slight improvement in a couple of queries
2012-05-08 22:46:40 -07:00
89d3ce7b5d
Diabook-dark - do things the right way instead of the stupid way.
2012-05-09 04:54:17 +01:00
d2bbd92889
Fix TinyMCE, but needs adding to theme.php
2012-05-09 03:42:09 +01:00
8a1f8515ca
Fix jquery.fancybox, but still needs adding to theme.php
2012-05-09 03:31:56 +01:00
a0293ae442
Diabook-dark cleaned up a bit.
2012-05-09 03:21:26 +01:00
a048fd806a
don't provide 'show more' on remote friends in common unless there are actually more
2012-05-08 17:40:56 -07:00
10812e0c19
make it optional to optimize the item table after expire
2012-05-08 15:33:01 -07:00
da4a360a6e
Merge https://github.com/friendica/friendica into pull
2012-05-08 01:15:19 -07:00
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
78429926bc
Merge remote branch 'upstream/master'
2012-05-08 09:05:38 +02:00
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
34d3d45589
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-07 21:53:57 -04:00
b128a37cee
Merge https://github.com/friendica/friendica into pull
2012-05-07 18:48:26 -07:00
f0b7a8ae35
finished dry run - now for real test
2012-05-07 18:36:28 -07:00
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
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
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
e8b9b8a403
separate poll_interval from delivery_interval - default is the same.
2012-05-07 04:21:54 -07:00
dbbcddf845
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-07 04:40:54 -04:00
a2ea560bf3
Merge remote branch 'upstream/master'
2012-05-07 09:11:45 +02:00
c7f3e626d0
Merge https://github.com/friendica/friendica into pull
2012-05-06 23:07:41 -07:00
8c26640835
reset permissions to forum default when adding forum delivery chain
2012-05-06 23:06:21 -07:00
fb05cd6f18
Merge pull request #291 from simonlnu/master
2012-05-06 22:22:29 -07:00
e554530430
more css tweaks. nothing major
2012-05-07 01:20:32 -04:00
c36e39b18e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-07 00:55:53 -04:00
b3b303f037
Merge branch 'ac'
2012-05-06 20:08:20 -07:00
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
8a10af3bce
Merge https://github.com/friendica/friendica into pull
2012-05-06 19:56:27 -07:00
851264161f
mail autcomplete testing
2012-05-06 19:55:39 -07:00
57920849c4
email recip autocomplete
2012-05-06 19:53:34 -07:00
8e46c43ee1
rev update
2012-05-06 19:52:22 -07:00
e417f083b5
diabook-theme: small fix
2012-05-07 02:49:44 +02:00
3d0a0b6abf
diabook-theme: add "Earth Layers"-box at right_side
2012-05-07 02:24:43 +02:00
66b9b60792
diabook-theme: twitterbox-bugfix
2012-05-06 23:26:44 +02:00
f09b3cfbf8
diabook: small fix
2012-05-06 12:25:09 +02:00
8bdbfdc853
Merge remote-tracking branch 'origin/master'
2012-05-06 12:09:22 +02:00
abbb4c2f36
diabook-theme: bugfix
2012-05-06 12:08:46 +02:00
b4bd8258e2
Merge pull request #290 from simonlnu/master
2012-05-06 03:08:08 -07:00
f32c3d74a4
fixing widths to be more dynamic where possible. font size fixes. add README.md
2012-05-06 06:05:31 -04:00
7e7372fc5a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-06 04:51:15 -04:00
47c3b43afd
Merge https://github.com/friendica/friendica into pull
2012-05-05 17:54:19 -07:00
49ccefd6c7
bad sql left after the mailbox in/out merge
2012-05-05 17:53:23 -07:00
0c4099966a
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-05 20:08:19 -04:00
e1ab3a93cc
diabook-theme: small fix
2012-05-06 00:36:46 +02:00
c421f35da7
diabook-theme: twitter-box-update at right_aside
2012-05-06 00:10:35 +02:00
f297751437
diabook-theme: can now set the twitter search term in theme-settings & small fixes
2012-05-05 20:01:38 +02:00
b5e857c0e7
Merge branch 'master' of git://github.com/friendica/friendica
2012-05-05 20:48:16 +05:30
8ae83201cf
consolidate item deletion so we can fix orphaned categories and file_as tags.
2012-05-05 07:05:32 -07:00
8f26e698e6
Merge pull request #289 from cvogeley/master
2012-05-05 05:04:05 -07:00
f9f62ee7ec
DE: new email templates translated
2012-05-05 09:11:25 +02:00
d0dd22af57
workaround to clean up orphaned filetags
2012-05-04 17:43:47 -07:00
7c6e8b30b2
only show remove category to item owner
2012-05-04 16:45:10 -07:00
3cd428152d
Merge remote branch 'upstream/master'
2012-05-05 00:54:00 +02:00
7f061c255c
Option to set theme width added. Minor layout changes
2012-05-05 00:45:35 +02:00
250bf57e1e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-04 17:43:04 -04:00
62ea9130fe
Merge pull request #288 from simonlnu/master
2012-05-04 14:13:03 -07:00
20ea1b7d4b
fix lightbox; finished dark, now on to light
2012-05-04 17:06:17 -04:00
5830c32dce
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-04 17:03:23 -04:00
dedaa301cb
Merge remote branch 'upstream/master'
2012-05-04 20:42:14 +02:00
37d4181fde
Merge https://github.com/friendica/friendica into pull
2012-05-04 06:43:24 -07:00
10754ced3e
category removal
2012-05-04 06:42:56 -07:00
2a987356c6
Merge pull request #287 from mschmitt/master
2012-05-04 03:27:48 -07:00
52f4563f30
Esperanto 100%
2012-05-04 12:02:05 +02:00
9ecd128e5e
"show more" friends in common
2012-05-04 01:46:36 -07:00
a9f825ec3f
Merge remote branch 'upstream/master'
2012-05-04 10:00:04 +02:00
00190b7faa
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-04 02:31:21 -04:00
22c8fe46a5
DE strings
2012-05-04 07:30:49 +02:00
421acee65b
implement max load average before queuing/deferring delivery and poller processes
2012-05-03 21:50:48 -07:00
15542a8690
yet another bug in remote_friends_in_common
2012-05-03 20:47:04 -07:00
f2d3039aed
string update
2012-05-03 17:20:24 -07:00
2818cb28e9
use html symbols for double quotes
2012-05-03 17:19:53 -07:00
f3e18df55d
string update
2012-05-03 16:55:03 -07:00
ff75dc4e40
Merge pull request #284 from fabrixxm/master
2012-05-03 16:45:30 -07:00
6a5e5096db
Merge pull request #286 from grossard/french_proofreading
2012-05-03 14:01:06 -07:00
1f86205ee8
proofreading the mail templates in fr fixed typo, grammar, spelling…
2012-05-03 22:35:59 +02:00
cdb73f706f
Merge pull request #285 from simonlnu/master
2012-05-03 11:39:34 -07:00
bb081e4bf5
forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes)
2012-05-03 14:35:21 -04:00
1a13c56fef
major reworking of dispy dark. light to follow
2012-05-03 14:25:18 -04:00
4c8a82456e
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-03 14:18:40 -04:00
52915c6e68
validate_url() and validate_email() validate also IP address.
2012-05-03 15:28:23 +02:00
35771a778d
Merge remote branch 'upstream/master'
2012-05-03 10:21:38 +02:00
d72db2e1aa
diabook-theme: small fix
2012-05-03 07:57:40 +02:00
2bfba93940
Merge https://github.com/friendica/friendica into pull
2012-05-02 22:38:17 -07:00
e7ff35f27d
Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely.
2012-05-02 22:33:51 -07:00
0446766f04
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-03 00:25:56 -04:00
ff2ddc319d
diabook-theme: small fix
2012-05-03 06:25:23 +02:00
3521e22333
diabook-theme: made boxes at right_aside sortable
2012-05-03 06:05:55 +02:00
e7580b71e1
use cid rather than uid in perms
2012-05-02 21:00:39 -07:00
079d954765
Merge pull request #283 from fermionic/private-events-post-correctly-in-diaspora
2012-05-02 20:49:51 -07:00
5d957c3803
Modify events_post() in mod/events.php to set the private field to true when an event is shared with specific people. This is necessary to have event posts show correctly in Diaspora if an event is created visible only to self, but modified later to be visible to others.
2012-05-02 21:12:57 -06:00
3ecde2d72f
use mysql replace on cache items
2012-05-02 16:27:19 -07:00
8e1437ca8b
fixing common friends
2012-05-02 16:15:59 -07:00
a292629215
Merge https://github.com/friendica/friendica into pull
2012-05-02 15:27:39 -07:00
3be9cddfd7
rev update
2012-05-02 15:26:57 -07:00
b9c91c3320
Merge pull request #282 from max-weller/master
2012-05-02 13:49:57 -07:00
02dc116a9c
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
2012-05-02 12:49:00 -04:00
f0c11cac4a
Moved Meta Viewport from global head.tpl to diabook's header
2012-05-02 16:59:58 +02:00
friendica
zottel
Thomas Willingham
Tobias Diekershoff
Simon L'nu
tommy tomson
Simon
Vasudev Kamath
Christian Vogeley
Martin Schmitt
Ludovic Grossard
Fabio Comuni
Zach Prezkuta
Max Weller