Craig Andrews
057ec1fcea
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
Brion Vibber
f4c81fa1e1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-02 09:57:50 -08:00
Zach Copley
dae28d98d1
Linkify notice source when posting from registered OAuth apps
2010-02-02 08:51:01 +00:00
Zach Copley
8191273078
Better token revocation
2010-02-02 08:50:33 +00:00
Zach Copley
f0875ceea1
Allow developers to delete OAuth applications
2010-02-02 08:50:18 +00:00
Zach Copley
5e90f744a6
Linkify notice source when posting from registered OAuth apps
2010-02-02 08:47:14 +00:00
Zach Copley
f1094185e4
Better token revocation
2010-02-02 07:35:54 +00:00
Zach Copley
38bebb4c0d
Allow developers to delete OAuth applications
2010-02-02 06:26:03 +00:00
Evan Prodromou
f964357de9
readme and version for beta5
2010-02-01 13:44:06 -05:00
Brion Vibber
c14ac57b19
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-01 10:30:45 -08:00
Brion Vibber
fba4153346
Don't enqueue into plugin or SMS queues when disabled (breaks unqueuehandler if SMS queue isn't attached)
2010-02-01 10:16:19 -08:00
Evan Prodromou
779204b194
Merge branch 'testing' into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
2010-01-31 15:27:58 -05:00
Evan Prodromou
81087e45c5
move schema.type.php to typeschema.php like other files
2010-01-31 15:25:59 -05:00
Evan Prodromou
ebf4e497f6
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-31 15:20:57 -05:00
Evan Prodromou
30268cff78
Add Really Simple Discovery (RSD) support
...
Anil Dash suggested that all implementers of the Twitter API include
support for the remedial RSD format. This commit adds an RSD action
that returns the API root and additional API data to help client
developers discover and use our Twitter-compatible API.
http://dashes.com/anil/2009/12/the-twitter-api-is-finished.html
http://tales.phrasewise.com/rfc/rsd
2010-01-31 15:16:59 -05:00
Evan Prodromou
dc62246443
Add a robots.txt URL to the site root
...
Adds a robots.txt file to the site root. Defaults defined by
'robotstxt' section of config. New events StartRobotsTxt and
EndRobotsTxt to let plugins add information. Probably not
useful if path is not /, but won't hurt anything, either.
2010-01-31 10:12:26 -05:00
Evan Prodromou
4ae31f3476
on exceptions, stomp logs the error and reenqueues
2010-01-30 13:15:17 -05:00
Brenda Wallace
22a6e46b45
removed describeTable from base class, and fixed it up in pgsql
2010-01-30 21:22:30 +13:00
Brenda Wallace
870c83c17d
getTableDef() mostly working in postgres
2010-01-30 21:12:06 +13:00
Brenda Wallace
e765a9657b
move the schema DDL sql off into seperate files for each db we support
2010-01-30 18:45:10 +13:00
Craig Andrews
61d4709eb8
Pass username and nickname to autoregister so auth plugins can set the nickname correct when creating a new user.
...
Continues fixing what Eric Helgeson pointed out in 01eb4e8f00
2010-01-29 20:43:16 -05:00
Eric Helgeson
01eb4e8f00
autoRegister() expects a username existing in ldap, not the suggested_nickname
2010-01-29 17:58:15 -05:00
Evan Prodromou
a7b2a08c42
for single-user mode, retrieve either site owner or defined nickname
2010-01-29 15:15:52 -05:00
Brion Vibber
4d3808a815
Fix more fatal errors in queue edge cases
2010-01-28 23:08:36 -08:00
Brion Vibber
e5eca9bd2c
Don't attempt to resend XMPP messages that can't be broadcast due to the profile being deleted.
2010-01-28 22:51:07 -08:00
Brion Vibber
990b0f7995
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-28 22:29:26 -08:00
Brion Vibber
ccb678ad15
Wrap each bit of distrib queue handler's saving operation in a try/catch; log exceptions but let everything else continue.
2010-01-28 22:26:58 -08:00
Zach Copley
5868511716
Move sessions settings to its own panel
2010-01-28 22:06:01 -08:00
Zach Copley
440ee00b1e
Move sessions settings to its own panel
2010-01-28 22:04:14 -08: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
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
Brion Vibber
d00ce38549
Merge commit 'origin/master' into testing
2010-01-28 13:35:09 -08:00
Craig Andrews
d14651706c
Merge branch '0.9.x' into 1.0.x
2010-01-28 16:13:06 -05:00
Craig Andrews
0651404000
Add backwards compatibility for the XMPP configuration before XMPP was made into a plugin
2010-01-28 16:08:42 -05: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
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
588f5ec36b
Removed unused variable assignment for avatar URL and added missing fn
2010-01-28 15:08:18 +01:00
Sarven Capadisli
dcce323d18
Removed unused variable assignment for avatar URL and added missing fn
2010-01-28 15:05:23 +01:00
Brion Vibber
78fe76b058
dropping the setcookie() call from common_ensure_session() since we're pretty sure it's unnecessary
2010-01-27 23:16:06 -08:00
Brion Vibber
65c4cff01c
append '/' on cookie path for now (may still need some refactoring)
2010-01-27 23:14:49 -08:00
Evan Prodromou
5bf4928db8
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-28 01:25:08 -05:00
Evan Prodromou
1ba8045a9b
set session cookie correctly
2010-01-28 01:24:00 -05:00
Brion Vibber
7347381183
Fix for Mapstraction plugin's zoomed map links
...
Move definition of NICKNAME_FMT above plugin initialization but below loading of Validate package.
A merge error when refactoring setup lead to this not being defined yet when plugins were initialized, causing the router setup in MapstractionPlugin which tried to use this constant to fail.
Result was bogus links and if you hit the URL directly the action would be "unrecognized".
2010-01-27 21:42:13 -08:00
Brion Vibber
427ac3a3a6
debug log line for control channel sub
2010-01-27 20:51:04 -08:00
Craig Andrews
914bc9f9c5
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-01-27 22:07:04 -05:00
Evan Prodromou
ee4ea3f3e1
increment software beta version
2010-01-27 21:59:38 -05:00
Brion Vibber
3abfb454a3
Adds an emergency switch so we can run inbox distribution at save time (bypassing 'distrib' queue)
...
Set $config['queue']['inboxes'] = false to do so
2010-01-27 18:39:17 -08:00