summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-0828-74/+98
* Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-0719-67/+251
|\
| * Fix testsJoas Schilling2017-06-201-6/+6
| * Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-2018-61/+245
* | [tx-robot] updated from transifexNextcloud bot2017-07-0712-78/+90
* | adjust encryption tests to the new master key defaultBjoern Schiessle2017-07-061-1/+1
* | update sharing test to new master key defaultBjoern Schiessle2017-07-061-0/+2
* | fix and extend dav test to also test the master-key setupBjoern Schiessle2017-07-062-0/+52
* | since the default for the master key changed we need to write the setting exp...Bjoern Schiessle2017-07-062-1/+84
* | add occ command to disable the master key againBjoern Schiessle2017-07-061-0/+89
* | improve status messagesBjoern Schiessle2017-07-064-7/+27
* | after the master key was loaded we are ready to go, no re-login neededBjoern Schiessle2017-07-063-4/+17
* | only collect detailed access list if it is really neededBjoern Schiessle2017-07-061-0/+9
* | make master key the new defaultBjoern Schiessle2017-07-062-1/+2
* | [tx-robot] updated from transifexNextcloud bot2017-07-068-0/+8
* | Merge pull request #5231 from nextcloud/migrationsMorris Jobke2017-07-054-86/+100
|\ \
| * | Fix dropping tables and handle the prefix automaticallyJoas Schilling2017-07-052-8/+5
| * | Move twofactor_backupcodes to migrationsJoas Schilling2017-07-054-86/+103
* | | Merge pull request #5621 from nextcloud/fix-sorting-of-favorite-files-in-file...Morris Jobke2017-07-052-2/+121
|\ \ \
| * | | Fix sorting of favorite filesDaniel Calviño Sánchez2017-07-052-2/+121
* | | | Merge pull request #5580 from nextcloud/admin-audit-updateMorris Jobke2017-07-0514-238/+346
|\ \ \ \ | |_|/ / |/| | |
| * | | Log console commandsJoas Schilling2017-07-012-0/+56
| * | | Listen to app enable/disable eventsJoas Schilling2017-07-012-1/+84
| * | | Move logic to Application classJoas Schilling2017-07-013-223/+152
| * | | Move to PSR-4Joas Schilling2017-07-0112-26/+66
* | | | Merge pull request #5557 from nextcloud/dont-log-passwords-on-dav-exceptions-...blizzz2017-07-052-24/+7
|\ \ \ \
| * | | | Don't log passwords on dav exceptionsJoas Schilling2017-06-292-24/+7
* | | | | 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-0542-82/+106
* | | | | | 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-044-6/+5
|\ \ \ \ \ \ \
| * | | | | | | Revert background-size as requested, issue will be fixed separatelyMarin Treselj2017-07-021-0/+3
| * | | | | | | Simplified Nextcloud logo iconMarin Treselj2017-07-024-9/+5
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-0312-14/+34
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-024-0/+4
* | | | | | | [tx-robot] updated from transifexNextcloud bot2017-07-0126-10/+36
| |_|_|_|/ / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-3012-8/+78
* | | | | | Merge pull request #4890 from nextcloud/unify-settingsblizzz2017-06-2922-262/+546
|\ \ \ \ \ \
| * | | | | | move encryption to security (and behind two factor things)Arthur Schiwon2017-06-274-123/+3
| * | | | | | We're on 13 now…Arthur Schiwon2017-06-262-2/+2
| * | | | | | fix setting up encryption sectionArthur Schiwon2017-06-232-78/+16
| * | | | | | move twofactor_* into securityArthur Schiwon2017-06-233-101/+2