Commit Graph

9251 Commits

Author SHA1 Message Date
Evan Prodromou
11f3d8ce31 Merge branch 'testing' 2010-01-28 21:12:34 -05:00
Zach Copley
f8ef923aae Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-29 01:54:31 +00:00
Zach Copley
d70be6d2ad Adjust API authentication to also check for OAuth protocol params in the
HTTP Authorization header, as defined in OAuth HTTP Authorization Scheme.
2010-01-29 01:54:26 +00:00
Zach Copley
292ac40cae Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-29 01:53:11 +00:00
Zach Copley
48a1a5a2dc Adjust API authentication to also check for OAuth protocol params in the
HTTP Authorization header, as defined in OAuth HTTP Authorization Scheme.
2010-01-29 01:49:38 +00:00
Brion Vibber
da34de74fe Merge branch 'testing' 2010-01-28 16:55:37 -08:00
Evan Prodromou
d13d73c563 Last-chance distribution if enqueueing fails 2010-01-28 16:53:37 -08:00
Brion Vibber
155a5d446f Manual failover for stomp queues.
If an array of multiple servers is put in $config['queue']['stomp_server'], enqueues will pick a random server to send to (failing over automatically if any are down).
Queue handling daemons connect all servers so they get events no matter where they were delivered.
In case of disconnection, daemons should now handle it gracefully and attempt to reconnect every 60 seconds or so, automatically resubscribing to all queues once it's back up.

Can put to 'native' failover for reads as well by disabling $config['stomp']['manual_failover'] = false; but this is untested and may explode in addition to requiring that your ActiveMQ cluster actually be set up to handle its own data distribution.

Additionally, can choose which queues to mark as persistent by setting $config['stomp']['persistent'] to an array of queue names.
2010-01-28 16:49:32 -08:00
Siebrand Mazeland
1001c8ffd7 Localisation updates for !StatusNet from !translatewiki.net !sntrans 2010-01-29 00:07:54 +01:00
Evan Prodromou
63a0e84a8b lost config in index.php made all traffic go to master 2010-01-28 16:52:42 -05:00
Evan Prodromou
a33194effb Revert "Revert "move RW setup above user get in index.php so remember_me works""
This reverts commit be7bca2303.
2010-01-28 16:52:05 -05:00
Evan Prodromou
be7bca2303 Revert "move RW setup above user get in index.php so remember_me works"
This reverts commit fa78953337.
2010-01-28 16:50:28 -05:00
Evan Prodromou
fa78953337 move RW setup above user get in index.php so remember_me works 2010-01-28 16:35:38 -05:00
Brion Vibber
d00ce38549 Merge commit 'origin/master' into testing 2010-01-28 13:35:09 -08:00
Evan Prodromou
513f8be07a hide most DB_DataObject errors 2010-01-28 16:26:55 -05:00
Evan Prodromou
74a03cbe1f always set up database_rw, regardless, so cached sessions work 2010-01-28 14:27:35 -05:00
Evan Prodromou
d5f86f7a8a Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-28 13:54:19 -05:00
Evan Prodromou
84b5480007 update mysqltimestamps on insert and update 2010-01-28 13:54:01 -05:00
Evan Prodromou
c81318d3ca additional debugging data for Sessions 2010-01-28 13:53:28 -05:00
Zach Copley
e5ff610e75 'Sign in with Twitter' button img 2010-01-28 18:47:12 +00:00
Sarven Capadisli
86fed21c14 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-01-28 19:37:31 +01:00
Sarven Capadisli
171c97f17e Update to aside styles in biz theme 2010-01-28 19:36:58 +01:00
Sarven Capadisli
1e8b14d24b Update to notice item in biz theme 2010-01-28 19:36:58 +01:00
Sarven Capadisli
8eec008b0c Update to biz theme button close and minimize styles 2010-01-28 19:36:57 +01:00
Sarven Capadisli
72fc0f6b8a Update to biz theme's input styles 2010-01-28 19:36:57 +01:00
Sarven Capadisli
f66e0ed139 Updated biz theme entity_actions styles 2010-01-28 19:36:57 +01:00
Sarven Capadisli
9af751c03a Updated biz theme to use dialogbox styles 2010-01-28 19:36:57 +01:00
Sarven Capadisli
852a8b8295 Updated biz theme notice options 2010-01-28 19:36:57 +01:00
Sarven Capadisli
8a18fd9591 Updated biz theme to hide form_repeat legend 2010-01-28 19:36:57 +01:00
Sarven Capadisli
f4c037f956 Updated biz theme to use the single icons file 2010-01-28 19:36:57 +01:00
Sarven Capadisli
108aa050af Updated geo sharing styles for biz 2010-01-28 19:36:57 +01:00
Sarven Capadisli
df2390a90f Fixed layout when ad plugin is on for biz 2010-01-28 19:36:57 +01:00
Sarven Capadisli
612dce4fe1 Fixed layout for powered by statusnet in biz 2010-01-28 19:36:57 +01:00
Zach Copley
d773ed8193 Remove redundant session token field from form (was already being added by base class). 2010-01-28 18:36:30 +00:00
Zach Copley
8cdb319533 Remove redundant session token field from form (was already being added by base class). 2010-01-28 18:34:25 +00:00
Zach Copley
b96f30168c Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-01-28 18:15:50 +00:00
Zach Copley
558bf0f489 'Sign in with Twitter' button img 2010-01-28 18:15:45 +00:00
Zach Copley
8d87a1ea3c Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-01-28 18:12:25 +00:00
Zach Copley
664a82e836 'Sign in with Twitter' button img 2010-01-28 18:11:44 +00:00
Brion Vibber
a868a523a5 Can now set $config['queue']['stomp_persistent'] = false; to explicitly disable persistence when we queue items 2010-01-28 09:52:35 -08:00
Sarven Capadisli
d0f3fee65b Update to aside styles in biz theme 2010-01-28 18:43:56 +01:00
Sarven Capadisli
919dfeeb93 Update to notice item in biz theme 2010-01-28 18:43:56 +01:00
Sarven Capadisli
a8555dc3a6 Update to biz theme button close and minimize styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
325b893bd8 Update to biz theme's input styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
87fad943e6 Updated biz theme entity_actions styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
09b62f0144 Updated biz theme to use dialogbox styles 2010-01-28 18:43:56 +01:00
Sarven Capadisli
8add14b046 Updated biz theme notice options 2010-01-28 18:43:56 +01:00
Sarven Capadisli
c88979d359 Updated biz theme to hide form_repeat legend 2010-01-28 18:43:56 +01:00
Sarven Capadisli
ffd2e431a9 Updated biz theme to use the single icons file 2010-01-28 18:43:56 +01:00
Sarven Capadisli
16160ef102 Updated geo sharing styles for biz 2010-01-28 18:43:56 +01:00