summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #11615 from nextcloud/followup/11583Roeland Jago Douma2018-10-0411-18/+17
|\
| * Remove leftover 'Roeland Jago Douma2018-10-0411-18/+17
* | Merge pull request #11613 from nextcloud/add-missing-throw-statementMorris Jobke2018-10-041-1/+2
|\ \ | |/ |/|
| * add missing throw statement to doc blockBjoern Schiessle2018-10-041-1/+2
* | Merge pull request #11611 from nextcloud/fix/10852Roeland Jago Douma2018-10-041-1/+1
|\ \
| * | Allow userId to be nullRoeland Jago Douma2018-10-041-1/+1
|/ /
* | Merge pull request #11583 from nextcloud/csp/more_moving_handlebarsMorris Jobke2018-10-0449-621/+1511
|\ \
| * | Move newfilemenu to compiled handlebarsRoeland Jago Douma2018-10-044-26/+52
| * | Move files_versions to compiled handlebars templatesRoeland Jago Douma2018-10-047-46/+93
| * | Move OC.Share to compiled handlebarsRoeland Jago Douma2018-10-0415-348/+927
| * | Move sharetabview to compiled handlebarsRoeland Jago Douma2018-10-041-4/+1
| * | Move mainfileinfodetailsview to commpiled handlebarsRoeland Jago Douma2018-10-043-27/+69
| * | Move fileactions to compiled handlebarsRoeland Jago Douma2018-10-043-16/+58
| * | Move tagsplugin to compiled handlebarsRoeland Jago Douma2018-10-043-11/+19
| * | Move systemtags to compiled handlebarsRoeland Jago Douma2018-10-048-49/+108
| * | Move Comments to compiled handlebarsRoeland Jago Douma2018-10-048-56/+133
| * | Move detailsview to compiled handlebarsRoeland Jago Douma2018-10-043-22/+36
| * | Move systemtagsinfoviewtoggleview away from handlebarsRoeland Jago Douma2018-10-041-7/+1
| * | Move filelist to compiled handlebarsRoeland Jago Douma2018-10-043-9/+14
* | | Merge pull request #11607 from nextcloud/dependabot/npm_and_yarn/settings/vue...Roeland Jago Douma2018-10-045-10/+10
|\ \ \ | |/ / |/| |
| * | Bump build and fix makefileJohn Molakvoæ (skjnldsv)2018-10-043-6/+6
| * | Bump vue-multiselect from 2.1.0 to 2.1.3 in /settingsdependabot[bot]2018-10-042-4/+4
* | | Merge pull request #11581 from nextcloud/users-table-header-fixJohn Molakvoæ2018-10-041-4/+4
|\ \ \ | |/ / |/| |
| * | Border fixJohn Molakvoæ (skjnldsv)2018-10-031-1/+1
| * | Fix sticky header on users listJohn Molakvoæ (skjnldsv)2018-10-031-3/+3
* | | Merge pull request #11604 from nextcloud/remove-unused-codeRoeland Jago Douma2018-10-042-80/+24
|\ \ \
| * | | Remove unused code in legacy classesMorris Jobke2018-10-032-80/+24
* | | | Merge pull request #11603 from nextcloud/bugfix/noid/fix-wrong-call-for-loggerRoeland Jago Douma2018-10-041-1/+1
|\ \ \ \
| * | | | Append error from exception for messageDaniel Kesselberg2018-10-031-1/+1
| * | | | Fix call to loggerDaniel Kesselberg2018-10-031-1/+1
* | | | | Merge pull request #11606 from nextcloud/fix/2fa-login-screen-design-IIIRoeland Jago Douma2018-10-043-102/+100
|\ \ \ \ \
| * | | | | Improve 2FA login screensChristoph Wurst2018-10-033-102/+100
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-10-0454-28/+174
* | | | | | Merge pull request #11576 from nextcloud/feature/endpoint_for_clients_to_fetc...Morris Jobke2018-10-035-0/+290
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add an endppoint for clients to request an app passwordRoeland Jago Douma2018-10-035-0/+290
| | |/ / / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-10-03256-802/+908
* | | | | Merge pull request #11592 from nextcloud/feature/noid/update-strengthifyRoeland Jago Douma2018-10-036-10/+16
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Set nonce for loading the zxcvbnMorris Jobke2018-10-032-1/+3
| * | | | Update strengthifyMorris Jobke2018-10-034-9/+13
| |/ / /
* | | | Merge pull request #11566 from nextcloud/404-designMorris Jobke2018-10-032-7/+17
|\ \ \ \
| * | | | Improve 404 page design, fix #11370Jan-Christoph Borchardt2018-10-032-7/+17
| |/ / /
* | | | Merge pull request #11591 from nextcloud/fix/2fa-login-screen-designMorris Jobke2018-10-032-11/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Fix design of 2FA login screensChristoph Wurst2018-10-032-11/+11
|/ / /
* | | Merge pull request #11578 from nextcloud/add-group-settings-fixRoeland Jago Douma2018-10-033-4/+2
|\ \ \
| * | | Fixed js error when adding new groupJohn Molakvoæ (skjnldsv)2018-10-033-4/+2
| |/ /
* | | Merge pull request #11338 from rubo77/password-brMorris Jobke2018-10-031-2/+4
|\ \ \
| * | | sharebymail: Add linebreak before passwordrubo772018-10-031-2/+4
* | | | Merge pull request #11568 from nextcloud/fix/11097/just_update_password_hashMorris Jobke2018-10-031-8/+12
|\ \ \ \
| * | | | Just update password hash without validatingRoeland Jago Douma2018-10-031-8/+12
| | |/ / | |/| |
* | | | Merge pull request #11571 from nextcloud/dropdown-bottom-users-list-fixRoeland Jago Douma2018-10-031-1/+1
|\ \ \ \