Commit Graph

57244 Commits

Author SHA1 Message Date
Christoph Wurst 0df8f4fa16
Merge pull request #24888 from nextcloud/dependabot/composer/nikic/php-parser-4.10.4
Bump nikic/php-parser from 4.3.0 to 4.10.4
2020-12-30 13:16:35 +01:00
Christoph Wurst fe8b86fbda
Bump nikic/php-parser from 4.3.0 to 4.10.4
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 11:21:37 +01:00
Roeland Jago Douma fe65f8facf
Add dedicated baseline for OCP
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-30 11:06:00 +01:00
Roeland Jago Douma 2ac0e89b05
Merge pull request #24895 from 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
2020-12-30 10:51:58 +01:00
Christoph Wurst b260ef954d
Merge pull request #24887 from nextcloud/dependabot/composer/swiftmailer/swiftmailer-6.2.4
Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4
2020-12-30 10:48:19 +01:00
Roeland Jago Douma 599a9af7d6
Merge pull request #24860 from nextcloud/bugfix/noid/well-known-htaccess
Make sure we properly ass well-known paths to index.php
2020-12-30 10:47:48 +01:00
Julius Härtl 9f5ada5d45
Also include external share results in recommendations
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-30 10:33:52 +01:00
Christoph Wurst 525ff85594
Bump swiftmailer/swiftmailer from 6.2.3 to 6.2.4
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 10:05:51 +01:00
Christoph Wurst c62d73641a
Merge pull request #24879 from nextcloud/dependachristoph/composer/symfony-4.4.18
Bump the Symfony family from 4.4.15 to 4.4.18
2020-12-30 08:56:16 +01:00
Roeland Jago Douma 0965599623
Merge pull request #24898 from nextcloud-pr-bot/automated/noid/psalm-baseline-update
[Automated] Update psalm-baseline.xml
2020-12-30 08:32:23 +01:00
Daniel Calviño Sánchez 28f2d0ec7a Make integration tests work with both PHP 7.3 and 7.4
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>
2020-12-30 06:01:38 +01:00
Nextcloud-PR-Bot 4ceeaccdd9 Update psalm baseline
Signed-off-by: GitHub <noreply@github.com>
2020-12-30 04:42:04 +00:00
Nextcloud bot f9941347e2
[tx-robot] updated from transifex 2020-12-30 02:19:06 +00:00
Roeland Jago Douma 4c01f0da8f
Merge pull request #24865 from nextcloud/tests/node-build-clean
Cleanup bundle files before checking the rebuild
2020-12-29 15:46:51 +01:00
Christoph Wurst d27d2a1c13
Bump the Symfony family from 4.4.15 to 4.4.18
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-29 15:02:01 +01:00
Julius Härtl d2e67312bb
Merge pull request #22921 from nextcloud/no-root-encryption-wrapper
dont apply encryption wrapper for root mount
2020-12-29 14:08:53 +01:00
Christoph Wurst 83ab996b16
Merge pull request #24873 from nextcloud/dependencies/sabre-II
Bump sabre/dav to 4.1
2020-12-29 14:00:37 +01:00
Christoph Wurst adc5b76831
Bump sabre/dav to 4.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-29 13:02:30 +01:00
Robin Appelman 8501cf9b5c
dont apply encryption wrapper for root mount
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>
2020-12-29 12:29:23 +01:00
dependabot-preview[bot] 04a65121b7
Merge pull request #23958 from nextcloud/dependabot/npm_and_yarn/build/node-sass-5.0.0 2020-12-29 11:21:14 +00:00
Julius Härtl c42385ef0f
Cleanup bundle files before checking the rebuild
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-29 12:20:32 +01:00
dependabot-preview[bot] f25826a5cf
Merge pull request #24772 from nextcloud/dependabot/npm_and_yarn/dompurify-2.2.6 2020-12-29 11:02:16 +00:00
Roeland Jago Douma c9fcf5f6b1
Merge pull request #24874 from nextcloud/enh/exception_logging
Avoid huge exception argument logging
2020-12-29 11:38:27 +01:00
Julius Härtl 98198e042e
Make sure we properly ass well-known paths to index.php
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-29 11:30:53 +01:00
Christoph Wurst 35aa34a1fd
Merge pull request #24533 from nextcloud/dependabot/composer/icewind/streams-0.7.2
Bump icewind/streams from 0.7.1 to 0.7.2
2020-12-29 11:24:37 +01:00
dependabot-preview[bot] 594c8fcf23
Bump dompurify from 2.2.3 to 2.2.6
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>
2020-12-29 11:14:05 +01:00
dependabot-preview[bot] 9e5f167d9a
Bump node-sass from 4.14.1 to 5.0.0 in /build
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>
2020-12-29 10:01:34 +00:00
Roeland Jago Douma 50d5229c95
Merge pull request #24872 from nextcloud/tests/jsunit-chromium
Run jsunit with chromium/puppeteer
2020-12-29 10:59:49 +01:00
Roeland Jago Douma 179de95f81
Avoid huge exception argument logging
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>
2020-12-29 10:50:53 +01:00
Christoph Wurst 73c7d0dc81
Bump icewind/streams from 0.7.1 to 0.7.2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-29 09:07:36 +01:00
Julius Härtl be38b924d1 jsunit: harden avatar tests to pass with fractional scaling of elements
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-29 08:42:34 +01:00
Julius Härtl 1bb81f8f11 jsunit: Remove warnings during test runs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-29 08:42:34 +01:00
Julius Härtl 7f52754fe8 jsunit: Add proper lang tag to document
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-29 08:42:34 +01:00
Julius Härtl c7a320d880 jsunit: Run jsunit with chromium/puppeteer on github actions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-29 08:42:27 +01:00
Nextcloud bot 083f3d2373
[tx-robot] updated from transifex 2020-12-29 02:19:50 +00:00
Julius Härtl 14306222df
Merge pull request #24856 from nextcloud/psalm/whitelist-apps 2020-12-28 18:33:28 +01:00
Julius Härtl 2d932b6b86
Add whitelist for apps inside of the server repo
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-28 11:26:50 +01:00
Roeland Jago Douma 86e6f07162
Merge pull request #24833 from nextcloud/fix-total-upload-size-overwritten-by-next-upload
Fix total upload size overwritten by next upload
2020-12-28 11:18:48 +01:00
Roeland Jago Douma 4ea1f29f9c
Merge pull request #24775 from nextcloud/dependabot/npm_and_yarn/marked-1.2.7
Bump marked from 1.2.6 to 1.2.7
2020-12-28 10:47:55 +01:00
Roeland Jago Douma 7bca3daa8c
Merge pull request #24832 from nextcloud/enh/24813/trash-autoid-bigint
Make oc_files_trash.auto_id a bigint
2020-12-28 10:43:16 +01:00
dependabot-preview[bot] 943d95efbe
Merge pull request #24843 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.0 2020-12-28 09:39:48 +00:00
Roeland Jago Douma 379acf6e35
21 beta4
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-28 10:22:50 +01:00
Christoph Wurst b981cb0718
Merge pull request #19942 from ACTom/add-mindmap-icon
Add mindmap type file icon
2020-12-28 10:13:38 +01:00
ACTom d9db6ae84e
Readd test getOnlyDefaultAliases()
Signed-off-by: ACTom <i@actom.me>
2020-12-28 13:59:10 +08:00
Nextcloud bot a7862479c7
[tx-robot] updated from transifex 2020-12-28 02:19:08 +00:00
Nextcloud bot 3d60c9611f
[tx-robot] updated from transifex 2020-12-27 02:24:43 +00:00
dependabot-preview[bot] 46200ce931
Bump webpack-cli from 4.2.0 to 4.3.0
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.2.0...webpack-cli@4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-26 03:10:42 +00:00
dependabot-preview[bot] 842689cf1a
Merge pull request #24844 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.3 2020-12-26 03:08:07 +00:00
Nextcloud bot cefaeb2eb1
[tx-robot] updated from transifex 2020-12-26 02:19:48 +00:00
dependabot-preview[bot] 537b35e1bb
Bump webpack-merge from 5.7.2 to 5.7.3
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.7.2 to 5.7.3.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.7.2...v5.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-26 02:17:13 +00:00