summaryrefslogtreecommitdiffstats
path: root/settings/admin
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into type-hintingBart Visscher2014-03-311-1/+31
|\ | | | | | | | | | | | | | | | | Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php
| * Authentification -> AuthenticationThomas Müller2014-03-111-1/+1
| |
| * Add button to send a test mail after changing the email settingsJoas Schilling2014-03-051-0/+30
| | | | | | | | Fix #7175
* | More PHPDoc updatesBart Visscher2014-02-281-2/+2
|/
* Remove unused variables, add doc blocks and break linesJoas Schilling2014-02-261-4/+14
| | | | Fix #7166
* Add option to change email settings in admin sectionJoas Schilling2014-02-181-0/+83
Fix issue #7166