diff options
| author | Zach Copley <zach@status.net> | 2009-10-12 12:31:14 -0700 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-10-12 12:31:14 -0700 |
| commit | e071a8cbffd8eaf63f2d92e15edc2f6f25d9c984 (patch) | |
| tree | 6c5ceb667b9d31118682417b7a9dbb183331dc5b /lib/router.php | |
| parent | 061af8fa06ccb98f667d1ee670da2dbb179d8b0e (diff) | |
| parent | f719720e8ad3b09d664e33172bafef2b0fb91eea (diff) | |
Moved group create API into its own action
Merge branch '0.9.x' into refactor-api
* 0.9.x:
Implemented create group api
fix FBConnect so it doesn't muffle EndPrimaryNav
don't write session if it's unchanged
Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
Fixed facebook connect primary nav to obey sms/twitter/openid settings
Fixed facebook connect login nav to obey openid settings
Fixed facebook connect nav to obey sms/twitter disabled
Fixed twitter defaulting to disabled
Revert "Open tags should have closing tags"
Don't show search suggestions for private sites
Fixed E_NOTICE when returnto isn't set
Fixed E_NOTICE when the "lite" parameter isn't included in the request
Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
Returning false seems to fix IE from reclaiming window focus. I think
Aligning notice attach label from right instead of left
Fixed IE background image alignment for attach, favour and disfavour
Fixed nudge and direct message background image alignment
Using 'CSS sprites' for common icons for the identica theme. Default
Open tags should have closing tags
Conflicts:
actions/twitapigroups.php
actions/twitapistatuses.php
Diffstat (limited to 'lib/router.php')
| -rw-r--r-- | lib/router.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/router.php b/lib/router.php index 11f913f6e..b9a45d867 100644 --- a/lib/router.php +++ b/lib/router.php @@ -569,9 +569,13 @@ class Router 'format' => '(xml|json)')); $m->connect('api/statusnet/groups/membership/:id.:format', - array('action' => 'ApiGroupMembership', + array('action' => 'ApiGroupMembership', 'id' => '[a-zA-Z0-9]+', 'format' => '(xml|json)')); + + $m->connect('api/statusnet/groups/create.:format', + array('action' => 'ApiGroupCreate', + 'format' => '(xml|json)')); // Tags $m->connect('api/statusnet/tags/timeline/:tag.:format', array('action' => 'ApiTimelineTag', |