diff options
| author | Andreas Jacobsen <andreasjacobsen93@gmail.com> | 2017-07-15 09:33:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-15 09:33:24 +0200 |
| commit | 118f0d2b4db296b6d4275918813f89340425a4f6 (patch) | |
| tree | 503fdfe6653cfb8019bee5818dbdc4e9731ab09a /settings/routes.php | |
| parent | 84eb18b01172014919f6a257fd9323fb5cfcc59b (diff) | |
| parent | a23cdd04bb3ba3ff9e6313ae92b01d4fc0c1167c (diff) | |
| download | nextcloud-server-118f0d2b4db296b6d4275918813f89340425a4f6.tar.gz nextcloud-server-118f0d2b4db296b6d4275918813f89340425a4f6.zip | |
Merge branch 'master' into clean-settings-layout
Diffstat (limited to 'settings/routes.php')
| -rw-r--r-- | settings/routes.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/settings/routes.php b/settings/routes.php index 048febaa129..12da950ed2f 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -65,6 +65,7 @@ $application->registerRoutes($this, [ ['name' => 'Certificate#removePersonalRootCertificate', 'url' => '/settings/personal/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], ['name' => 'Certificate#addSystemRootCertificate', 'url' => '/settings/admin/certificate', 'verb' => 'POST'], ['name' => 'Certificate#removeSystemRootCertificate', 'url' => '/settings/admin/certificate/{certificateIdentifier}', 'verb' => 'DELETE'], + ['name' => 'PersonalSettings#index', 'url' => '/settings/user/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'personal-info']], ['name' => 'AdminSettings#index', 'url' => '/settings/admin/{section}', 'verb' => 'GET', 'defaults' => ['section' => 'server']], ['name' => 'AdminSettings#form', 'url' => '/settings/admin/{section}', 'verb' => 'GET'], ['name' => 'ChangePassword#changePersonalPassword', 'url' => '/settings/personal/changepassword', 'verb' => 'POST'], @@ -82,8 +83,6 @@ $application->registerRoutes($this, [ // Settings pages $this->create('settings_help', '/settings/help') ->actionInclude('settings/help.php'); -$this->create('settings_personal', '/settings/personal') - ->actionInclude('settings/personal.php'); $this->create('settings_users', '/settings/users') ->actionInclude('settings/users.php'); // Settings ajax actions |