Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | update type hint in PHPDoc | Thomas Müller | 2014-03-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into fix-7307 | Thomas Müller | 2014-03-06 | 1 | -0/+3 |
|\ | | | | | | | | | | | Conflicts: core/js/router.js settings/js/admin.js | ||||
| * | Add button to send a test mail after changing the email settings | Joas Schilling | 2014-03-05 | 1 | -0/+3 |
| | | | | | | | | Fix #7175 | ||||
* | | Replace OC.Router.generate() with OC.generateUrl() | Thomas Müller | 2014-03-02 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 1 | -0/+3 |
|\ | | | | | Add option to change email settings in admin section | ||||
| * | Add option to change email settings in admin section | Joas Schilling | 2014-02-18 | 1 | -0/+3 |
| | | | | | | | | Fix issue #7166 | ||||
* | | Move isadmin to template and rename it to oc_isadmin | Lukas Reschke | 2014-02-19 | 1 | -2/+0 |
|/ | |||||
* | Improve changepassword route naming | kondou | 2013-09-13 | 1 | -2/+2 |
| | |||||
* | Move ajax/changepassword to changepassword/controller to use autoloading | kondou | 2013-09-13 | 1 | -3/+0 |
| | |||||
* | Use a controller instead of two files for changepassword.php | kondou | 2013-09-11 | 1 | -5/+10 |
| | |||||
* | Split personal and user-mgmt password change logic | kondou | 2013-09-06 | 1 | -0/+2 |
| | |||||
* | 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 |