diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2014-06-06 00:54:27 +0400 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2014-06-06 00:54:27 +0400 |
| commit | 0fe8f77c1748d167e115680346ae98bba78da38d (patch) | |
| tree | a456ff35bb2da1a2778f18ccab1ade63e9aaddda /settings/routes.php | |
| parent | fad3bd7fc0c094bd16e07708557cd1a7676889cd (diff) | |
| parent | e1beb8c6c38d48eb923ed323dea25110e4bbacfd (diff) | |
Merge branch 'master' into update_shipped_apps_from_appstore
Conflicts:
lib/private/app.php
settings/templates/apps.php
Diffstat (limited to 'settings/routes.php')
| -rw-r--r-- | settings/routes.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/settings/routes.php b/settings/routes.php index 433c5d5706e..1c8ad1b3fe8 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -25,6 +25,8 @@ $this->create('settings_admin', '/settings/admin') // users $this->create('settings_ajax_userlist', '/settings/ajax/userlist') ->actionInclude('settings/ajax/userlist.php'); +$this->create('settings_ajax_grouplist', '/settings/ajax/grouplist') + ->actionInclude('settings/ajax/grouplist.php'); $this->create('settings_ajax_createuser', '/settings/ajax/createuser.php') ->actionInclude('settings/ajax/createuser.php'); $this->create('settings_ajax_removeuser', '/settings/ajax/removeuser.php') @@ -44,6 +46,8 @@ $this->create('settings_users_changepassword', '/settings/users/changepassword') ->action('OC\Settings\ChangePassword\Controller', 'changeUserPassword'); $this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php') ->actionInclude('settings/ajax/changedisplayname.php'); +$this->create('settings_ajax_changegorupname', '/settings/ajax/changegroupname.php') + ->actionInclude('settings/ajax/changegroupname.php'); // personal $this->create('settings_personal_changepassword', '/settings/personal/changepassword') ->post() |