Commit Graph

7613 Commits

Author SHA1 Message Date
Evan Prodromou
01dc77c2fd Merge branch 'master' into 0.9.x 2010-01-19 00:31:42 -05:00
Evan Prodromou
c7f14cd777 allow all rights reserved, private data 2010-01-19 00:04:58 -05:00
Evan Prodromou
42a47a7719 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-18 23:26:03 -05:00
Evan Prodromou
71f519f64a add event for showing content license in action 2010-01-18 23:25:45 -05: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
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
Brion Vibber
ec873922e3 Gracefully skip missing user entries when initializing inboxes in bulk 2010-01-13 20:11:00 -08:00
Craig Andrews
26edf3a5e5 Revert "Drop the Google Client API-based AJAX geolocation lookup shim -- it fails to ask for user permission, causing us quite a bit of difficulty."
This reverts commit 749b8b5b8c.
2010-01-13 22:05:22 -05:00
Zach Copley
33df392289 - Had to remove checking read vs. read-write in OAuth authenticated methods
- Will now pick up source attr from OAuth app
2010-01-14 02:41:11 +00:00
Sarven Capadisli
c28c511438 More relaxed selector for application icon and form checkbox 2010-01-14 02:41:11 +00:00
Zach Copley
bbde4d42cc Check for read vs. read-write access on OAuth authenticated API mehtods. 2010-01-14 02:41:10 +00:00