20d6a7caed
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
lib/xmppmanager.php
plugins/Xmpp/Fake_XMPP.php
scripts/imdaemon.php
2010-02-16 13:15:09 -05:00
d5cbfe8071
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/iomaster.php
2010-02-16 09:25:09 -08:00
81b6b58e33
Merge branch 'master' into testing
...
Conflicts:
lib/stompqueuemanager.php
2010-02-16 09:22:02 -08:00
c74aea589d
Stomp queue restructuring for mass scalability:
...
- Multiplexing queues into groups and for multiple sites.
- Sharing vs breakout configurable per site and per queue via $config['queue']['breakout']
- Detect how many times a message is redelivered, discard if it's killed too many daemons
- count configurable with $config['queue']['max_retries']
- can dump the items to files in $config['queue']['dead_letter_dir']
Queue daemon memory & resource leak fixes:
- avoid unnecessary reconnections to memcached server (switch persistent connections back in on second initialization, assuming it's child process)
- monkey-patch for leaky .ini loads in DB_DataObject::databaseStructure() - was leaking 200k per active switch
- applied leak fixes to Status_network as well, using intermediate base Safe_DataObject for both it and Memcache_DataObject
Misc queue fixes:
- correct handling of child processes exiting due to signal termination instead of regular exit
- shutdown instead of infinite respawn loop if we're already past the soft memory limit at startup
- Added --all option for xmppdaemon... still opens one xmpp connection per site that has xmpp active
Cache updates:
- add Cache::increment() method with native support for memcached atomic increment
2010-02-16 09:16:51 -08:00
3d0c3f0577
Pull fix from testing branch: use new encoding funcs w/ stomp queues
2010-02-16 09:15:29 -08:00
2e258454f3
Minor optimization to only bind an hover event to the notice at hand.
2010-02-16 17:36:45 +01:00
385fb94723
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-16 17:10:24 +01:00
3b8d060c29
Fix to allow any notice item with an attachment to use the overlay view
2010-02-16 17:09:34 +01:00
a8c2a8261e
move some nickname-guessing code to lib/util.php from OpenID
2010-02-16 11:06:10 -05:00
32084e33a2
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-02-16 10:25:57 -05:00
813451c9f9
add a couple of FIXME comments
2010-02-16 10:18:23 -05:00
5a357d5399
change find() to staticGet() to use cache
2010-02-16 09:58:33 -05:00
d4f6235d7b
Upgrade Twitter bridge to use OAuth 1.0a. It's more secure, and allows
...
us to automatically send in a callback url instead of having to manually
configure one for each StatusNet instance.
2010-02-16 06:19:20 +00:00
f414544d0d
Upgrade Twitter bridge to use OAuth 1.0a. It's more secure, and allows
...
us to automatically send in a callback url instead of having to manually
configure one for each StatusNet instance.
2010-02-16 06:12:08 +00:00
8869ccc94e
Temporary debug hack tracking down 'revoked accesstoken' issue with OMB posts
2010-02-15 15:19:16 -08:00
2e1e614abe
Use static class method for looking up Twitter user
2010-02-15 22:15:22 +00:00
0ba3759171
Use static class method for looking up Twitter user
2010-02-15 22:14:54 +00:00
9f8e25bfe7
Use static class method for looking up Twitter user
2010-02-15 22:13:10 +00:00
1996b709c6
Twitter-bridge: lookup old foreign_user by primary key not url
2010-02-15 22:06:18 +00:00
01c428796f
Twitter-bridge: lookup old foreign_user by primary key not url
2010-02-15 22:05:23 +00:00
66f427c373
Twitter-bridge: lookup old foreign_user by primary key not url
2010-02-15 21:53:49 +00:00
a69863eae6
Better log msgs. Removed debugging statement.
2010-02-15 21:24:31 +00:00
ead595eee8
Better log msgs. Removed debugging statement.
2010-02-15 21:24:12 +00:00
fdf6ed7b1a
Better log msgs. Removed debugging statement.
2010-02-15 21:23:26 +00:00
5db40c440d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-15 21:14:32 +00:00
82033b3773
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-15 21:14:01 +00:00
fe2ebec732
Fix for regression introduced with my last update to the
...
TwitterStatusFetcher: the Twitter bridge was not saving a foreign user
record when making a foreign link.
2010-02-15 21:13:53 +00:00
5cc1f8b001
Fix for regression introduced with my last update to the
...
TwitterStatusFetcher: the Twitter bridge was not saving a foreign user
record when making a foreign link.
2010-02-15 21:13:42 +00:00
2b6a39f70f
Fix for regression introduced with my last update to the
...
TwitterStatusFetcher: the Twitter bridge was not saving a foreign user
record when making a foreign link.
2010-02-15 21:10:45 +00:00
f5c69dfbf9
Updated the base stylesheet for minor fixes (which relied on indenting)
2010-02-15 21:34:41 +01:00
350f90eedc
Added another single whitespace
2010-02-15 21:21:25 +01:00
03edbfe24e
Added single whitespace to separate inline text words.
2010-02-15 20:41:46 +01:00
14a7353fd5
Localisation updates for !StatusNet from !translatewiki.net !sntrans
2010-02-14 21:12:59 +01:00
73e2264c6a
test parsing a default atom feed for activities
2010-02-14 13:19:32 -05:00
f78cf31303
update activity and salmon for previous commit
2010-02-14 12:12:47 -05:00
cea7d8018a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-14 12:09:07 -05:00
62f5c04ad2
More complete activity parsing
...
Began the process of actually digging up activity information
from an Atom entry. Added a test script to make sure parsing
is working right.
2010-02-14 12:08:09 -05:00
9465a4d5c6
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-13 20:28:39 +01:00
171bf3093a
Dialogbox for OStatus remote subscription
2010-02-13 20:28:05 +01:00
1cb94e0be6
Added dialogbox styles for OStatus subscribe form
2010-02-13 19:07:21 +01:00
4d050f96f3
Added XHR channel for OStatus Subscribe button
2010-02-13 18:49:14 +01:00
f30af7047b
Updated feed subscription form markup
2010-02-13 18:46:10 +01:00
24394269fa
Updated OStatus form markup
2010-02-13 18:44:41 +01:00
f6e766d5ac
Using the new remote subscription event and updated subscribe label
2010-02-13 18:42:00 +01:00
fc19179bc5
Added event hook to remote subscription
2010-02-13 18:40:36 +01:00
269b4711eb
Merge branch 'ssleverything' into testing
2010-02-13 12:39:15 -05:00
f3a82e787c
Add OStatus PuSH hub and Salmon links back into user and group feeds
2010-02-12 19:02:27 -08:00
f8a459a88a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-12 15:32:12 -08:00
d6f1df8b76
fix for Atom notice output: correct check against conversation & current id
2010-02-12 15:30:23 -08:00
38f42d56bc
Session fix for PHP 5.3 configurations where cookies are excluded from $_REQUEST via request_order in php.ini (Fedora 12, MacPorts known to be affected)
2010-02-12 15:24:15 -08:00
Craig Andrews
Brion Vibber
Sarven Capadisli
Evan Prodromou
Zach Copley
Siebrand Mazeland