Commit Graph

8319 Commits

Author SHA1 Message Date
Brion Vibber
9dc9c404cf Merge branch 'master' into 0.9.x 2010-01-16 13:40:49 -08:00
Brion Vibber
775c63b654 Cleanup for memcached host/port split -- apparently we use ';' on purpose, restoring. Keeping fix for the notices spewing into the log. 2010-01-16 13:39:05 -08:00
Brion Vibber
faedddaa81 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-01-16 13:37:49 -08:00
Sarven Capadisli
aea83bbe15 Using visibility:hidden instead of display:none for checkbox 2010-01-16 20:57:18 +00:00
Sarven Capadisli
d22cdad5fe Added missing position paramater 2010-01-16 20:10:46 +00:00
Sarven Capadisli
8896df22af JSLinting on JSON 2010-01-16 19:44:37 +00:00
Sarven Capadisli
6494cb17e9 Some JSlint-ing 2010-01-16 19:42:32 +00:00
Sarven Capadisli
3398bb6ca9 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-16 19:17:14 +00:00
Sarven Capadisli
407e425aed Removed extra comma in object 2010-01-16 19:16:44 +00:00
Siebrand Mazeland
e8ba2794e7 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-16 18:57:34 +01:00
Eric Helgeson
5fd8e331f3 Missed change when refactoring groups. Thanks macno 2010-01-16 11:56:07 -05:00
Evan Prodromou
1f6bbc1890 Merge branch 'master' into 0.9.x 2010-01-16 08:06:02 -08:00
Evan Prodromou
21c3e08804 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-16 07:48:59 -08:00
Evan Prodromou
d6b8b13116 change rc3 to beta3 2010-01-16 07:48:46 -08:00
Evan Prodromou
42550321ff Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-16 06:57:01 -08:00
Brion Vibber
d35faa04c1 Fix for background recalculation of groups; needs to get Group objects not IDs; also don't list any groups for repeats to match saveGroups behavior
todo: merge calculation portion with saveGroups so they don't get out of sync
2010-01-15 13:06:21 -08:00
Siebrand Mazeland
1ef8efe4c5 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-15 20:20:18 +01:00
Brion Vibber
598072468c --xmpp-only hack for queuedaemon.php to run separate queue daemon with only xmpp threads 2010-01-15 11:13:06 -08:00
Brion Vibber
963260d262 Fix since_id and max_id API parameters for inbox-based loads; was failing if the exact id mentioned wasn't present in the inbox (or had been trimmed out) 2010-01-15 10:03:02 -08:00
Brion Vibber
745d428365 Fix since_id and max_id API parameters for inbox-based loads; was failing if the exact id mentioned wasn't present in the inbox (or had been trimmed out) 2010-01-15 10:01:50 -08:00
Brion Vibber
ef016dca45 Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-01-15 09:52:50 -08:00
Brion Vibber
038287c1ff fix for --skip-xmpp hack -- forgot to do it on the ping & confirm handlers 2010-01-14 17:14:41 -08:00
Craig Andrews
a27aef9206 Add nickname suggestion capability for use during autoregistration. 2010-01-14 19:52:11 -05:00
Brion Vibber
58bc33850a temporary --skip-xmpp flag on queuedaemon.php, allows to run queue daemons but skip subscription to xmpp-based queues
(still working on making these behave gracefully when server is down)
2010-01-14 15:32:37 -08:00
Siebrand Mazeland
c82c43d5ee Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-14 23:43:44 +01:00
Siebrand Mazeland
882712dbac Add Brion Vibber to contributors. 2010-01-14 23:40:11 +01:00
Siebrand Mazeland
6d8469947e Make more complete sentence. 2010-01-14 23:38:29 +01:00
Siebrand Mazeland
c8f67dd1a4 Fix casing for HMAC-SHA1. 2010-01-14 23:37:06 +01:00
Siebrand Mazeland
7ef6c9da43 Fix inconsistent title case in page title 2010-01-14 23:36:13 +01:00
Siebrand Mazeland
68a2e46390 Make page titles more consistent: no title case in four cases. 2010-01-14 23:32:40 +01:00
Siebrand Mazeland
31940f9309 Fix i18n issue: please number variables when using more than one to allow word order changes without unexpected results. 2010-01-14 23:29:16 +01:00
Brion Vibber
5783874cc2 Clean up host/port separation in memcached plugin -- use : not ; as separator and clean up some warnings 2010-01-14 14:14:32 -08:00
Brion Vibber
532a174fc0 Clean up host/port separation in memcached plugin -- use : not ; as separator and clean up some warnings 2010-01-14 14:14:22 -08:00
Brion Vibber
2f32181c93 Keep handler registration per-site to fix queue registration in mixed config environment 2010-01-14 13:22:33 -08:00
Brion Vibber
7211896b2f Keep handler registration per-site to fix queue registration in mixed config environment 2010-01-14 13:21:48 -08:00
Brion Vibber
f4b47c7e64 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-01-13 23:39:39 -08:00
Brion Vibber
8a7171fde6 Don't barf on io loop if xmpp connection failed 2010-01-13 23:38:51 -08:00
Evan Prodromou
28fafe803a remove debugging statement for friends_timeline 2010-01-13 23:28:51 -08:00
Evan Prodromou
30e50439a3 change double quotes to single quotes in numbered format string 2010-01-13 23:17:37 -08:00
Evan Prodromou
23a8645a39 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-13 22:57:48 -08:00
Evan Prodromou
b59188dc77 Merge branch 'master' into 0.9.x 2010-01-13 22:57:25 -08:00
Evan Prodromou
16742d0fde do since_id and max_id in inbox 2010-01-13 22:32:17 -08:00
Evan Prodromou
abd67452da go straight to the DB for inbox before insert 2010-01-13 22:12:19 -08:00
Brion Vibber
4b839cfc53 fix for non-% memory soft limit 2010-01-13 21:41:42 -08:00
Brion Vibber
e8abb0c2ed fix for non-% memory soft limit 2010-01-13 21:35:47 -08:00
Brion Vibber
b25deaacea queue daemon fixes: path fix for xmpp, suppress warning in memcached init 2010-01-13 21:24:36 -08:00
Brion Vibber
cb962ed475 queue daemon fixes: path fix for xmpp, suppress warning in memcached init 2010-01-13 21:24:02 -08:00
Brion Vibber
255f49067d Merge branch 'master' into 0.9.x 2010-01-13 20:51:16 -08:00
Brion Vibber
35a2f8de4d actually use the user id instead of 0 ;) 2010-01-13 20:46:44 -08:00
Brion Vibber
82f2fe8cca in case we have cached 'fake' inboxes, make sure we rebuild them running initializeinbox.php 2010-01-13 20:30:42 -08:00