summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8634 from nextcloud/ldap-no-empty-namesRoeland Jago Douma2018-03-052-6/+59
|\ | | | | do not create empty userid when attribute does not have allowed chars
| * treat iconv issuesArthur Schiwon2018-03-052-5/+13
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * typo + phpdocArthur Schiwon2018-03-051-1/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * do not create empty userid when attribute does not have allowed charsArthur Schiwon2018-03-022-3/+47
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #8664 from ↵Roeland Jago Douma2018-03-053-8/+5
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/add-missing-settings-page-title-again Set the correct active navigation entry
| * | Set the correct active navigation entryJoas Schilling2018-03-053-8/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #8659 from nextcloud/csrf_token_strictRoeland Jago Douma2018-03-055-14/+17
|\ \ \ | | | | | | | | Make \OC\Security\CSRF strict
| * | | Remove testcaseRoeland Jago Douma2018-03-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since a token now always requires a string we don't need to test for null Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Make \OC\Security\CSRF strictRoeland Jago Douma2018-03-054-13/+17
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8650 from nextcloud/fix-ie11-datepicker-displayMorris Jobke2018-03-051-2/+5
|\ \ \ \ | | | | | | | | | | Fixed date/time picker on IE11
| * | | | Fixed date/time picker on IE11John Molakvoæ (skjnldsv)2018-03-011-2/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #8661 from nextcloud/strict_security_cspMorris Jobke2018-03-053-30/+33
|\ \ \ \ \ | |_|/ / / |/| | | | Make OC\Security\CSP strict
| * | | | Make OC\Security\CSP strictRoeland Jago Douma2018-03-053-30/+33
|/ / / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #8630 from nextcloud/ldap-cachekey-sha256Joas Schilling2018-03-052-2/+2
|\ \ \ \ | | | | | | | | | | use hash algo that's robust against collisions
| * | | | use hash algo that's robust against collisionsArthur Schiwon2018-03-022-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #8601 from nextcloud/theming-fix-background-colorMorris Jobke2018-03-051-7/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | Remove too restrict check for background image/color
| * | | | Remove to restrict check for background image/colorJulius Härtl2018-03-011-7/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #8603 from nextcloud/enc-cleanupMorris Jobke2018-03-0517-1485/+8
|\ \ \ \ \ | | | | | | | | | | | | kill old encryption migration steps
| * | | | | this was a migration step to ownCloud 8.0 to restructure the encryption ↵Bjoern Schiessle2018-03-0217-1485/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folder which is no longer needed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #8590 from nextcloud/redirect-to-download-after-shareRoeland Jago Douma2018-03-055-14/+91
|\ \ \ \ \ \ | | | | | | | | | | | | | | Sharing: redirect to download after authentification if requested
| * | | | | | fixup! fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | fixup! Acceptance fixJohn Molakvoæ (skjnldsv)2018-03-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Acceptance fixJohn Molakvoæ (skjnldsv)2018-03-012-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | fixup! Fixed testsJohn Molakvoæ (skjnldsv)2018-02-281-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Fixed testsJohn Molakvoæ (skjnldsv)2018-02-282-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | fixup! Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-02-281-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Sharing: redirect to download after authentification if requestedJohn Molakvoæ (skjnldsv)2018-02-282-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #8614 from nextcloud/strict_mailMorris Jobke2018-03-0510-94/+106
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make \OCP\Mail strict
| * | | | | | | Fix commentsRoeland Jago Douma2018-03-053-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Fix testsRoeland Jago Douma2018-03-054-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Make \OCP\Mail strictRoeland Jago Douma2018-03-058-85/+93
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix typehints * Made strict Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | [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 entry
| * | | | | | Use correct input type for the url entryChristian Oliff2018-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | Change `type="text"` to `type="url"`
* | | | | | | Merge pull request #6805 from nextcloud/can-not-change-encryption-directoryBjörn Schießle2018-03-022-4/+5
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Can not change encryption directory
| * | | | | | update unit testsBjoern Schiessle2018-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | s/ownCloud/NextcloudBjoern Schiessle2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | fix check and improve error messageBjoern Schiessle2018-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | | | | Anything but true means it failedJoas Schilling2018-03-011-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #8606 from nextcloud/strengthify-unificationRoeland Jago Douma2018-03-023-7/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | Unify look of the strengthify password hint
| * | | | | | fixup! Unify look of the strengthify password hintJohn Molakvoæ (skjnldsv)2018-03-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Unify look of the strengthify password hintJohn Molakvoæ (skjnldsv)2018-03-013-7/+17
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #8289 from nextcloud/appdata_hardeningJoas Schilling2018-03-023-1/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | AppData hardening
| * | | | | | Hardening of SimpleFile getContentRoeland Jago Douma2018-02-273-1/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if file_get_contents fails remove the file. And traverse up the tree checking if the other folders are there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #8612 from nextcloud/rakekniven-i18n-fixMorris Jobke2018-03-021-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Update commentstabview.js
| * | | | | | Update commentstabview.jsrakekniven2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed typo reported at GitHub. See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-02210-276/+600
| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-04 23:34:27 +0000