aboutsummaryrefslogtreecommitdiffstats
path: root/settings/routes.php
Commit message (Collapse)AuthorAgeFilesLines
* register decrypt all routeBjörn Schießle2013-07-291-0/+2
|
* Whitespace fixesBart Visscher2013-02-221-1/+1
|
* Style cleanup settingsBart Visscher2013-02-211-1/+1
|
* merge masterFrank Karlitschek2013-01-301-0/+6
|\ | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php
| * Merge pull request #1360 from owncloud/display_nameLukas Reschke2013-01-291-0/+2
| |\ | | | | | | introduction of display names
| | * interface and API to change display namesBjörn Schießle2013-01-281-0/+2
| | |
| * | External JSON for the AppsLukas Reschke2013-01-211-0/+2
| | |
| * | Move isadmin to external fileLukas Reschke2013-01-211-0/+2
| |/
* / we are getting closer. updating is not working yet.Frank Karlitschek2013-01-211-0/+2
|/
* Merge pull request #1157 owncloud/move-OpenIDBart Visscher2013-01-111-4/+0
|\ | | | | | | | | | | | | Move openid.php to apps repo Conflicts: settings/routes.php
| * Remove OpenID from the routerLukas Reschke2013-01-111-5/+1
| |
* | Add security section to admin menuLukas Reschke2013-01-111-0/+2
|/ | | | | | | | | Currently it only allows the admin to enable or disable the HTTPS enforcement, but in the future it could be expanded to further options. The HTTPS enforcement only allows the admin to enforce it, if he is connected via HTTPS. (To prevent admins to enable it without a proper SSL setup)
* Merge pull request #136 from scambra/users-fixesBart Visscher2012-10-291-2/+2
|\ | | | | fix settings' routes
| * fix settings routesscambra2012-10-291-2/+2
| |
* | Move and fix app setting navigation detectBart Visscher2012-10-291-0/+2
|/
* Fix route nameBart Visscher2012-10-051-1/+1
|
* Make the settings ajax calls use the routerBart Visscher2012-10-021-0/+62