summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11615 from nextcloud/followup/11583Roeland Jago Douma2018-10-0411-18/+17
|\ | | | | Remove leftover '
| * Remove leftover 'Roeland Jago Douma2018-10-0411-18/+17
| | | | | | | | | | | | Followup to #11583 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11613 from nextcloud/add-missing-throw-statementMorris Jobke2018-10-041-1/+2
|\ \ | |/ |/| add missing throw statement to doc block
| * add missing throw statement to doc blockBjoern Schiessle2018-10-041-1/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #11611 from nextcloud/fix/10852Roeland Jago Douma2018-10-041-1/+1
|\ \ | | | | | | Allow userId to be null
| * | Allow userId to be nullRoeland Jago Douma2018-10-041-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | Fixes #10852 A quick hack. Still ensures some type safety however now also accepts null. Else we'd need to add a whole new layer of middlewares. This can only happen when a guest user wants to access a controller that requries the user_id. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11583 from nextcloud/csp/more_moving_handlebarsMorris Jobke2018-10-0449-621/+1511
|\ \ | | | | | | Csp/more moving handlebars
| * | Move newfilemenu to compiled handlebarsRoeland Jago Douma2018-10-044-26/+52
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move files_versions to compiled handlebars templatesRoeland Jago Douma2018-10-047-46/+93
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move OC.Share to compiled handlebarsRoeland Jago Douma2018-10-0415-348/+927
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move sharetabview to compiled handlebarsRoeland Jago Douma2018-10-041-4/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move mainfileinfodetailsview to commpiled handlebarsRoeland Jago Douma2018-10-043-27/+69
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move fileactions to compiled handlebarsRoeland Jago Douma2018-10-043-16/+58
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move tagsplugin to compiled handlebarsRoeland Jago Douma2018-10-043-11/+19
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move systemtags to compiled handlebarsRoeland Jago Douma2018-10-048-49/+108
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move Comments to compiled handlebarsRoeland Jago Douma2018-10-048-56/+133
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move detailsview to compiled handlebarsRoeland Jago Douma2018-10-043-22/+36
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move systemtagsinfoviewtoggleview away from handlebarsRoeland Jago Douma2018-10-041-7/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Move filelist to compiled handlebarsRoeland Jago Douma2018-10-043-9/+14
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11607 from ↵Roeland Jago Douma2018-10-045-10/+10
|\ \ \ | |/ / |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-multiselect-2.1.3 Bump vue-multiselect from 2.1.0 to 2.1.3 in /settings
| * | Bump build and fix makefileJohn Molakvoæ (skjnldsv)2018-10-043-6/+6
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Bump vue-multiselect from 2.1.0 to 2.1.3 in /settingsdependabot[bot]2018-10-042-4/+4
| | | | | | | | | | | | | | | | | | | | | Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.0 to 2.1.3. - [Release notes](https://github.com/shentao/vue-multiselect/releases) - [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.0...v2.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #11581 from nextcloud/users-table-header-fixJohn Molakvoæ2018-10-041-4/+4
|\ \ \ | |/ / |/| | Fix sticky header on users list
| * | Border fixJohn Molakvoæ (skjnldsv)2018-10-031-1/+1
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Fix sticky header on users listJohn Molakvoæ (skjnldsv)2018-10-031-3/+3
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11604 from nextcloud/remove-unused-codeRoeland Jago Douma2018-10-042-80/+24
|\ \ \ | | | | | | | | Remove unused code in legacy classes
| * | | Remove unused code in legacy classesMorris Jobke2018-10-032-80/+24
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #11603 from nextcloud/bugfix/noid/fix-wrong-call-for-loggerRoeland Jago Douma2018-10-041-1/+1
|\ \ \ \ | | | | | | | | | | Fix call to logger
| * | | | Append error from exception for messageDaniel Kesselberg2018-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Fix call to loggerDaniel Kesselberg2018-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #11606 from nextcloud/fix/2fa-login-screen-design-IIIRoeland Jago Douma2018-10-043-102/+100
|\ \ \ \ \ | | | | | | | | | | | | Improve 2FA login screens
| * | | | | Improve 2FA login screensChristoph Wurst2018-10-033-102/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Show icon if no provider is available * Reduce shown text if no provider available * Fix login button icons * Make backup codes button primary if the only options to log in Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-10-0454-28/+174
| | | | | |
* | | | | | Merge pull request #11576 from ↵Morris Jobke2018-10-035-0/+290
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/feature/endpoint_for_clients_to_fetch_apppassword Allow clients to request an apppassword if they still use the real password
| * | | | | Add an endppoint for clients to request an app passwordRoeland Jago Douma2018-10-035-0/+290
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we allow enforcing 2 factor auth it make sense if we also allow and endpoint where the clients can in the background fetch an apppassword if they were configured before the login flow was present. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [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
|\ \ \ \ \ | |_|/ / / |/| | | | Update strengthify to be able to set a nonce
| * | | | Set nonce for loading the zxcvbnMorris Jobke2018-10-032-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Update strengthifyMorris Jobke2018-10-034-9/+13
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #11566 from nextcloud/404-designMorris Jobke2018-10-032-7/+17
|\ \ \ \ | | | | | | | | | | Improve 404 page design, fix #11370
| * | | | Improve 404 page design, fix #11370Jan-Christoph Borchardt2018-10-032-7/+17
| |/ / / | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #11591 from nextcloud/fix/2fa-login-screen-designMorris Jobke2018-10-032-11/+11
|\ \ \ \ | |/ / / |/| | | Fix design of 2FA login screens
| * | | Fix design of 2FA login screensChristoph Wurst2018-10-032-11/+11
|/ / / | | | | | | | | | | | | | | | | | | * Fix rending of empty selection screen (ul missing) * Fix rendering of backup codes inputs Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #11578 from nextcloud/add-group-settings-fixRoeland Jago Douma2018-10-033-4/+2
|\ \ \ | | | | | | | | Fixed js error when adding new group
| * | | Fixed js error when adding new groupJohn Molakvoæ (skjnldsv)2018-10-033-4/+2
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #11338 from rubo77/password-brMorris Jobke2018-10-031-2/+4
|\ \ \ | | | | | | | | sharebymail: Add linebreak before password
| * | | sharebymail: Add linebreak before passwordrubo772018-10-031-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Ruben Barkow <github@r.z11.de>
* | | | Merge pull request #11568 from nextcloud/fix/11097/just_update_password_hashMorris Jobke2018-10-031-8/+12
|\ \ \ \ | | | | | | | | | | Just update password hash without validating
| * | | | Just update password hash without validatingRoeland Jago Douma2018-10-031-8/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11097 If your password hash changed (becuse your are on 7.2 and we moved to ARGON2). Then we shold not 'set a new password' but just update the hash. As else we invoke the password policy again which might lock out users. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11571 from nextcloud/dropdown-bottom-users-list-fixRoeland Jago Douma2018-10-031-1/+1
|\ \ \ \ | | | | | | | | | | Force multiselect max-height to 5.5 items