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
Sarven Capadisli
d84c33c328
Unchecks location sharing for geo location if it timesout
2010-01-13 15:51:32 +00:00
Sarven Capadisli
af97a14f7c
Timeout should be 10000, not 10
...
Revert "Unchecks location sharing for geo location if it timesout"
This reverts commit 8887d7a314
2010-01-13 15:50:45 +00:00
Sarven Capadisli
8887d7a314
Unchecks location sharing for geo location if it timesout
2010-01-13 15:48:26 +00:00
Sarven Capadisli
2000d2d36b
Added timeout error handling for geo location
2010-01-13 15:36:42 +00:00
Sarven Capadisli
9b2fdefe39
Using a JSON object for NoticeDataGeo text instead
2010-01-13 15:21:43 +00:00
Sarven Capadisli
543026b8d1
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-13 13:37:04 +00:00
Evan Prodromou
c26246c4c3
Merge branch 'subthrottle' into 0.9.x
2010-01-13 03:11:44 -08:00
Evan Prodromou
f2e9469e16
throttle subscriptions
2010-01-13 03:11:31 -08:00
Evan Prodromou
601c371332
correct check for error in subscribe and unsubscribe actions
2010-01-13 03:01:22 -08:00
Evan Prodromou
430bd69312
add events for subscribing to people and joining groups
2010-01-13 02:16:13 -08:00
Evan Prodromou
23599da91e
refactor jabber broadcast for notice_inbox removal
2010-01-13 01:13:49 -08:00
Evan Prodromou
43ff542189
Don't save reply info for repeats
2010-01-13 01:13:06 -08:00
Evan Prodromou
8bfa7fdeaf
repeats don't get posted to groups
2010-01-13 00:47:12 -08:00
Evan Prodromou
5397249e50
remove vestiges of Notice_inbox from cache clearing code in Notice
2010-01-13 00:45:12 -08:00
