Replace merge.smart

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Bump webpack-merge from 4.2.2 to 5.0.9

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.2.2 to 5.0.9.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.2.2...v5.0.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Merge pull request #21993 from nextcloud/fix/lower_route_not_found_level

Log the route not found exception on a lower level

Merge pull request #22015 from nextcloud/bugfix/noid/correctly-remove-user-shares-on-removing-group-members

Correctly remove usergroup shares on removing group members

Correctly remove usergroup shares on removing group members

Signed-off-by: Joas Schilling <coding@schilljs.com>

Merge pull request #22034 from nextcloud/bugfix/noid/parse-url-returns-null

parse_url returns null in case a parameter is not found

Merge pull request #21542 from nextcloud/activity-notifications

basic settings system for activity notifications

Merge pull request #22017 from nextcloud/techdebt/noid/fix-psr4-namespace

Fix PSR-4 compatible namespace

Merge pull request #22038 from nextcloud/bugfix/noid/dont-strict-type-uid-to-string

When no user is logged in null is used

When no user is logged in null is used

Signed-off-by: Joas Schilling <coding@schilljs.com>

parse_url returns null in case a parameter is not found

Signed-off-by: Joas Schilling <coding@schilljs.com>

[tx-robot] updated from transifex

Merge pull request #22027 from nextcloud/bugfix/noid/fix-overwrite-service-for-apps

Fix overwriteService() for apps

Fix overwriteService() for apps

Signed-off-by: Joas Schilling <coding@schilljs.com>

[tx-robot] updated from transifex

Fix PSR-4 compatible namespace

Signed-off-by: Joas Schilling <coding@schilljs.com>

[tx-robot] updated from transifex

[tx-robot] updated from transifex

Log the route not found exception on a lower level

This should be logged but it is not that critical to wanner level 3

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Merge pull request #21977 from onehappycat/issue_21960

Ignore whitespace in sharing by mail

Merge pull request #21988 from nextcloud/enh/theming-guest

Combine body-login rules in theming and fix twofactor and guest styling on bright colors

Merge pull request #21818 from nextcloud/techdebt/noid/theming-bootstrap

Use IBootstrap for the app theming

implement old settings interface

Signed-off-by: Robin Appelman <robin@icewind.nl>

Use IBootstrap for the app theming

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #21987 from nextcloud/techdebt/notfoundresponse-template

Move NotFoundResponse to a proper TemplateResponse

Combine body-login rules in theming and fix twofactor and guest styling on bright colors

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Move NotFoundResponse to a proper TemplateResponse

Signed-off-by: Julius Härtl <jus@bitgrid.net>

[tx-robot] updated from transifex

Merge pull request #21940 from nextcloud/fix/14541/fix-fragile-acceptance-tests-part1

Revert "Disable fragile tests for now" partially

Ignore whitespace in sharing by mail

Signed-off-by: onehappycat <one.happy.cat@gmx.com>

Merge pull request #21814 from nextcloud/techdebt/noid/federated_share_added-into-typed-event

Move federated_share_added into a typed event

Merge pull request #21972 from nextcloud/techdebt/noid/cleanup-phpunit-warnings

Fix PHPUnit deprecation warnings

Merge pull request #21628 from nextcloud/external-to-s3-trashbin-fix

fix moving files from external storage to object store trashbin

Merge pull request #21747 from simonspa/fix_mail_logosize

Fix header logo size in notification mails

fix renameFromStorage messing with folder mimetype

Signed-off-by: Robin Appelman <robin@icewind.nl>

Adjust tests to new e-mail layout

Signed-off-by: Simon Spannagel <simonspa@kth.se>

Fix header logo size in notification mails

Signed-off-by: Simon Spannagel <simonspa@kth.se>

Remove deprecated test of internal attributes via assertAttributeEquals in constructor tests

I removed the tests completely because they just test that the constructor assigns the values to the internal properties. Nothing that should be cared about from the outside.

See https://github.com/sebastianbergmann/phpunit/issues/3339#issuecomment-428843322

It is seen as bad practice to test internal stuff of objects instead of the actual input and output of mathod calls.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Replace deprecated assertArraySubset with logic that does the same

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Use assertEqualsCanonicalizing instead of deprecated assertEquals parameter

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Remove deprecated test of internal attributes via assertAttributeEquals

See https://github.com/sebastianbergmann/phpunit/issues/3339#issuecomment-428843322

It is seen as bad practice to test internal stuff of objects instead of the actual input and output of mathod calls.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Use assertStringContainsString instead of assertContains on strings

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #21973 from nextcloud/techdebt/noid/fix-risky-2fa-backup-code-test

Fix risky test in twofactor_backupcodes

use exceptions for error signaling in writeStream

this remove the ambiguity when writing zero length files

Signed-off-by: Robin Appelman <robin@icewind.nl>

rollback cache rename if trashbin move fails

Signed-off-by: Robin Appelman <robin@icewind.nl>

fix moving files from external storage to object store trashbin

having the "cache rename" after the "storage move" caused the target
to get the fileid from the source file, without taking care that the object
is stored under the original file id.

By doing the "cache rename" first, we trigger the "update existing file"
logic while moving the file to the object store and the object gets stored for the
correct file id

Signed-off-by: Robin Appelman <robin@icewind.nl>

Merge pull request #21970 from nextcloud/dependageorg/npm_and_yarn/nextcloud/vue-2.3.0

Bump @nextcloud/vue from 2.2.1 to 2.3.0

Merge pull request #21966 from nextcloud/enh/userbackend/custom_logout

Allow user backends to specify a custom logout url

Fix risky test in twofactor_backupcodes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Bump @nextcloud/vue from 2.2.1 to 2.3.0

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Merge pull request #21963 from nextcloud/fix/sharing/respect_default_share_permissions

Respect default share permissions

Allow user backends to specify a custom logout url

* Allows SSO backends to do a global logout

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Respect default share permissions

Else we'll always create new shares with the max permissions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

Merge pull request #21957 from nextcloud/techdebt/noid/bootstrap-testing

Use IBootstrap for the testing app

Move federated_share_added into a typed event

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

[tx-robot] updated from transifex

Use IBootstrap for the testing app

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #21946 from nextcloud/fix/webauthn/windows_hello

Do not double encode the userid in webauthn login

Merge pull request #21949 from nextcloud/smb-3.2.6

update icewind/smb to 3.2.6

Merge pull request #21950 from nextcloud/bugfix/noid/wipe-translation

Properly fetch translation for remote wipe confirmation dialog

Do not double encode the userid in webauthn login

* Else login fails with webauthn devices that send the userid
  - Like windows hello

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Compile assets

Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Merge pull request #21870 from nextcloud/fix/bootstrap-context-container-interfaces

Make the bootstrap context return ContainerInterface instances

Properly fetch translation for remote wipe confirmation dialog

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #21948 from nextcloud/bugfix/noid/accesibilityoca

Load accessibilityoca script

Merge pull request #21867 from nextcloud/dependageorg/npm_and_yarn/nextcloud/vue-2.2.1

Hide share link menu before copying the share link in acceptance tests

The (old) Firefox version used in the acceptance tests does not properly
render the share link menu. As the menu is taller than it should
sometimes it covers the copy link button, so it is not possible to click
it without hiding the share link menu. Moreover, in those cases the
share menu button is also covered by the share menu, so the menu needs
to be closed by pressing the "Esc" key.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>

Recompile JS assets

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Fix breaking changes of nc/vue update

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

Bump @nextcloud/vue from 1.5.0 to 2.2.1

Signed-off-by: Georg Ehrke <developer@georgehrke.com>

update icewind/smb to 3.2.6

Signed-off-by: Robin Appelman <robin@icewind.nl>

Load accessibilityoca script

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Merge pull request #21905 from nextcloud/dependabot/npm_and_yarn/babel/core-7.10.5

Bump @babel/core from 7.10.4 to 7.10.5

Bump @babel/core from 7.10.4 to 7.10.5

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.10.4 to 7.10.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.10.5/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Merge pull request #21904 from nextcloud/dependabot/npm_and_yarn/nextcloud/axios-1.3.3

Bump @nextcloud/axios from 1.3.2 to 1.3.3

[tx-robot] updated from transifex

Merge pull request #21658 from nextcloud/trashbin-configurable-size

allow admin to configure the max trashbin size

Use the proper IAppContainer and IServerContainer type hints to know which code runs with which container

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Adjust apps' code to use the ContainerInterface

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

Make the bootstrap context return ContainerInterface instances

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

build autoloader

Signed-off-by: Robin Appelman <robin@icewind.nl>

improve default notification fallback

Signed-off-by: Robin Appelman <robin@icewind.nl>

Merge pull request #21941 from nextcloud/design/font-ubuntu-cantarell

Move Cantarell before Ubuntu in font stack to fix GNOME + Ubuntu setups

basic settings system for activity notifications

Signed-off-by: Robin Appelman <robin@icewind.nl>

Move Cantarell before Ubuntu in font stack to fix GNOME + Ubuntu setups

Signed-off-by: Jan C. Borchardt <hey@jancborchardt.net>

Revert "Disable fragile tests for now"

This reverts commit 40e04c83914e960b5aff739900d887f0e7a44d63.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Merge pull request #21934 from nextcloud/tests/noid/disable-fragile-comments-tests

Disable fragile comments tests

Merge pull request #21929 from nextcloud/bugfix/noid/encryption-transfer-user

Encryption is ready if master key is enabled

Disable fragile comments tests

Those tests are actual problems in our code. See https://github.com/nextcloud/server/pull/20462#issuecomment-613380650 for a summary by @danxuliu

Basically they are introduced by #18929 but are only revealed by #18764.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

Encryption is ready if master key is enabled

Signed-off-by: Julius Härtl <jus@bitgrid.net>

[tx-robot] updated from transifex

Merge pull request #21864 from nextcloud/techdebt/files-versions-psr-container

Migrate files versions to the PSR container

Merge pull request #21865 from nextcloud/techdebt/settings-psr-container

Migrate settigns to the PSR container

Bump @nextcloud/axios from 1.3.2 to 1.3.3

Bumps [@nextcloud/axios](https://github.com/nextcloud/nextcloud-axios) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/nextcloud/nextcloud-axios/releases)
- [Changelog](https://github.com/nextcloud/nextcloud-axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nextcloud/nextcloud-axios/compare/v1.3.2...v1.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Merge pull request #21875 from nextcloud/techdebt/deprecate-ilogger

Deprecate ILogger in favor of the PSR-3 logger

Merge pull request #21862 from nextcloud/techdebt/files-sharing-psr-container

Migrate files sharing to the PSR container

Merge pull request #21866 from nextcloud/techdebt/ldap-psr-container

Migrate LDAP to the PSR container

Merge pull request #21846 from nextcloud/dependabot/npm_and_yarn/p-limit-3.0.2

Bump p-limit from 2.3.0 to 3.0.2

Merge pull request #21850 from nextcloud/techdebt/noid/register-alternative-logins

Allow to register AlternativeLogin on RegistrationContext

Merge pull request #21921 from nextcloud/fix/use-DOMContentLoaded

Use DOMContentLoaded and fix sharebymail loading issue