summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* adapt encryptionArthur Schiwon2017-06-235-7/+203
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adapt twofactore_backupcodesArthur Schiwon2017-06-236-30/+187
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* do not offer additional settings when there is no contentArthur Schiwon2017-06-231-1/+18
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adapt federatedfilesharingArthur Schiwon2017-06-237-84/+190
| | | | | | also drops IE8 switch Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* remove obsolete fileArthur Schiwon2017-06-231-47/+0
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Fix and extend acceptance testsArthur Schiwon2017-06-233-6/+55
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* already declared in TraitArthur Schiwon2017-06-231-2/+0
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* update autoloaderArthur Schiwon2017-06-232-0/+12
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* drone wasn't satisfied yetArthur Schiwon2017-06-231-5/+12
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* adjust another testArthur Schiwon2017-06-231-3/+19
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* …and adjust testsArthur Schiwon2017-06-231-22/+23
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* take over changes from #5166 and follow #5267Arthur Schiwon2017-06-235-128/+17
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* take over changes from #5084Arthur Schiwon2017-06-233-10/+59
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* move personal external storage settings to it's own sectionRobin Appelman2017-06-235-21/+173
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* fix getting sectionsRobin Appelman2017-06-231-2/+2
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Fix trait usageRobin Appelman2017-06-233-8/+4
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* add missing pieces to Settings Manager and fix and extend its unit testsArthur Schiwon2017-06-233-12/+180
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* remove obsolete filesArthur Schiwon2017-06-233-728/+0
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* add Additional (+ Fallback) section for Personal settingsArthur Schiwon2017-06-236-2/+127
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Adopt DB and Manager to personal settings structureArthur Schiwon2017-06-235-41/+229
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* sync clients have their own placeArthur Schiwon2017-06-235-56/+152
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* take over app passwordsArthur Schiwon2017-06-236-4/+133
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* convert Sessions sectionArthur Schiwon2017-06-234-0/+121
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* add storage info, fix URL generationArthur Schiwon2017-06-234-3/+36
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* fix displaying groups in personal infoArthur Schiwon2017-06-231-10/+44
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* completing PersonalInfoArthur Schiwon2017-06-237-9/+591
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* brief, incomplete personal info settings implementationArthur Schiwon2017-06-232-0/+383
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Extend interfacesArthur Schiwon2017-06-232-0/+53
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* one settings link, common template, stylingArthur Schiwon2017-06-233-17/+43
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* add route and controller. consolidate common settings functions in a trait.Arthur Schiwon2017-06-234-51/+204
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #5508 from nextcloud/no-activity-before-loginblizzz2017-06-231-3/+6
|\ | | | | Don't create activities for email and password change before login
| * Don't create activities for email and password change before loginJoas Schilling2017-06-221-3/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-06-23142-126/+190
| |
* | Merge pull request #5498 from nextcloud/allow-to-force-a-languageMorris Jobke2017-06-2212-288/+319
|\ \ | | | | | | Allow to force a language and set it via the ocs api
| * | Update autoloaderMorris Jobke2017-06-212-2/+0
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add unit tests for the new codeJoas Schilling2017-06-211-0/+180
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to force a language and set it via the ocs apiJoas Schilling2017-06-2110-286/+139
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #5491 from ↵blizzz2017-06-221-0/+13
|\ \ | | | | | | | | | | | | nextcloud/issue-5457-create-users-in-non-default-backends Create users in non default backends first
| * | Create users in non default backends firstJoas Schilling2017-06-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the time, when people have multiple backends or add a custom backend, they want to create the users there and not in the default backend. But since that is registered first, users were always created there. Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-2256-210/+212
| | |
* | | Merge pull request #5474 from nextcloud/wording-4925Morris Jobke2017-06-215-45/+45
|\ \ \ | | | | | | | | Improve wording of various error messages
| * | | Improve wording of various error messagesJan-Christoph Borchardt2017-06-215-45/+45
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #5252 from derkostka/masterMorris Jobke2017-06-212-2/+2
|\ \ \ \ | |_|_|/ |/| | | Use realpath to obtain the webroot.
| * | | Squashed the webroot fixSebastian Kostka2017-06-202-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-2118-2/+354
| |_|/ |/| |
* | | Merge pull request #5479 from nextcloud/pr-5459-follow-upMorris Jobke2017-06-201-10/+8
|\ \ \ | | | | | | | | Also allow group admins to toogle the storage location
| * | | Also allow group admins to toogle the storage locationJoas Schilling2017-06-201-10/+8
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | / [tx-robot] updated from transifexNextcloud bot2017-06-2030-58/+78
| |/ |/|
* | Merge pull request #5459 from ↵Morris Jobke2017-06-191-8/+24
|\ \ | | | | | | | | | | | | nextcloud/issue-5399-dont-reload-on-subadmin-setting-change Don't try to save the setting when its not an admin
| * | Don't try to save the setting when its not an adminJoas Schilling2017-06-191-8/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>