summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Start migrationsJoas Schilling2017-07-0518-17/+1260
* Merge pull request #5441 from nextcloud/custom-theme-updateMorris Jobke2017-07-055-0/+149
|\
| * Add command to apply updates to custom themesJulius Härtl2017-07-055-0/+149
* | Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-...blizzz2017-07-053-29/+17
|\ \
| * | Don't log passwords on dav exceptionsJoas Schilling2017-06-293-29/+17
* | | Merge pull request #5569 from GitHubUser4234/ldap_password_renew_nc12fixMorris Jobke2017-07-054-2/+8
|\ \ \
| * | | suppress superflous php error on rejected password changeRoger Szabo2017-06-301-1/+1
| * | | set needsPasswordReset flag correctlyRoger Szabo2017-06-221-1/+1
| * | | css for button adjustment for nc12Roger Szabo2017-06-221-0/+5
| * | | pass missing function parameterRoger Szabo2017-06-211-0/+1
* | | | [tx-robot] updated from transifexNextcloud bot2017-07-0548-86/+112
* | | | Merge pull request #5549 from nextcloud/update-infoMorris Jobke2017-07-041-0/+1
|\ \ \ \
| * | | | Update admin.phpJos Poortvliet2017-06-271-0/+1
* | | | | Merge pull request #5556 from nextcloud/files_external_sftp_2048_4096Morris Jobke2017-07-043-9/+30
|\ \ \ \ \
| * | | | | Remove unused memberRoeland Jago Douma2017-06-301-2/+0
| * | | | | Allow 2048 and 4096 bit SFTP keysRoeland Jago Douma2017-06-293-7/+30
* | | | | | Merge pull request #5407 from nextcloud/5157-simple-logoMorris Jobke2017-07-0410-28/+21
|\ \ \ \ \ \
| * | | | | | Revert background-size as requested, issue will be fixed separatelyMarin Treselj2017-07-022-1/+4
| * | | | | | Simplified Nextcloud logo iconMarin Treselj2017-07-0210-32/+22
* | | | | | | Merge pull request #5591 from nextcloud/move-client-info-to-firstrunwizardMorris Jobke2017-07-045-151/+0
|\ \ \ \ \ \ \
| * | | | | | | Move sync client to the firstrunwizard appJoas Schilling2017-07-045-151/+0
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-046-44/+60
|/ / / / / / /
* / / / / / / [tx-robot] updated from transifexNextcloud bot2017-07-0326-40/+92
|/ / / / / /
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-0212-0/+614
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-0154-44/+242
* | | | | | [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