summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-05-1734-112/+174
* [tx-robot] updated from transifexNextcloud bot2020-05-16160-264/+392
* Merge pull request #20629 from mejo-/files_sharing_preview_textRoeland Jago Douma2020-05-151-1/+2
|\
| * Don't load text file preview when text app is available (Fixes: #20615)Jonas Meurer2020-04-241-1/+2
* | Merge pull request #20957 from nextcloud/Valdnet-patch-5Roeland Jago Douma2020-05-152-6/+6
|\ \
| * | l10n: Add "The" before "Following"Valdnet2020-05-152-6/+6
* | | Merge pull request #20987 from nextcloud/feature/noid/allow-compressed-templa...Roeland Jago Douma2020-05-151-0/+4
|\ \ \
| * | | Allow TemplateResponse to be compressedMorris Jobke2020-05-151-0/+4
* | | | Merge pull request #20941 from nextcloud/smb-3.2.4Morris Jobke2020-05-154-26/+53
|\ \ \ \
| * | | | update icewind/smb to 3.2.4Robin Appelman2020-05-124-26/+53
* | | | | Merge pull request #20904 from nextcloud/dependabot/npm_and_yarn/dompurify-2....Roeland Jago Douma2020-05-1512-16/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Bump dompurify from 2.0.8 to 2.0.11dependabot-preview[bot]2020-05-1512-16/+24
|/ / / /
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-1540-8/+104
* | | | Merge pull request #20981 from nextcloud/techdebt/remove-long-deprecated-jque...blizzz2020-05-144-108/+2
|\ \ \ \
| * | | | Remove the long deprecated jQuery tipsyChristoph Wurst2020-05-144-108/+2
|/ / / /
* | | | Merge pull request #20980 from nextcloud/techdebt/deprecate-torgb-monkey-patchChristoph Wurst2020-05-143-19/+24
|\ \ \ \
| * | | | Deprecate String.prototype.toRgbChristoph Wurst2020-05-143-19/+24
|/ / / /
* | | | Merge pull request #20978 from nextcloud/fix/jquery-placeholder-md5Morris Jobke2020-05-148-26/+27
|\ \ \ \
| * | | | Import md5 for the jquery placeholder pluginChristoph Wurst2020-05-148-26/+27
|/ / / /
* | | | Merge pull request #20949 from nextcloud/dependachristoph/npm_and_yarn/jquery...Christoph Wurst2020-05-1413-57/+57
|\ \ \ \
| * | | | Bump jQuery to v2.2Christoph Wurst2020-05-1413-57/+57
* | | | | Merge pull request #20911 from nextcloud/dependabot/npm_and_yarn/p-queue-6.4.0Roeland Jago Douma2020-05-144-10/+10
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Bump p-queue from 6.3.0 to 6.4.0dependabot-preview[bot]2020-05-144-10/+10
|/ / / /
* | | | Merge pull request #20909 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2020-05-149-101/+80
|\ \ \ \
| * | | | Bump @babel/core from 7.9.0 to 7.9.6dependabot-preview[bot]2020-05-139-101/+80
* | | | | Merge pull request #20947 from nextcloud/dependachristoph/npm_and_yarn/yargs-...Christoph Wurst2020-05-141-3/+3
|\ \ \ \ \
| * | | | | Bump yargs-parserChristoph Wurst2020-05-131-3/+3
* | | | | | [tx-robot] updated from transifexv19.0.0RC2Nextcloud bot2020-05-14174-394/+766
* | | | | | Merge pull request #20932 from nextcloud/Valdnet-patch-3Morris Jobke2020-05-131-1/+1
|\ \ \ \ \ \
| * | | | | | l10n: Addition of "The"Valdnet2020-05-131-1/+1
| * | | | | | l10n: Changing the word "These" to "Following"Valdnet2020-05-111-1/+1
* | | | | | | Merge pull request #20956 from nextcloud/Valdnet-patch-4Morris Jobke2020-05-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Adding "The" to the descriptionValdnet2020-05-131-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #20958 from nextcloud/bugfix/talk-3523/allow-links-to-conv...Morris Jobke2020-05-131-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Allow links to conversationsJoas Schilling2020-05-131-0/+6
| |/ / / / / /
* | | | | | | Merge pull request #20952 from nextcloud/test/noid/fix-lint-exit-codeMorris Jobke2020-05-132-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix return code of AppConfig::deleteUserValueMorris Jobke2020-05-131-1/+1
| * | | | | | Respect exit code of lint run - changed from -exec to xargs as this exits pro...Morris Jobke2020-05-131-1/+1
| |/ / / / /
* | | | | | Merge pull request #20905 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2020-05-1312-84/+84
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bump @babel/preset-env from 7.9.5 to 7.9.6dependabot-preview[bot]2020-05-1312-84/+84
|/ / / / /
* | | | | Merge pull request #20951 from nextcloud/fix/no_trailing_comma_functionRoeland Jago Douma2020-05-131-1/+1
|\ \ \ \ \
| * | | | | Trailing comma's in functin arguments break on 7.2Roeland Jago Douma2020-05-131-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #20946 from nextcloud/enhancement/ext-json-composerChristoph Wurst2020-05-132-2/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Declare ext-json as dependency in composer.jsonChristoph Wurst2020-05-132-2/+7
* | | | | Merge pull request #20939 from nextcloud/enh/middleware/not_modifiedRoeland Jago Douma2020-05-139-61/+169
|\ \ \ \ \
| * | | | | Move the notmodified check to middleware where it belongsRoeland Jago Douma2020-05-139-61/+169
* | | | | | Merge pull request #20897 from nextcloud/bugfix/httpcacheRoeland Jago Douma2020-05-132-6/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix http cache testClement Wong2020-05-121-1/+1
| * | | | | Add public argument to Http cacheFor()Clement Wong2020-05-101-5/+4
| * | | | | Proxy server could cache http response when it is not privateClement Wong2020-05-101-2/+2