Merge pull request #17387 from nextcloud/fix/remove/federated_share

Allow removing federated shares of locally reshared files

Merge pull request #17370 from nextcloud/jospoortvliet-patch-1

Update README.md

Update README.md

some minor readme updates

Fix updating and deleting authtokens (#17397)

Fix updating and deleting authtokens

allow trash backends to overwrite the tooltip for trash items (#17374)

allow trash backends to overwrite the tooltip for trash items

fix updating and deleting authtokens

Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>

Merge pull request #17405 from nextcloud/enh/switch/escapeHTML

Move to escape-html

allow trash backends to overwrite the tooltip for trash items

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

[tx-robot] updated from transifex

Fix shares read permissions (#16761)

Fix shares read permissions

Fix shares read permissions

A user with reshare permissions on a file is now able to get any share
of that file (just like the owner).

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

Remove the tests since the library is tested

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

Add checks for whether a user with access to a share can delete it

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

Extract check for whether a user with access to a share can edit it

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

Add assorted integration tests for shares

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

Do not expect a 200 HTTP status code when updating a share

This will be needed to test scenarios in which updating a share return a
different HTTP status code, like 401.

The assertion for the 200 HTTP status code was added in those scenarios
that tested updating a share (that is, those that were also checking the
OCS status code), but not in those in which updating a share was just a
preparatory step for the actual test (in the same way that the HTTP
status code is not checked in those tests when creating a share).

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

Move sharing integration tests to their own directory

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

Add helper script to run integration tests on a Docker container

Copied and adjusted from "tests/integration/run-docker.sh" in Talk; see
its commit history for further reference.

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

Move to escape-html

* If there is a package that does exactly the same then lets us use that
* Import it properly in the internals (less deprecation warnings)

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

Merge pull request #17357 from nextcloud/enh/oauth/no_oc_binding

Import router in oauth js

Merge pull request #17359 from nextcloud/bugfix/noid/dont-call-basename-on-null

Don't call basename on null

Use same settings for mail share as link shares (#16629)

Use same settings for mail share as link shares

Prevent non owners to update others link shares

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

Use same settings for mail share as link shares

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

Fix master testing and update eslint-config (#17367)

Fix master testing and update eslint-config

Fix tag acceptance tests after #16682

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

Add Fatal logging option (#17363)

Add Fatal logging option

Split drone webpack tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Fix master testing and update eslint-config

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

[tx-robot] updated from transifex

Merge pull request #17388 from nextcloud/fix/undefined_index/loginflowv2

Don't use an undefined index if not needed

Don't use an undefined index if not needed

It is not set. And not used. Just some copy paste leftover.

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

Allow removing federated shares of locally reshared files

* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

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

fixup! Import router

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

Import router

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

Remove users management settings cleaning leftovers (#17360)

Remove users management settings cleaning leftovers

Add Fatal logging option

Signed-off-by: Tim Terhorst <mynamewastaken+gitlab@gmail.com>

[tx-robot] updated from transifex

Merge pull request #17002 from nextcloud/fix/noid/ldap-dont-process-known-avas

Don't process known avatars from LDAP

Merge pull request #17366 from nextcloud/fix/usersIngroup

Fix DB usersInGroups fetching

Merge pull request #17350 from nextcloud/adjust-fontsize

Bring the font size down to 14px

Fix DB usersInGroups fetching

* Follow the interface defaults
* Only set limit or offset if they are properly set

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

[tx-robot] updated from transifex

Bring the font size down to 14px

Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>

Remove users management settings cleaning leftovers

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

Don't call basename on null

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

Merge pull request #17263 from nextcloud/enhancement/eslint

Add eslint global nextcloud config

Comply to eslint

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

Use eslint

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

Merge pull request #17353 from nextcloud/bugfix/noid/fix-wich-typo

Fix typo in "which"

[tx-robot] updated from transifex

Merge pull request #17336 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.4.0

Bump handlebars from 4.2.1 to 4.4.0 in /build

Merge pull request #17317 from nextcloud/dependabot/npm_and_yarn/babel/core-7.6.2

Bump @babel/core from 7.6.0 to 7.6.2

Fix typo in "which"

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

Merge pull request #17001 from nextcloud/fix/noid/addressbookchanges-avatar

reduce adressbook change events and handling

Bump @babel/core from 7.6.0 to 7.6.2

Bumps [@babel/core](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

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

Merge pull request #17320 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.6.2

Bump @babel/preset-env from 7.6.0 to 7.6.2

Use handlebars from node_modules (on CI) (#17340)

Use handlebars from node_modules (on CI)

Use handlebars from node_modules (on CI)

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

Bump handlebars from 4.2.1 to 4.4.0 in /build

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.2.1 to 4.4.0.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/v4.4.0/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.2.1...v4.4.0)

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

Bump dompurify from 2.0.1 to 2.0.3 (#17318)

Bump dompurify from 2.0.1 to 2.0.3

Bump dompurify from 2.0.1 to 2.0.3

Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.0.1 to 2.0.3.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/2.0.1...2.0.3)

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

Update Bug_report.md

Bump webpack from 4.40.2 to 4.41.0 (#17319)

Bump webpack from 4.40.2 to 4.41.0

Bump webpack from 4.40.2 to 4.41.0

Bumps [webpack](https://github.com/webpack/webpack) from 4.40.2 to 4.41.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.40.2...v4.41.0)

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

Bump @babel/preset-env from 7.6.0 to 7.6.2

Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.6.0 to 7.6.2.
- [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.6.0...v7.6.2)

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

Bring the default font size up to 15px (#17228)

Bring the default font size up to 15px

Append / to data('path') for folder content request (#17285)

Append / to data('path') for folder content request

Append / to data('path') for folder content request

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Move oauth admin settings to initialstate (#17287)

Move oauth admin settings to initialstate

Move oauth admin settings to initialstate

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

Move settings to an app (#17182)

Move settings to an app

Fix fetching additional search results on scrolling down (#15557)

Fix fetching additional search results on scrolling down

Move settings to an app

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

Fix fetching additional search results on scrolling down

Signed-off-by: René Bühlmann <rene@buehlmann.net>

Remove input id on login form (#17294)

Remove input id on login form

Remove input id on login form

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>

[tx-robot] updated from transifex

Merge pull request #17258 from nextcloud/smb-timeout-config

add (hidden) option to configure smb timeout

Merge pull request #17286 from nextcloud/bugfix/noid/correctly-detect-mimetype-from-uploads

Correctly detect the mimetype from uploads

Merge pull request #17245 from nextcloud/bugfix/noid/fix-migration

Fix "Cannot add a NOT NULL column with default value NULL"

Correctly detect the mimetype from uploads

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

Fix "Cannot add a NOT NULL column with default value NULL"

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

Merge pull request #17264 from nextcloud/move-from-storage-wrappers

handle moveFromStorage within the same storage even when storage wrap…

Merge pull request #14913 from nextcloud/bugfix/6954/scan-external-s3

Fix directory detection for s3

Merge pull request #17252 from nextcloud/bugfix/noid/user-0-can-not-comment

Fix user with id 0 to be able to comment

Merge pull request #17262 from nextcloud/objectstore-remove-cache-on-delete

dont delete cache entries if deleting an object from object store failed

Merge pull request #17181 from nextcloud/feature/noid/talk-attachment

Add talk-attachment as a rich object type

[tx-robot] updated from transifex

handle moveFromStorage within the same storage even when storage wrappers are applied to the source storage

the target storage doesn't need additional handling for wrappers as the wrappers implementation of moveFromStorage already deals with that

Any storage based on local storage isn't affected by this as local storage already has it's own way of handling with this

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

dont delete cache entries if deleting an object from object store failed

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

Update apps/files_external/lib/Lib/Backend/SMB.php

Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>

add (hidden) option to configure smb timeout

hidden from ui to prevent clutter

```occ files_external:config <mount> timeout 30```

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

Merge pull request #17254 from nextcloud/fix/double_escape

Properly import DOMPurify in l10n.js

Fix spaces being collapsed in move dialog (#17240)

Fix spaces being collapsed in move dialog

Properly import DOMPurify in l10n.js

Fixes a bunch of warning in the console.
And fixed the doube escaping.

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

Merge pull request #17253 from nextcloud/fix/apptoken_creation

Fix apptoken creation

Fix apptoken creation

Seems there was a small bug in #15936
This inverts the check and add the property

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

Fix user with id 0 to be able to comment

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

[tx-robot] updated from transifex