diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-01-30 14:36:17 +0100 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-01-30 14:36:17 +0100 |
| commit | 66cab77b6d83980d260cd35556d2759089d2971b (patch) | |
| tree | ccf3767afba89f90ea82bd0805f23eb189956b53 /settings/routes.php | |
| parent | 389c4e84153893a04310876ef70943cad53ee3e7 (diff) | |
| parent | 5761bd771f4142394a00083712b63e77f8976946 (diff) | |
| download | nextcloud-server-66cab77b6d83980d260cd35556d2759089d2971b.tar.gz nextcloud-server-66cab77b6d83980d260cd35556d2759089d2971b.zip | |
merge master
Merge branch 'master' into improved_appsmanagement
Conflicts:
settings/apps.php
settings/templates/apps.php
Diffstat (limited to 'settings/routes.php')
| -rw-r--r-- | settings/routes.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/settings/routes.php b/settings/routes.php index fa78f566525..0a8af0dde2b 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -39,6 +39,8 @@ $this->create('settings_ajax_removegroup', '/settings/ajax/removegroup.php') ->actionInclude('settings/ajax/removegroup.php'); $this->create('settings_ajax_changepassword', '/settings/ajax/changepassword.php') ->actionInclude('settings/ajax/changepassword.php'); +$this->create('settings_ajax_changedisplayname', '/settings/ajax/changedisplayname.php')
+->actionInclude('settings/ajax/changedisplayname.php'); // personel $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php') ->actionInclude('settings/ajax/lostpassword.php'); @@ -55,6 +57,8 @@ $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php') ->actionInclude('settings/ajax/updateapp.php'); $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php') ->actionInclude('settings/ajax/navigationdetect.php'); +$this->create('apps_custom', '/settings/js/apps-custom.js') + ->actionInclude('settings/js/apps-custom.php'); // admin $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php') ->actionInclude('settings/ajax/getlog.php'); @@ -62,3 +66,5 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php') ->actionInclude('settings/ajax/setloglevel.php'); $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php') ->actionInclude('settings/ajax/setsecurity.php'); +$this->create('isadmin', '/settings/js/isadmin.js') + ->actionInclude('settings/js/isadmin.php'); |