summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-08-2560-108/+414
* Merge pull request #6244 from nextcloud/redis_clusterMorris Jobke2017-08-251-1/+2
|\
| * Use a new phpredisRoeland Jago Douma2017-08-241-1/+1
| * Give redis a change to fireupRoeland Jago Douma2017-08-231-0/+1
* | Merge pull request #6249 from nextcloud/ignore-vscodeRoeland Jago Douma2017-08-241-0/+3
|\ \
| * | Add Visual Studio Code to .gitignoreJakob Sack2017-08-241-0/+3
* | | Merge pull request #6251 from nextcloud/get_right_translationRoeland Jago Douma2017-08-241-1/+1
|\ \ \
| * | | Don't fetch the translation from core but from filesRoeland Jago Douma2017-08-241-1/+1
| |/ /
* | | Merge pull request #5870 from nextcloud/generate-system-wide-key-pairBjörn Schießle2017-08-247-28/+229
|\ \ \
| * | | Update autoloaderRoeland Jago Douma2017-08-102-0/+2
| * | | Bump versionRoeland Jago Douma2017-08-101-1/+1
| * | | add prefix to user and system keys to avoid name collisionsBjoern Schiessle2017-08-104-8/+122
| * | | extend the identity proof manager to allow system wide key pairsBjoern Schiessle2017-08-103-23/+108
* | | | Merge pull request #6241 from nextcloud/integration_ramMorris Jobke2017-08-241-25/+25
|\ \ \ \ | |_|/ / |/| | |
| * | | [drone] Install intergration tests in RAMRoeland Jago Douma2017-08-241-25/+25
* | | | [tx-robot] updated from transifexNextcloud bot2017-08-24100-364/+562
* | | | Merge pull request #6239 from nextcloud/fix-uploading-messageRoeland Jago Douma2017-08-232-3/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Replace ... with …Morris Jobke2017-08-232-4/+4
| * | | Show "Uploading..." in web UI for long uploadsMorris Jobke2017-08-231-0/+4
| |/ /
* | | Merge pull request #6164 from nextcloud/dont-show-error-message-when-sql-failedRoeland Jago Douma2017-08-233-3/+29
|\ \ \
| * | | Prevent SQL error message in case of errorLukas Reschke2017-08-173-3/+29
* | | | 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