summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-30204-6892/+7042
* Merge pull request #4890 from nextcloud/unify-settingsblizzz2017-06-2971-741/+2439
|\
| * … and their tests needed adjustments, tooArthur Schiwon2017-06-295-8/+8
| * move admin templates to the right placeArthur Schiwon2017-06-2712-6/+6
| * move encryption to security (and behind two factor things)Arthur Schiwon2017-06-274-123/+3
| * try to lower the timeout in an acceptance testArthur Schiwon2017-06-261-1/+1
| * We're on 13 now…Arthur Schiwon2017-06-263-6/+6
| * fix typos and unnecessary white spacesArthur Schiwon2017-06-262-5/+4
| * forgotten test adjustmentsArthur Schiwon2017-06-231-6/+3
| * take out additional (legacy) settings section from testsArthur Schiwon2017-06-231-2/+1
| * fix setting up encryption sectionArthur Schiwon2017-06-232-78/+16
| * move twofactor_* into securityArthur Schiwon2017-06-233-101/+2
| * adapt to force language changesArthur Schiwon2017-06-233-22/+41
| * avoid marking two sections as active when they have the same nameArthur Schiwon2017-06-233-13/+17
| * adapt encryptionArthur Schiwon2017-06-235-7/+203
| * adapt twofactore_backupcodesArthur Schiwon2017-06-236-30/+187
| * do not offer additional settings when there is no contentArthur Schiwon2017-06-231-1/+18
| * adapt federatedfilesharingArthur Schiwon2017-06-237-84/+190
| * remove obsolete fileArthur Schiwon2017-06-231-47/+0
| * Fix and extend acceptance testsArthur Schiwon2017-06-233-6/+55
| * already declared in TraitArthur Schiwon2017-06-231-2/+0
| * update autoloaderArthur Schiwon2017-06-232-0/+12
| * drone wasn't satisfied yetArthur Schiwon2017-06-231-5/+12
| * adjust another testArthur Schiwon2017-06-231-3/+19
| * …and adjust testsArthur Schiwon2017-06-231-22/+23
| * take over changes from #5166 and follow #5267Arthur Schiwon2017-06-235-128/+17
| * take over changes from #5084Arthur Schiwon2017-06-233-10/+59
| * move personal external storage settings to it's own sectionRobin Appelman2017-06-235-21/+173
| * fix getting sectionsRobin Appelman2017-06-231-2/+2
| * Fix trait usageRobin Appelman2017-06-233-8/+4
| * add missing pieces to Settings Manager and fix and extend its unit testsArthur Schiwon2017-06-233-12/+180
| * remove obsolete filesArthur Schiwon2017-06-233-728/+0
| * add Additional (+ Fallback) section for Personal settingsArthur Schiwon2017-06-236-2/+127
| * Adopt DB and Manager to personal settings structureArthur Schiwon2017-06-235-41/+229
| * sync clients have their own placeArthur Schiwon2017-06-235-56/+152
| * take over app passwordsArthur Schiwon2017-06-236-4/+133
| * convert Sessions sectionArthur Schiwon2017-06-234-0/+121
| * add storage info, fix URL generationArthur Schiwon2017-06-234-3/+36
| * fix displaying groups in personal infoArthur Schiwon2017-06-231-10/+44
| * completing PersonalInfoArthur Schiwon2017-06-237-9/+591
| * brief, incomplete personal info settings implementationArthur Schiwon2017-06-232-0/+383
| * Extend interfacesArthur Schiwon2017-06-232-0/+53
| * one settings link, common template, stylingArthur Schiwon2017-06-233-17/+43
| * add route and controller. consolidate common settings functions in a trait.Arthur Schiwon2017-06-234-51/+204
* | Merge pull request #5490 from nextcloud/add-clear-site-data-headerLukas Reschke2017-06-292-1/+5
|\ \
| * | Add Clear-Site-Data headerLukas Reschke2017-06-202-1/+5
* | | Merge pull request #5460 from nextcloud/objectstore-error-loggingRoeland Jago Douma2017-06-291-5/+21
|\ \ \
| * | | improved logging of objectore errorsRobin Appelman2017-06-211-5/+21
* | | | Merge pull request #5526 from nextcloud/trashbin-error-logRoeland Jago Douma2017-06-291-1/+1
|\ \ \ \
| * | | | Improve logging of trash bin inconsistenciesMorris Jobke2017-06-231-1/+1