summaryrefslogtreecommitdiffstats
path: root/settings/Controller
Commit message (Collapse)AuthorAgeFilesLines
* Make ChangePasswordController strictRoeland Jago Douma2018-03-091-19/+8
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Set the correct active navigation entryJoas Schilling2018-03-053-8/+5
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* this was a migration step to ownCloud 8.0 to restructure the encryption ↵Bjoern Schiessle2018-03-021-161/+0
| | | | | | folder which is no longer needed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #8336 from nextcloud/cleanup-unused-parameterRoeland Jago Douma2018-02-202-18/+1
|\ | | | | Cleanup unused parameter
| * Remove fromMailAddress from MailSettingsControllerMorris Jobke2018-02-131-6/+1
| | | | | | | | | | | | Was removed in https://github.com/nextcloud/server/pull/4379 (0a54d5a) and https://github.com/nextcloud/server/pull/4380 (bae64e8) Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Remove crypto and timefactory from UsersControllerMorris Jobke2018-02-131-12/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #8365 from nextcloud/fix-phpdocMorris Jobke2018-02-151-1/+1
|\ \ | | | | | | Fix typo in PHPDoc
| * | Fix typo in PHPDocMorris Jobke2018-02-151-1/+1
| |/ | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / Remove unused import statementsMorris Jobke2018-02-142-6/+0
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Link to NC 14 dev manualRoeland Jago Douma2018-02-081-2/+9
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Use ::class statement instead of stringMorris Jobke2018-01-291-1/+2
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Remove unneeded semicolon and parenthesesMorris Jobke2018-01-262-2/+2
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Simplify ternary operator statementsMorris Jobke2018-01-261-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Return value immediately instead of assigning to a one-time variableMorris Jobke2018-01-261-3/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Properly catch InvalidTokenException for better error responseMorris Jobke2018-01-241-2/+10
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Properly log the full exception instead of only the messageMorris Jobke2018-01-231-1/+5
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Add warning regarding freetype supportRoeland Jago Douma2017-12-131-0/+9
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Show hint that PHP 5.6 will not be supported in Nextcloud 14 anymoreMorris Jobke2017-12-081-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7292 from Neraste/fix/4789_disabled_usersLukas Reschke2017-11-271-3/+3
|\ | | | | Fix #4789: Group admins cannot see disabled users
| * Fix #4789: Group admins cannot see disabled usersNeraste2017-11-271-3/+3
| |
* | Make isUpdateAvailable non-staticMorris Jobke2017-11-251-7/+12
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Fix search in user managent when no group is selectedMorris Jobke2017-11-141-1/+1
| | | | | | * also allows to search by displayname Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Change @georgehrke's emailMorris Jobke2017-11-061-1/+1
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Update license headersMorris Jobke2017-11-0612-2/+32
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Use DI for IAppManager to encryption migrationMorris Jobke2017-10-241-4/+13
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Set the data from the templateJoas Schilling2017-10-181-3/+1
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Set the subject with the email template to allow themingJoas Schilling2017-10-181-1/+2
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* fix urlBjoern Schiessle2017-10-171-2/+2
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* App management: add update sectionJulius Härtl2017-10-101-0/+29
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Make sure the password contains special charactersJoas Schilling2017-09-071-1/+3
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge setMetaData into constructorJoas Schilling2017-09-041-3/+1
| | | | | | This ensures that the meta data is set in the beginning Signed-off-by: Joas Schilling <coding@schilljs.com>
* Implement metadata for email templates of remaining emailsMorris Jobke2017-08-301-0/+5
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Fix group management which was broken since #5847Tobia De Koninck2017-08-151-3/+4
| | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* Use public API instead of privateLukas Reschke2017-08-011-8/+8
| | | | | | | | The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work. Fixes https://github.com/nextcloud/server/issues/5950 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Fix settings/Controller/Lukas Reschke2017-08-013-18/+23
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* Stricter phan config fixesLukas Reschke2017-08-011-6/+5
| | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* The app password avoids 1Il etc. Adapted comment accordinglyMarcel Waldvogel2017-07-211-1/+1
| | | | Signed-off-by: Marcel Waldvogel <marcel.waldvogel@uni-konstanz.de>
* no warning on password change if no encryption module uses per-user keysBjoern Schiessle2017-07-061-1/+22
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #5404 from ↵blizzz2017-07-051-0/+4
|\ | | | | | | | | nextcloud/use-translated-hint-insteadof-english-error Use translated Hint instead of english error on password policy
| * Use translated Hint instead of english error on password policyJoas Schilling2017-06-141-0/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5342 from nextcloud/userlist-used-spaceMorris Jobke2017-07-051-44/+61
|\ \ | | | | | | show used space in user list
| * | show used space in user listRobin Appelman2017-06-151-44/+61
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | avoid marking two sections as active when they have the same nameArthur Schiwon2017-06-233-13/+17
| | | | | | | | … in both personal and admin.
* | already declared in TraitArthur Schiwon2017-06-231-2/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Fix trait usageRobin Appelman2017-06-233-8/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | add Additional (+ Fallback) section for Personal settingsArthur Schiwon2017-06-232-2/+37
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | add route and controller. consolidate common settings functions in a trait.Arthur Schiwon2017-06-233-49/+203
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Allow to force a language and set it via the ocs apiJoas Schilling2017-06-211-87/+0
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Also cover the settings endpointJoas Schilling2017-06-021-19/+31
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Improve readability of verify textMorris Jobke2017-05-081-2/+2
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>