summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | Force multiselect max-height to 5.5 itemsJohn Molakvoæ (skjnldsv)2018-10-031-1/+1
| |/ /
* | | Merge pull request #11538 from nextcloud/heading-boldMarin Treselj2018-10-037-30/+44
|\ \ \
| * | | Fix federation-menu Javascript to use h3Jan-Christoph Borchardt2018-10-021-3/+3
| * | | Font-weight exception, use light for personal settings h3Jan-Christoph Borchardt2018-10-021-0/+7
| * | | Change h2 to h3 on personal settings pageJan-Christoph Borchardt2018-10-022-21/+21
| * | | Change heading weights from Light to Semibold for better information architec...Jan-Christoph Borchardt2018-10-014-9/+16
* | | | Merge pull request #11557 from nextcloud/update-designRoeland Jago Douma2018-10-032-19/+31
|\ \ \ \
| * | | | Remove box-shadow from update/redirect boxesJan-Christoph Borchardt2018-10-021-1/+0
| * | | | Accessibility and design fixes for update and redirect pagesJan-Christoph Borchardt2018-10-022-19/+32
* | | | | Merge pull request #11409 from nextcloud/feature/consolidated-2fa-settingsRoeland Jago Douma2018-10-0313-68/+227
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update autoloader class mapChristoph Wurst2018-10-022-0/+4
| * | | | Fix 2FA settings icon alignmentJan-Christoph Borchardt2018-10-021-0/+1
| * | | | Consolidate personal two-factor provider settingsChristoph Wurst2018-10-0211-68/+222
* | | | | Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-dont-workMorris Jobke2018-10-022-5/+14
|\ \ \ \ \
| * | | | | Add more test casesDaniel Kesselberg2018-09-301-1/+4
| * | | | | Allow url without / for overwrite.cli.urlDaniel Kesselberg2018-09-282-5/+11
* | | | | | Merge pull request #10967 from nextcloud/zipresponseMorris Jobke2018-10-023-0/+89
|\ \ \ \ \ \
| * | | | | | Add PHPDocMorris Jobke2018-10-021-4/+14
| * | | | | | fixup! Add fix responseRoeland Jago Douma2018-10-021-1/+1