Commit Graph

17 Commits

Author SHA1 Message Date
Björn Schießle 0a3d662dd0 register decrypt all route 2013-07-29 13:39:37 +02:00
Bart Visscher bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bart Visscher 83f161d3f9 Style cleanup settings 2013-02-21 23:47:56 +01:00
Frank Karlitschek 66cab77b6d merge master
Merge branch 'master' into improved_appsmanagement

Conflicts:
	settings/apps.php
	settings/templates/apps.php
2013-01-30 14:36:17 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Björn Schießle e0f2ed2757 interface and API to change display names 2013-01-28 14:09:11 +01:00
Lukas Reschke d2383338de External JSON for the Apps 2013-01-21 22:18:42 +01:00
Lukas Reschke 3ed7d5d521 Move isadmin to external file 2013-01-21 21:25:38 +01:00
Frank Karlitschek a27f92a17a we are getting closer. updating is not working yet. 2013-01-21 20:40:23 +01:00
Bart Visscher b608675938 Merge pull request #1157 owncloud/move-OpenID
Move openid.php to apps repo

Conflicts:
	settings/routes.php
2013-01-11 22:57:40 +01:00
Lukas Reschke e11b650d2e Remove OpenID from the router 2013-01-11 17:24:10 +01:00
Lukas Reschke 466cdab680 Add security section to admin menu
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)
2013-01-11 14:18:51 +01:00
Bart Visscher 9318a9566a Merge pull request #136 from scambra/users-fixes
fix settings' routes
2012-10-29 15:31:37 -07:00
Bart Visscher 1bdd0c949b Move and fix app setting navigation detect 2012-10-29 15:04:55 +01:00
scambra 1f0bc1713f fix settings routes 2012-10-29 14:50:03 +01:00
Bart Visscher 167e9c1cc0 Fix route name 2012-10-05 09:41:27 +02:00
Bart Visscher bb136b9adf Make the settings ajax calls use the router 2012-10-02 18:00:23 +02:00