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
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
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
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
038287c1ff
fix for --skip-xmpp hack -- forgot to do it on the ping & confirm handlers
2010-01-14 17:14:41 -08: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
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
2f32181c93
Keep handler registration per-site to fix queue registration in mixed config environment
2010-01-14 13:22:33 -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
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
b25deaacea
queue daemon fixes: path fix for xmpp, suppress warning in memcached init
2010-01-13 21:24:36 -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
Evan Prodromou
f827242bce
Merge branch 'testing'
2010-01-13 18:32:44 -08:00
Evan Prodromou
aa23698553
accept file for initializeinbox.php
2010-01-13 18:28:08 -08:00
Sarven Capadisli
085406ea88
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-14 01:50:21 +00:00
Sarven Capadisli
acc48289e5
Update geo location UI for notice form where the geo data info is only
...
visible on @title of the enable/disable button.
2010-01-14 01:48:57 +00:00
Evan Prodromou
fdb64eed2f
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-13 17:40:39 -08:00
Evan Prodromou
fba840ed56
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-13 17:30:22 -08:00
Evan Prodromou
52bbb2262a
rev version in lib/common.php
2010-01-13 17:29:58 -08:00
Evan Prodromou
8d6b4cadf3
script to upgrade from RC2 to RC3
2010-01-13 17:28:31 -08:00
Brion Vibber
82e57b6204
Fix for dbqueuehandler: if a queue is unrecognized, discard entries rather than attempting to re-run them forever!
2010-01-13 16:33:03 -08:00
Evan Prodromou
4d7cdbf1c6
don't write Inbox if on a read-only page, but encache
2010-01-13 16:28:42 -08:00
Evan Prodromou
935d5eed69
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-13 16:19:35 -08:00
Evan Prodromou
464ce741a4
remove session info in syslog
2010-01-13 16:19:20 -08:00
Siebrand Mazeland
519e1e6250
Update generation of YAML files
...
* need lower case in some places
* update target path
Not in production yet at translatewiki.net - need some Translate extension code changes to get YAML config support for Gettext first.
2010-01-13 23:33:05 +01:00
Siebrand Mazeland
108c51fa68
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-01-13 23:10:00 +01:00
Siebrand Mazeland
f7f82982ec
Update line endings
2010-01-13 23:09:49 +01:00
Siebrand Mazeland
21444929bd
Localisation updates for !StatusNet from !translatewiki.net !sntrans
2010-01-13 23:09:23 +01:00
Sarven Capadisli
25ed2d2c87
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-13 21:13:21 +00:00
Sarven Capadisli
5d88e6435f
Changed to margin instead of list position in order to avoid text
...
wrapping from the bullet point
2010-01-13 21:07:01 +00:00
Evan Prodromou
d018ab7b0c
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-13 12:37:10 -08:00
Evan Prodromou
d032fc038a
make sure whoGets() doesn't write anything
2010-01-13 12:37:01 -08:00
Craig Andrews
681065d734
Made the IMAP plugin work in the style of the new queue/iomanagers
2010-01-13 15:35:53 -05:00
Zach Copley
c3188fd1fe
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-13 19:17:49 +00:00
Zach Copley
43170b3d18
When Twitter bridge encounters a 403 (rate limit) err, drop the notice
...
instead of requeuing.
2010-01-13 19:17:40 +00:00
Zach Copley
da5e6a6023
When Twitter bridge encounters a 403 (rate limit) err, drop the notice
...
instead of requeuing.
2010-01-13 19:15:54 +00:00
Brion Vibber
0e1f2d4b47
Fix regressions in XMPP output during inbox refactoring
...
- NOTICE_INBOX_SOURCE_* constants moved to common.php since Notice_inbox.php not always loaded
- fixed typo in User::staticGet() call which caused user #1 to receive messages once for each subscriber instead of for him/herself
- 'continue' -> 'continue 2' inside switch() statement to fix loop escape (PHP considers switch() a looping construct for break & continue)
2010-01-13 18:17:36 +00:00