summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make \OC\Security\CSRF strictRoeland Jago Douma2018-03-054-13/+17
* Merge pull request #8630 from nextcloud/ldap-cachekey-sha256Joas Schilling2018-03-052-2/+2
|\
| * use hash algo that's robust against collisionsArthur Schiwon2018-03-022-2/+2
* | Merge pull request #8601 from nextcloud/theming-fix-background-colorMorris Jobke2018-03-051-7/+5
|\ \
| * | Remove to restrict check for background image/colorJulius Härtl2018-03-011-7/+5
* | | Merge pull request #8603 from nextcloud/enc-cleanupMorris Jobke2018-03-0517-1485/+8
|\ \ \
| * | | this was a migration step to ownCloud 8.0 to restructure the encryption folde...Bjoern Schiessle2018-03-0217-1485/+8
* | | | Merge pull request #8590 from nextcloud/redirect-to-download-after-shareRoeland Jago Douma2018-03-055-14/+91
|\ \ \ \
| * | | | fixup! fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-03-011-1/+1
| * | | | fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-03-011-1/+1
| * | | | fixup! Acceptance fixJohn Molakvoæ (skjnldsv)2018-03-011-1/+2
| * | | | Acceptance fixJohn Molakvoæ (skjnldsv)2018-03-012-1/+37
| * | | | fixup! Fixed testsJohn Molakvoæ (skjnldsv)2018-02-281-2/+32
| * | | | Fixed testsJohn Molakvoæ (skjnldsv)2018-02-282-6/+6
| * | | | fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-02-281-2/+9
| * | | | Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-02-282-6/+9
* | | | | Merge pull request #8614 from nextcloud/strict_mailMorris Jobke2018-03-0510-94/+106
|\ \ \ \ \
| * | | | | Fix commentsRoeland Jago Douma2018-03-053-9/+9
| * | | | | Fix testsRoeland Jago Douma2018-03-054-5/+9
| * | | | | Make \OCP\Mail strictRoeland Jago Douma2018-03-058-85/+93
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-0524-8/+76
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-0484-110/+402
* | | | | [tx-robot] updated from transifexNextcloud bot2018-03-03146-148/+96
* | | | | Merge pull request #8619 from coliff/patch-1Roeland Jago Douma2018-03-021-1/+1
|\ \ \ \ \
| * | | | | Use correct input type for the url entryChristian Oliff2018-03-021-1/+1
* | | | | | Merge pull request #6805 from nextcloud/can-not-change-encryption-directoryBjörn Schießle2018-03-022-4/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | update unit testsBjoern Schiessle2018-03-021-1/+2
| * | | | | s/ownCloud/NextcloudBjoern Schiessle2018-03-011-1/+1
| * | | | | fix check and improve error messageBjoern Schiessle2018-03-011-2/+2
| * | | | | Anything but true means it failedJoas Schilling2018-03-011-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #8606 from nextcloud/strengthify-unificationRoeland Jago Douma2018-03-023-7/+16
|\ \ \ \ \
| * | | | | fixup! Unify look of the strengthify password hintJohn Molakvoæ (skjnldsv)2018-03-011-2/+1
| * | | | | Unify look of the strengthify password hintJohn Molakvoæ (skjnldsv)2018-03-013-7/+17
| |/ / / /
* | | | | Merge pull request #8289 from nextcloud/appdata_hardeningJoas Schilling2018-03-023-1/+60
|\ \ \ \ \
| * | | | | Hardening of SimpleFile getContentRoeland Jago Douma2018-02-273-1/+60
* | | | | | Merge pull request #8612 from nextcloud/rakekniven-i18n-fixMorris Jobke2018-03-021-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Update commentstabview.jsrakekniven2018-03-011-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-02210-276/+600
* | | | | | Merge pull request #8605 from nextcloud/user-page-ellipsizeRoeland Jago Douma2018-03-011-5/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ellipsize long values in the user managementJulius Härtl2018-03-011-5/+11
* | | | | | Merge pull request #8284 from nextcloud/lib_log-storage-test-failedRoeland Jago Douma2018-03-011-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | External storage test: log exceptionsRoland Tapken2018-02-111-0/+3
* | | | | | Merge pull request #8573 from nextcloud/appnav-ie11-fixesRoeland Jago Douma2018-03-011-4/+8
|\ \ \ \ \ \
| * | | | | | fixup! Fixed app navigation for IE11John Molakvoæ (skjnldsv)2018-02-281-1/+4
| * | | | | | Fixed app navigation for IE11John Molakvoæ (skjnldsv)2018-02-281-3/+4
* | | | | | | Merge pull request #8588 from nextcloud/fix-breadcrumbs-width-calculationRoeland Jago Douma2018-03-012-55/+426
|\ \ \ \ \ \ \
| * | | | | | | Update comments in testsDaniel Calviño Sánchez2018-02-281-3/+4
| * | | | | | | Improve documentation of "getTotalWidth"Daniel Calviño Sánchez2018-02-281-1/+4
| * | | | | | | Do not show the crumbs again after hiding themDaniel Calviño Sánchez2018-02-281-6/+0
| * | | | | | | Fix menu visibilityDaniel Calviño Sánchez2018-02-282-10/+100