Merge branch '0.9.x' into adminpanel

This commit is contained in:
Evan Prodromou
2009-11-11 00:22:42 -05:00
36 changed files with 1848 additions and 374 deletions

View File

@@ -428,9 +428,21 @@ class Router
$m->connect('api/account/verify_credentials.:format',
array('action' => 'ApiAccountVerifyCredentials'));
$m->connect('api/account/update_profile.:format',
array('action' => 'ApiAccountUpdateProfile'));
$m->connect('api/account/update_profile_image.:format',
array('action' => 'ApiAccountUpdateProfileImage'));
$m->connect('api/account/update_profile_background_image.:format',
array('action' => 'ApiAccountUpdateProfileBackgroundImage'));
$m->connect('api/account/update_profile_colors.:format',
array('action' => 'ApiAccountUpdateProfileColors'));
$m->connect('api/account/update_delivery_device.:format',
array('action' => 'ApiAccountUpdateDeliveryDevice'));
// special case where verify_credentials is called w/out a format
$m->connect('api/account/verify_credentials',