Merge pull request #12191 from nextcloud/sessions-fixes

Sessions fixes

Merge pull request #12271 from nextcloud/prevent-upload-cancel

Ask before cancelling an ongoing upload

Merge pull request #12185 from nextcloud/cleanup/dicontainer

Cleanup the DIContainer

Merge pull request #12004 from nextcloud/dl-vcf-groups-plugin

Multi vcf download plugin

Ask before cancelling an ongoing upload

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

Merge pull request #12260 from nextcloud/dependabot/npm_and_yarn/build/node-sass-4.10.0

Bump node-sass from 4.9.4 to 4.10.0 in /build

Merge pull request #12253 from nextcloud/2fa-settings-hint

Add class "settings-hint" to 2FA-text

Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.24.0

Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility

Bump node-sass from 4.9.4 to 4.10.0 in /build

Bumps [node-sass](https://github.com/sass/node-sass) from 4.9.4 to 4.10.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.9.4...v4.10.0)

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

Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.1

Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility

Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility

Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

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

Merge pull request #12265 from nextcloud/dav-bump

bump dav version for migration

Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2

make twofactor .button inline-block

Merge pull request #12266 from nextcloud/bump/npm/settings

Bump npm deps: settings

Merge pull request #12252 from nextcloud/theming-advanced-h3

Change "Advanced options" to h3

Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.24.0

Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2

Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.1

Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2

Rebuild assets

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

Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.1

Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification

Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.24.0

Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification

Bump npm deps: settings

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

Merge pull request #12257 from nextcloud/dependabot/npm_and_yarn/settings/nextcloud-vue-0.3.1

bump dav version for migration

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

Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_render

Set the filemodel before rending the detailsview

Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

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

Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2

Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

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

Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

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

Bump nextcloud-vue from 0.2.0 to 0.3.1 in /settings

Bumps [nextcloud-vue](https://github.com/nextcloud/vue-components) from 0.2.0 to 0.3.1.
- [Release notes](https://github.com/nextcloud/vue-components/releases)
- [Commits](https://github.com/nextcloud/vue-components/compare/v0.2.0...v0.3.1)

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

Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification

Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

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

Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification

Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

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

[tx-robot] updated from transifex

Add class "settings-hint" to 2FA-text

Signed-off-by: Marius Blüm <marius@lineone.io

Change "Advanced options" to h3

Signed-off-by: Marius Blüm <marius@lineone.io>

Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares

Shares are displayed to users with resharing rights

Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelock

Do not log FileLock as exception

Added multi-get vcf download plugin

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

Fix tests

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

Do not log FileLock as exception

There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

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

make twofactor .button inlin-block

fixes #3752

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>

[tx-robot] updated from transifex

Merge pull request #10890 from nextcloud/bugfix/10857/app-menu-resize

Fix app menu calculation for random size of the right header

[tx-robot] updated from transifex

Set the filemodel before rending the detailsview

fixes #10934

Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.

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

Fix app menu calculation for random size of the right header

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

Merge pull request #12071 from nextcloud/addressbook-uid-check-migration

Addressbook uid check migration

Merge pull request #12215 from nextcloud/wait-for-the-link-share-menu-to-open-in-acceptance-tests

Wait for the link share menu to open in acceptance tests

Merge pull request #12216 from nextcloud/bugfix/appmenu/loading

Fix loading indicator in app menu

Fix files_sharing

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

Properly query the methodreflector

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

Fix tests

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

The identityproof manager should be in Server

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

No need to register it also in the DI Container

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

The Encryption manager belongs in Server.php

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

SearchResult should be difined in Server as it is a core component

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

The UserSession is constructed in the server

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

TimeFactory is already regsitsered in the Server Container

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

Request is already regsitered in the Server container

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

Was already registered in Server

The DIContainaer will query server anyways if it can't find it

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

Merge pull request #11404 from flokli/sendmail-path

Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail

Fix loading indicator in app menu

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

Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk

Add support for sending the password for a link share by Nextcloud Talk

Wait for the link share menu to open in acceptance tests

In the acceptance tests the link share menu is automatically opened if
needed before interacting with an item in the menu; if the menu is not
open it is opened by clicking on its toggle.

However, since a recent change the link share menu is automatically
opened by the regular UI after the link share is created. This causes
that, sometimes, after the creation of a link share the acceptance tests
check whether the menu is shown or not before the menu was automatically
opened; as the menu is not open then the acceptance tests proceed to
click on the toggle, but in the meantime the link share was created and
the menu opened, so clicking on the toggle now closes it. As the menu is
closed it is not possible to interact with its items and the test fails.

To prevent that now the acceptance tests wait for the link share menu to
open after a link share is created before continuing with the other
steps.

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

Phpunit fix

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

Merge pull request #12200 from nextcloud/tech-debt/noid/cleanup-legacy-sharing

Cleanup some unused sharing methods from the old sharing code

Fallback to default path is sendmail can't be found

If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

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

Merge pull request #12190 from forsd/AddtestFiles_Trashbin

Add test OCA\Files_Trashbin\Capabilities

Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail

`sendmail` can very well be in a path different from
`/usr/sbin/sendmail`.

We already search `$PATH` at `lib/private/Settings/Admin/Mail.php` to
detect whether we want to offer sendmail as a mail transfer method, so
let's be consistent and actually initialize `\Swift_SendmailTransport`
with this path to sendmail, instead of just hardcoding
`/usr/sbin/sendmail`.

Signed-off-by: Florian Klink <flokli@flokli.de>

Merge pull request #12148 from nextcloud/suppress-wrong-audit-log-message

suppress wrong audit log messages about failed login attempts

Merge pull request #12198 from nextcloud/fix/noid/during-hard-failure-log-original-exception

Log the previous exception during hard failure

Add acceptance test steps to be used from Talk acceptance tests

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

Test that "Password protect by Talk" is not shown if Talk is not enabled

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

Add "Password protect by Talk" to the menu of link shares

When Talk is enabled the menu for link shares now shows a checkbox to
protect the password by Talk (that is, to show the "Request password by
Talk" UI in the authentication page for the link share).

Although in e-mail shares protecting the share with a password and
protecting the password by Talk are mutually exclusive actions (as when
the password is set it is sent to the sharee, so it must be set again
when protecting it by Talk to be able to verify the identity of the
sharee), in the case of link shares protecting the password by Talk is
an additional step to protecting the share with a password (as just
setting the password does not disclose it to anyone). As such, the
checkbox is shown only when there is a password set for the link share
(even if the field itself for the password is not shown, like when they
are enforced in the settings).

Note that the icon set for the field, "icon-passwordtalk", does not
currently exist; it is the same used for e-mail shares, and it is needed
simply to get the right padding in the menu.

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

Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3

[3rdparty] Bump sabre/dav to 3.2.3

revert tests

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

user can have his resharing rights revoked, yet seeing created shares

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

check parents resharing rights

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Use property to check if a share entry is shared with the current user

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

Add uid_owner to enable permission settings on the views

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

Remove reshare owner entry from the share list

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

Show share settings for owner and reshare owners only

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

limit to circles moderator

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

display shares to circles moderator

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

shares are displayed to users with resharing rights

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Merge pull request #12207 from nextcloud/item-list-popover-fix

Fix popover menu alignment in list

Cleanup some unused sharing methods from the old sharing code

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

Fix popover menu alignment in list

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

Merge pull request #12177 from nextcloud/fix/apptoken_login_flow_proper_host

Use the proper server for the apptoken flow login

Merge pull request #12195 from nextcloud/fulltextsearch-info-xsd

add the tag fulltextsearch

Merge pull request #12193 from nextcloud/interface-fulltxtsearch-issue-00002

+infoBool / +infoInt

Merge pull request #12194 from nextcloud/fix-path-as-dashboard-is-already-imported

fix path to DashboardManager, as the class is already imported (minor)

[tx-robot] updated from transifex

Add sending the password by Talk for a link share to ShareAPIController

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

Store "sendPasswordByTalk" property of link shares in the database

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

Check "note", "label" and "hide download" too in update share tests

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

Fix update share tests

The update share tests only checked that the share returned by
"update()" had the expected values. However, as "update()" returns the
same share that was given as a parameter the tests were not really
verifying that the values were updated in the database.

In a similar way, the test that checked that a password was removed did
not set a password first, so even if the database returned null it could
be simply returning the default value for the share; a password must be
set first to ensure that it is removed.

Besides that, a typo was fixed too that made the checks on the original
share instead of on the one returned by "update()"; right now it is the
same share, so the change makes no difference, but it is how the check
should be done anyway.

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

Merge pull request #11053 from nextcloud/occ-app-update-command

occ app update command

Merge pull request #12192 from nextcloud/development-setup

Development setup in readme, and some adjustments

Merge pull request #11844 from nextcloud/multiple-link-shares

allow to create multiple link shares via share api

Log the previous exception during hard failure

* otherwise the exception that was caused by the template is logged

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

Merge pull request #12188 from nextcloud/revert/9900/revert-wait-for-cron

Revert "Wait for cron to finish before running upgrade command"