aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | fixup! Add fix responseRoeland Jago Douma2018-10-021-3/+5
| * | | | | | fixup! Add fix responseRoeland Jago Douma2018-10-021-5/+5
| * | | | | | Add fix responseJakob Sack2018-10-023-5/+82
* | | | | | | Merge pull request #11204 from nextcloud/feature/11153/add-adminemail-cliMorris Jobke2018-10-022-0/+13
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Validate email in occ commandDaniel Kesselberg2018-10-022-6/+5
| * | | | | | Use setUserValue instead setEMailAddress because latter omits an changeUser e...Daniel Kesselberg2018-10-021-8/+10
| * | | | | | Add --admin-email to cli installerDaniel Kesselberg2018-10-022-0/+12
|/ / / / / /
* | | | | | Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3Morris Jobke2018-10-0217-14/+377
|\ \ \ \ \ \
| * | | | | | Add testsRoeland Jago Douma2018-10-026-7/+218
| * | | | | | Update all the publickey tokens if needed on web loginRoeland Jago Douma2018-10-027-1/+53
| * | | | | | Mark token as invalid if the password doesn't matchRoeland Jago Douma2018-10-027-7/+52
| * | | | | | Add column to DB to store expired passwordsRoeland Jago Douma2018-10-024-1/+56
* | | | | | | Merge pull request #11336 from nextcloud/bugfix/3342/database-name-prefix-sqliteMorris Jobke2018-10-022-8/+44
|\ \ \ \ \ \ \
| * | | | | | | Use empty instead ?? because dbname is '' sometimesDaniel Kesselberg2018-09-231-2/+7
| * | | | | | | Use const for dbname and dbtableprefix defaultsDaniel Kesselberg2018-09-232-8/+41
| * | | | | | | --database-name or --database-table-prefix are ignored for sqliteDaniel Kesselberg2018-09-231-4/+2
* | | | | | | | Merge pull request #11553 from nextcloud/header-overflowMorris Jobke2018-10-022-3/+8
|\ \ \ \ \ \ \ \