Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | register decrypt all route | Björn Schießle | 2013-07-29 | 1 | -0/+2 |
| | |||||
* | Whitespace fixes | Bart Visscher | 2013-02-22 | 1 | -1/+1 |
| | |||||
* | Style cleanup settings | Bart Visscher | 2013-02-21 | 1 | -1/+1 |
| | |||||
* | merge master | Frank Karlitschek | 2013-01-30 | 1 | -0/+6 |
|\ | | | | | | | | | | | | | | | Merge branch 'master' into improved_appsmanagement Conflicts: settings/apps.php settings/templates/apps.php | ||||
| * | Merge pull request #1360 from owncloud/display_name | Lukas Reschke | 2013-01-29 | 1 | -0/+2 |
| |\ | | | | | | | introduction of display names | ||||
| | * | interface and API to change display names | Björn Schießle | 2013-01-28 | 1 | -0/+2 |
| | | | |||||
| * | | External JSON for the Apps | Lukas Reschke | 2013-01-21 | 1 | -0/+2 |
| | | | |||||
| * | | Move isadmin to external file | Lukas Reschke | 2013-01-21 | 1 | -0/+2 |
| |/ | |||||
* / | we are getting closer. updating is not working yet. | Frank Karlitschek | 2013-01-21 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #1157 owncloud/move-OpenID | Bart Visscher | 2013-01-11 | 1 | -4/+0 |
|\ | | | | | | | | | | | | | Move openid.php to apps repo Conflicts: settings/routes.php | ||||
| * | Remove OpenID from the router | Lukas Reschke | 2013-01-11 | 1 | -5/+1 |
| | | |||||
* | | Add security section to admin menu | Lukas Reschke | 2013-01-11 | 1 | -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-fixes | Bart Visscher | 2012-10-29 | 1 | -2/+2 |
|\ | | | | | fix settings' routes | ||||
| * | fix settings routes | scambra | 2012-10-29 | 1 | -2/+2 |
| | | |||||
* | | Move and fix app setting navigation detect | Bart Visscher | 2012-10-29 | 1 | -0/+2 |
|/ | |||||
* | Fix route name | Bart Visscher | 2012-10-05 | 1 | -1/+1 |
| | |||||
* | Make the settings ajax calls use the router | Bart Visscher | 2012-10-02 | 1 | -0/+62 |