Commit Graph

56828 Commits

Author SHA1 Message Date
Nextcloud bot e160104caf
[tx-robot] updated from transifex 2021-01-06 02:20:00 +00:00
Julius Härtl 5fa935d6d6
Merge pull request #24900 from nextcloud/fix/user-settings
Fix updating user settings
2021-01-05 23:01:59 +01:00
Julien Veyssier ef0732384f
Merge pull request #24970 from nina-py/24938-dashboard-greetings-show-good-morning-after-noon
Fix dashboard greetings that show 'good morning' after noon
2021-01-05 18:58:21 +01:00
Julius Härtl 15b8bb9a7a
Merge pull request #24917 from nextcloud/enhancement/guzzle7
Update all the things for Guzzle 7 (php8 compat)
2021-01-05 16:44:29 +01:00
Julius Härtl 9b9c1aa7fd
Merge pull request #24961 from nextcloud/bugfix/noid/copy-tests 2021-01-05 15:49:16 +01:00
Christoph Wurst 9b833f5d2d
Update all the things for Guzzle 7 (php8 compat)
Guzzle 6 doesn't support php8, hence we need this for 21 for full php8
support.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-05 13:31:04 +01:00
Christoph Wurst 90d0732828
Fix updating user settings
The requests dispatched from the personal settings page don't always
send all the possible params but just a subset. Hence requests currently
fail on master e.g. when you update your email. This makes the arguments
optional again.

Regression of da9462b482

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-05 12:59:50 +01:00
Roeland Jago Douma 50b380e85b
Merge pull request #24964 from nextcloud/bugfix/noid/internal-server-error-when-importing-broken-ics-file
Don't throw a 500 when importing a broken ics reminder file
2021-01-05 12:57:00 +01:00
Nina Pypchenko 98299d9c29 Fix dashboard greetings that show 'good morning' after noon
Updated dashboard greetings to show "Good afternoon" after 12:00 instead of 13:00.

Updated time periods for greetings:
- Morning: 5:00 to 11.59
- Afternoon: 12:00 to 17.59
- Evening: 18:00 to 21:59
- Night: 22:00 to 4.59

Updated night-time greeting to "Hello" as "Good night" is a kind of goodbye.

Closes #24938.

Signed-off-by: Nina Pypchenko <22447785+nina-py@users.noreply.github.com>
2021-01-05 21:40:35 +11:00
Joas Schilling 9fd2b6045d
Don't throw a 500 when importing a broken ics reminder file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-05 10:08:14 +01:00
Julius Härtl 39c67d9868
Merge pull request #24829 from nextcloud/bugfix/24813/add-missing-migrations 2021-01-05 09:32:33 +01:00
Julius Härtl 98560c80ea
Properly handle result when copying with failure and throw in tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 09:20:35 +01:00
Julius Härtl ee842f1c43
Fix writeStream mocking
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 09:20:35 +01:00
Nextcloud bot 364b29b1e9
[tx-robot] updated from transifex 2021-01-05 02:21:26 +00:00
Roeland Jago Douma 1f48a83b09
Merge pull request #24936 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.1
Bump webpack-cli from 4.3.0 to 4.3.1
2021-01-04 12:55:11 +01:00
Christoph Wurst 969d4312e2
Merge pull request #24907 from nextcloud/fix/license-headers-21-II
Update license headers
2021-01-04 11:06:30 +01:00
Nextcloud bot 8d22ba4a33
[tx-robot] updated from transifex 2021-01-04 02:21:48 +00:00
Christoph Wurst b6ba622a58
Merge pull request #24946 from nextcloud/dependabot/composer/pimple/pimple-3.3.1
Bump pimple/pimple from 3.2.3 to 3.3.1
2021-01-03 12:40:49 +01:00
Christoph Wurst b8d16650b6
Bump pimple/pimple from 3.2.3 to 3.3.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-01-03 10:47:37 +01:00
Nextcloud bot 0cecd54909
[tx-robot] updated from transifex 2021-01-03 02:20:55 +00:00
dependabot-preview[bot] 87e917ca74
Merge pull request #24941 from nextcloud/dependabot/submodules/3rdparty-e8bad7c 2021-01-02 16:55:04 +00:00
dependabot-preview[bot] c698314987
Bump 3rdparty from `225c515` to `e8bad7c`
Bumps [3rdparty](https://github.com/nextcloud/3rdparty) from `225c515` to `e8bad7c`.
- [Release notes](https://github.com/nextcloud/3rdparty/releases)
- [Commits](225c51509e...e8bad7cc6f)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-02 16:15:53 +00:00
Christoph Wurst 0c6a904dd7
Merge pull request #24916 from nextcloud/enh/psr-updates
Bump psr/log and psr/http-client
2021-01-02 16:58:13 +01:00
dependabot-preview[bot] 5671158409
Bump webpack-cli from 4.3.0 to 4.3.1
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.3.0 to 4.3.1.
- [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.3.0...webpack-cli@4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-02 02:18:56 +00:00
Nextcloud bot 25fd32cb5c
[tx-robot] updated from transifex 2021-01-01 02:21:03 +00:00
Nextcloud bot d57153940b
[tx-robot] updated from transifex 2020-12-31 02:27:04 +00:00
Christoph Wurst 150e2fc51d
Bump psr/log and psr/http-client
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 19:42:58 +01:00
Christoph Wurst 1cb501c338
Merge pull request #24890 from nextcloud/dependabot/composer/pear/archive_tar-1.4.11
Bump pear/archive_tar from 1.4.9 to 1.4.11
2020-12-30 19:41:43 +01:00
Christoph Wurst 7b154a3e67
Bump pear/archive_tar from 1.4.9 to 1.4.11
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 19:03:40 +01:00
Christoph Wurst 47b4efca54
Merge pull request #24886 from nextcloud/dependabot/composer/guzzlehttp/guzzle-6.5.5
Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5
2020-12-30 17:51:22 +01:00
Julius Härtl 5e3fe1cbfe
Merge pull request #24864 from nextcloud/bugfix/noid/always-show-external-share
Also include external share results in recommendations
2020-12-30 17:40:58 +01:00
Roeland Jago Douma 40832acfd5
Merge pull request #24852 from nextcloud/version/21/beta4
21 beta4
2020-12-30 15:09:20 +01:00
Roeland Jago Douma ab21491aea
Merge pull request #24909 from nextcloud/fix/ci/psalm-ocp
Fix expceted psalm-ocp.xml file
2020-12-30 15:07:43 +01:00
Roeland Jago Douma 36281c64e1
Merge pull request #24571 from nextcloud/Valdnet-patch-4
l10n: Change to the name of the app
2020-12-30 14:32:44 +01:00
Roeland Jago Douma 81423a2a2f
Fix expceted psalm-ocp.xml file
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-30 14:32:15 +01:00
Christoph Wurst b0675a763c
Bump guzzlehttp/guzzle from 6.5.2 to 6.5.5
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 14:15:22 +01:00
Christoph Wurst 9ce3ea3368
Update license headers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-30 14:07:05 +01:00
Valdnet 403637d773 Change to the name of the app
It should refer to the application name "Files".

Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-30 12:44:52 +00:00
Roeland Jago Douma c96bb21ab9
Merge pull request #24903 from nextcloud/enh/psalm-ocp
Add dedicated baseline for OCP
2020-12-30 13:23:25 +01:00
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