summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24852 from nextcloud/version/21/beta4v21.0.0beta4Roeland Jago Douma2020-12-301-2/+2
|\ | | | | 21 beta4
| * 21 beta4Roeland Jago Douma2020-12-281-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #24909 from nextcloud/fix/ci/psalm-ocpRoeland Jago Douma2020-12-301-0/+1
|\ \ | | | | | | Fix expceted psalm-ocp.xml file
| * | Fix expceted psalm-ocp.xml fileRoeland Jago Douma2020-12-301-0/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #24571 from nextcloud/Valdnet-patch-4Roeland Jago Douma2020-12-303-3/+3
|\ \ \ | |/ / |/| | l10n: Change to the name of the app
| * | Change to the name of the appValdnet2020-12-303-3/+3
|/ / | | | | | | | | | | It should refer to the application name "Files". Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | Merge pull request #24903 from nextcloud/enh/psalm-ocpRoeland Jago Douma2020-12-303-0/+293
|\ \ | | | | | | Add dedicated baseline for OCP
| * | Add dedicated baseline for OCPRoeland Jago Douma2020-12-303-0/+293
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #24888 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/nikic/php-parser-4.10.4 Bump nikic/php-parser from 4.3.0 to 4.10.4
| * | | Bump nikic/php-parser from 4.3.0 to 4.10.4Christoph Wurst2020-12-301-0/+0
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #24895 from ↵Roeland Jago Douma2020-12-304-3/+5
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/make-integration-tests-work-with-both-php-7.3-and-7.4 Make integration tests work with both PHP 7.3 and 7.4
| * | | Make integration tests work with both PHP 7.3 and 7.4Daniel Calviño Sánchez2020-12-304-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Trashbin" and "WebDav" traits were using each other in a circular dependency ("WebDav" -> "Sharing" -> "Provisioning" -> "BasicStructure" -> "Trashbin" -> "WebDav"). In PHP 7.3 this worked fine, but in PHP 7.4 the fatal error "Trait 'WebDav' not found in .../Trashbin.php" was thrown. To solve this now the "TrashBin" trait no longer explicitly uses "WebDav". However, due to this change, the class using "TrashBin" is now expected to also use "WebDav". As the "Trashbin" trait was not needed by most contexts using the "BasicStructure" trait "Trashbin" was removed from it and added only to those contexts that actually need it. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #24887 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/composer/swiftmailer/swiftmailer-6.2.4 Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4
| * | | | Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4Christoph Wurst2020-12-301-0/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #24860 from nextcloud/bugfix/noid/well-known-htaccessRoeland Jago Douma2020-12-301-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Make sure we properly ass well-known paths to index.php
| * | | | Make sure we properly ass well-known paths to index.phpJulius Härtl2020-12-291-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #24879 from ↵Christoph Wurst2020-12-301-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependachristoph/composer/symfony-4.4.18 Bump the Symfony family from 4.4.15 to 4.4.18
| * | | | | Bump the Symfony family from 4.4.15 to 4.4.18Christoph Wurst2020-12-291-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #24898 from ↵Roeland Jago Douma2020-12-301-7/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud-pr-bot/automated/noid/psalm-baseline-update [Automated] Update psalm-baseline.xml
| * | | | | | Update psalm baselineNextcloud-PR-Bot2020-12-301-7/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: GitHub <noreply@github.com>
* | | / / / [tx-robot] updated from transifexNextcloud bot2020-12-3026-20/+60
| |_|/ / / |/| | | |
* | | | | Merge pull request #24865 from nextcloud/tests/node-build-cleanRoeland Jago Douma2020-12-291-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Cleanup bundle files before checking the rebuild
| * | | | Cleanup bundle files before checking the rebuildJulius Härtl2020-12-291-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #22921 from nextcloud/no-root-encryption-wrapperJulius Härtl2020-12-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | dont apply encryption wrapper for root mount
| * | | | | dont apply encryption wrapper for root mountRobin Appelman2020-12-291-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | the `shouldEncrypt` already disables encryption for anything thats not in the users data folder, however the encryption wrapper being applied anyway on the root folder breaks groupfolders Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #24873 from nextcloud/dependencies/sabre-IIChristoph Wurst2020-12-291-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | Bump sabre/dav to 4.1
| * | | | Bump sabre/dav to 4.1Christoph Wurst2020-12-291-0/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #23958 from ↵dependabot-preview[bot]2020-12-292-207/+263
|\ \ \ \ | |/ / / |/| | | | | | | nextcloud/dependabot/npm_and_yarn/build/node-sass-5.0.0
| * | | Bump node-sass from 4.14.1 to 5.0.0 in /builddependabot-preview[bot]2020-12-292-207/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [node-sass](https://github.com/sass/node-sass) from 4.14.1 to 5.0.0. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.14.1...v5.0.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* | | | Merge pull request #24772 from nextcloud/dependabot/npm_and_yarn/dompurify-2.2.6dependabot-preview[bot]2020-12-2987-128/+14
|\ \ \ \
| * | | | Bump dompurify from 2.2.3 to 2.2.6dependabot-preview[bot]2020-12-2987-128/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.2.3 to 2.2.6. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.2.3...2.2.6) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | Merge pull request #24874 from nextcloud/enh/exception_loggingRoeland Jago Douma2020-12-292-4/+22
|\ \ \ \ | | | | | | | | | | Avoid huge exception argument logging
| * | | | Avoid huge exception argument loggingRoeland Jago Douma2020-12-292-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases it might happen that you have an argument that deep down somewhere has an array with a lot of entries (think thousands). Now before we would just happily print them all. Which would fill the log. Now it will just print the first 5. And add a line that there are N more. If you are on debug level we will still print them all. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #24533 from ↵Christoph Wurst2020-12-2918-181/+150
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | nextcloud/dependabot/composer/icewind/streams-0.7.2 Bump icewind/streams from 0.7.1 to 0.7.2
| * | | | Bump icewind/streams from 0.7.1 to 0.7.2Christoph Wurst2020-12-2918-181/+150
| |/ / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #24872 from nextcloud/tests/jsunit-chromiumRoeland Jago Douma2020-12-298-2242/+1044
|\ \ \ \ | |/ / / |/| | | Run jsunit with chromium/puppeteer
| * | | jsunit: harden avatar tests to pass with fractional scaling of elementsJulius Härtl2020-12-291-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | jsunit: Remove warnings during test runsJulius Härtl2020-12-292-17/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | jsunit: Add proper lang tag to documentJulius Härtl2020-12-291-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | jsunit: Run jsunit with chromium/puppeteer on github actionsJulius Härtl2020-12-295-2217/+1033
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2020-12-2918-58/+90
|/ / /
* | | Merge pull request #24856 from nextcloud/psalm/whitelist-appsJulius Härtl2020-12-281-1/+29
|\ \ \ | |/ / |/| |
| * | Add whitelist for apps inside of the server repoJulius Härtl2020-12-281-1/+29
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #24833 from ↵Roeland Jago Douma2020-12-281-1/+4
|\ \ | | | | | | | | | | | | nextcloud/fix-total-upload-size-overwritten-by-next-upload Fix total upload size overwritten by next upload
| * | Fix total upload size overwritten by next uploadDaniel Calviño Sánchez2020-12-231-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upload progress is based on the "totalToUpload" variable. However, as the variable is set when an upload is submitted, if another upload is submitted before the previous one finished the upload progress only took into account the size of the new upload (although the upload itself worked fine; the files of the new submitted upload are added to the active one). Now "totalToUpload" is either increased or set depending on whether an upload is active or not. Note that although "data.total" holds the total size of the files being uploaded "totalToUpload" needs to be used in "fileuploadprogressall" instead; "totalToUpload" is calculated when the upload is submitted, but since 7c4c5fe6ae91 the actual upload of the files, and thus updating the value of "data.total", may be deferred until the parent folders were created. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #24775 from nextcloud/dependabot/npm_and_yarn/marked-1.2.7Roeland Jago Douma2020-12-286-7/+10
|\ \ \ | | | | | | | | Bump marked from 1.2.6 to 1.2.7
| * | | Bump marked from 1.2.6 to 1.2.7dependabot-preview[bot]2020-12-216-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [marked](https://github.com/markedjs/marked) from 1.2.6 to 1.2.7. - [Release notes](https://github.com/markedjs/marked/releases) - [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js) - [Commits](https://github.com/markedjs/marked/compare/v1.2.6...v1.2.7) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | | Merge pull request #24832 from nextcloud/enh/24813/trash-autoid-bigintRoeland Jago Douma2020-12-282-2/+2
|\ \ \ \ | | | | | | | | | | Make oc_files_trash.auto_id a bigint
| * | | | Make oc_files_trash.auto_id a bigintVincent Petry2020-12-232-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Adjusted migration. Added to occ command to update existing tables. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | | | Merge pull request #24843 from ↵dependabot-preview[bot]2020-12-282-81/+29
|\ \ \ \ | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.0
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-28 08:49:45 +0000