summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20987 from ↵Roeland Jago Douma2020-05-151-0/+4
|\ | | | | | | | | nextcloud/feature/noid/allow-compressed-templateresponses Allow TemplateResponse to be compressed
| * Allow TemplateResponse to be compressedMorris Jobke2020-05-151-0/+4
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #20941 from nextcloud/smb-3.2.4Morris Jobke2020-05-154-26/+53
|\ \ | | | | | | update icewind/smb to 3.2.4
| * | update icewind/smb to 3.2.4Robin Appelman2020-05-124-26/+53
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #20904 from ↵Roeland Jago Douma2020-05-1512-16/+24
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/dependabot/npm_and_yarn/dompurify-2.0.11 Bump dompurify from 2.0.8 to 2.0.11
| * | Bump dompurify from 2.0.8 to 2.0.11dependabot-preview[bot]2020-05-1512-16/+24
|/ / | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.8 to 2.0.11. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.0.8...2.0.11) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2020-05-1540-8/+104
| |
* | Merge pull request #20981 from ↵blizzz2020-05-144-108/+2
|\ \ | | | | | | | | | | | | nextcloud/techdebt/remove-long-deprecated-jquery-tipsy Remove the long deprecated jQuery tipsy
| * | Remove the long deprecated jQuery tipsyChristoph Wurst2020-05-144-108/+2
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20980 from nextcloud/techdebt/deprecate-torgb-monkey-patchChristoph Wurst2020-05-143-19/+24
|\ \ | | | | | | Deprecate String.prototype.toRgb
| * | Deprecate String.prototype.toRgbChristoph Wurst2020-05-143-19/+24
|/ / | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #20978 from nextcloud/fix/jquery-placeholder-md5Morris Jobke2020-05-148-26/+27
|\ \ | | | | | | Import md5 for the jquery placeholder plugin
| * | Import md5 for the jquery placeholder pluginChristoph Wurst2020-05-148-26/+27
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20949 from ↵Christoph Wurst2020-05-1413-57/+57
|\ \ | | | | | | | | | | | | nextcloud/dependachristoph/npm_and_yarn/jquery-2.2.4 Bump jQuery to v2.2
| * | Bump jQuery to v2.2Christoph Wurst2020-05-1413-57/+57
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | 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.0
| * | Bump p-queue from 6.3.0 to 6.4.0dependabot-preview[bot]2020-05-144-10/+10
|/ / | | | | | | | | | | | | | | | | Bumps [p-queue](https://github.com/sindresorhus/p-queue) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/sindresorhus/p-queue/releases) - [Commits](https://github.com/sindresorhus/p-queue/compare/v6.3.0...v6.4.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #20909 from ↵Roeland Jago Douma2020-05-149-101/+80
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/core-7.9.6 Bump @babel/core from 7.9.0 to 7.9.6
| * | Bump @babel/core from 7.9.0 to 7.9.6dependabot-preview[bot]2020-05-139-101/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.9.0 to 7.9.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.9.0...v7.9.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #20947 from ↵Christoph Wurst2020-05-141-3/+3
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependachristoph/npm_and_yarn/yargs-parser Bump yargs-parser
| * | | Bump yargs-parserChristoph Wurst2020-05-131-3/+3
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [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: Changing the word "These" to "Following"
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | l10n: Adding "The" to the description
| * | | | | Adding "The" to the descriptionValdnet2020-05-131-1/+1
| | | | | |
* | | | | | Merge pull request #20958 from ↵Morris Jobke2020-05-131-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/talk-3523/allow-links-to-conversations Allow links to conversations
| * | | | | | Allow links to conversationsJoas Schilling2020-05-131-0/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #20952 from nextcloud/test/noid/fix-lint-exit-codeMorris Jobke2020-05-132-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Respect exit code of lint run - changed from -exec to xargs as this exits properly
| * | | | | Fix return code of AppConfig::deleteUserValueMorris Jobke2020-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Respect exit code of lint run - changed from -exec to xargs as this exits ↵Morris Jobke2020-05-131-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | properly Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #20905 from ↵Roeland Jago Douma2020-05-1312-84/+84
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.9.6 Bump @babel/preset-env from 7.9.5 to 7.9.6
| * | | | Bump @babel/preset-env from 7.9.5 to 7.9.6dependabot-preview[bot]2020-05-1312-84/+84
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.9.5 to 7.9.6. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.9.5...v7.9.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | 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.2
| * | | | Trailing comma's in functin arguments break on 7.2Roeland Jago Douma2020-05-131-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #20946 from nextcloud/enhancement/ext-json-composerChristoph Wurst2020-05-132-2/+7
|\ \ \ \ | |/ / / |/| | | Declare ext-json as dependency in composer.json
| * | | Declare ext-json as dependency in composer.jsonChristoph Wurst2020-05-132-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes phpstorm happy as it knows that the functions like json_encode are available. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #20939 from nextcloud/enh/middleware/not_modifiedRoeland Jago Douma2020-05-139-61/+169
|\ \ \ \ | | | | | | | | | | Move not modified check to the middleware
| * | | | Move the notmodified check to middleware where it belongsRoeland Jago Douma2020-05-139-61/+169
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #20897 from nextcloud/bugfix/httpcacheRoeland Jago Douma2020-05-132-6/+5
|\ \ \ \ \ | |/ / / / |/| | | | Proxy server could cache http response when it is not private
| * | | | Fix http cache testClement Wong2020-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
| * | | | Add public argument to Http cacheFor()Clement Wong2020-05-101-5/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
| * | | | Proxy server could cache http response when it is not privateClement Wong2020-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-05-1322-0/+38
| | | | |
* | | | | Merge pull request #20943 from nextcloud/enh/avatar-cache-1dayMorris Jobke2020-05-121-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Cache the avatar for a day
| * | | | Cache the avatar for a dayRoeland Jago Douma2020-05-121-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed that on larger systems esp when using talk the avatars get revalidated like crazy. Because people keep the tab open etc. You can do with a slightly outdated avatar! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #20933 from nextcloud/enh/default_password_conf_form_to_postMorris Jobke2020-05-121-1/+1
|\ \ \ \ | | | | | | | | | | Move the password confirmation form template to post
| * | | | Move the password confirmation form template to postRoeland Jago Douma2020-05-111-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | I know we use JS for this. But it triggers some false positives on testing. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #20813 from nextcloud/lazy-folderMorris Jobke2020-05-124-456/+499
|\ \ \ \ | | | | | | | | | | generalize the "lazy folder" concept
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 22:58:54 +0000