summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6165 from nextcloud/bump-dompurifyMorris Jobke2017-08-233-10/+12
|\
| * Bump merged JSLukas Reschke2017-08-171-2/+3
| * Bump DOMPurify to 1.0.0Lukas Reschke2017-08-172-8/+9
* | Merge pull request #6236 from nextcloud/drone-ci-imagesMorris Jobke2017-08-231-1/+0
|\ \
| * | Fix phan testMorris Jobke2017-08-231-1/+0
|/ /
* | Merge pull request #6229 from nextcloud/drone-ci-imagesMorris Jobke2017-08-231-71/+76
|\ \
| * | Use docker images without XDebug and with OpcacheMorris Jobke2017-08-231-71/+76
* | | Merge pull request #6218 from nextcloud/sabre-xml-fixMorris Jobke2017-08-231-0/+0
|\ \ \ | |/ / |/| |
| * | [3rdparty] Fix sabre/xml empty prop parsingRoeland Jago Douma2017-08-221-0/+0
* | | [tx-robot] updated from transifexNextcloud bot2017-08-236-0/+14
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-08-2294-346/+464
* | Merge pull request #6149 from nextcloud/downstream-26539Morris Jobke2017-08-21147-244502/+2
|\ \
| * | Move GDrive external storage to a separate repoVincent Petry2017-08-21147-244502/+2
* | | Merge pull request #6179 from nextcloud/no-password-reset-for-disabled-usersMorris Jobke2017-08-212-3/+41
|\ \ \
| * | | No password reset for disabled usersJoas Schilling2017-08-182-3/+41
* | | | Merge pull request #6201 from nextcloud/dropdown-contrastMorris Jobke2017-08-212-10/+9
|\ \ \ \
| * | | | Increase contrast of dropdown menu text, fix accessibility & visibility issuesJan-Christoph Borchardt2017-08-212-10/+9
|/ / / /
* | | | Merge pull request #6169 from nextcloud/check-encoding-logLukas Reschke2017-08-211-1/+12
|\ \ \ \
| * | | | Ensure log message is UTF-8 encodedLukas Reschke2017-08-171-1/+12
| | |_|/ | |/| |
* | | | Merge pull request #6194 from nextcloud/proper-l10n-for-app-passwordsMorris Jobke2017-08-211-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use correct l10n for app password menuMorris Jobke2017-08-211-2/+2
* | | | Merge pull request #6180 from nextcloud/fix-warningsMorris Jobke2017-08-211-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fix PHPUnit warningsLukas Reschke2017-08-181-3/+3
| | |/ | |/|
* | | [tx-robot] updated from transifexNextcloud bot2017-08-2132-74/+1072
* | | [tx-robot] updated from transifexNextcloud bot2017-08-2022-88/+252
* | | [tx-robot] updated from transifexNextcloud bot2017-08-1930-84/+270
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-08-1832-6/+124
* | Merge pull request #6161 from nextcloud/drone-s3Morris Jobke2017-08-173-357/+3
|\ \ | |/ |/|
| * Enable object storage tests againMorris Jobke2017-08-172-3/+3
| * Remove windows config settings in testsMorris Jobke2017-08-172-354/+0
* | Merge pull request #6158 from nextcloud/always-log-cron-executionLukas Reschke2017-08-175-40/+22
|\ \ | |/ |/|
| * Always log cron executionMorris Jobke2017-08-175-40/+22
* | Merge pull request #6126 from nextcloud/trigger-searchRoeland Jago Douma2017-08-171-1/+8
|\ \
| * | Trigger search after re-focusMorris Jobke2017-08-151-1/+8
* | | [tx-robot] updated from transifexNextcloud bot2017-08-1794-560/+632
* | | Merge pull request #6136 from nextcloud/fix_groupmanagementJoas Schilling2017-08-161-3/+4
|\ \ \ | |_|/ |/| |
| * | Fix group management which was broken since #5847Tobia De Koninck2017-08-151-3/+4
* | | Merge pull request #6146 from nextcloud/downstream-28073Morris Jobke2017-08-1623-6155/+1
|\ \ \
| * | | Bye bye Dropbox v1Vincent Petry2017-08-1623-6155/+1
|/ / /
* | | Merge pull request #6130 from nextcloud/cleanup-unused-methodsMorris Jobke2017-08-168-77/+20
|\ \ \
| * | | Cleanup unused methodsMorris Jobke2017-08-158-77/+20
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-08-1680-218/+354
* | | Merge pull request #6128 from nextcloud/primary-font-color-in-capabilitiesMorris Jobke2017-08-152-9/+22
|\ \ \
| * | | Add the primary font color to the capabilities as wellJoas Schilling2017-08-152-9/+22
* | | | Merge pull request #6132 from nextcloud/do-not-log-maintenance-modeMorris Jobke2017-08-152-3/+10
|\ \ \ \
| * | | | Do not log WebDAV maintenance mode exceptionMorris Jobke2017-08-152-3/+10
| | |/ / | |/| |
* | | | Merge pull request #6101 from cbartz/patch-1Lukas Reschke2017-08-151-6/+1
|\ \ \ \
| * | | | Remove tmpFiles Array in Swift.phpChristopher Bartz2017-08-141-6/+1
* | | | | Merge pull request #6099 from nextcloud/issue-3457-no-exception-on-sharee-errorLukas Reschke2017-08-152-5/+22
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Document that it throwsJoas Schilling2017-08-141-0/+1