no need to throw a exception we catch two lines later

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

Only don't resolve public links

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

Don't resolve public share token if public sharing is disabled

Otherwise disabling sharing does prevent access to the view controllers but one can still access the shares using the public preview route or the public WebDAV endpoint.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Merge pull request #2764 from nextcloud/fix-groupshare-sharetimesort

[downstream] When grouping shares, sort by stime then id (#26777)

Merge pull request #2762 from nextcloud/add-js-computerFileSize

[downstream] Add js computer file size

When grouping shares, sort by stime then id (#26777)

If share times are equal, the first share should still win instead of
having the shares swapped.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Verify input, add more unit tests

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Add test for unparseable string

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Implements all comments from @PVince81

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Adding computerFileSize in OC.Util

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Merge pull request #2757 from nextcloud/cron-5.6

Also check in cron for old php version

Merge pull request #2752 from nextcloud/issue-2675-dont-allow-firefox-to-store-the-space

Use a form so firefox doesn't try to save the space as a password

Also check in cron for old php version

Fixes #2756

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

Merge pull request #2754 from nextcloud/activities-manager-publish-exception

Activities IManager throws an BadMethodCallException

Merge pull request #2689 from andreas-p/fix-remote-conflict

Fix showConflict

Activities IManager throws an BadMethodCallException

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

Use a form so firefox doesn't try to save the space as a password

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

Merge pull request #2727 from nextcloud/fix-colon-issue

[downstream] Fix colon issue

Merge pull request #2721 from nextcloud/ocs-die-on-exception

[downstream] Die in OCS v1.php on exception

Merge pull request #2723 from nextcloud/integrity-exit-code

[downstream] Return 1 if integrity check is failed. Fixes #22806

Fix showConflict

use getFullFileName to show conflicting file
add original.directory to make fileExists happy

Signed-off-by: Andreas Pflug <dev@admin4.org>

Merge pull request #2726 from nextcloud/check-all-channels

[downstream] Consider all channel except blank and git to be signed

Merge pull request #2735 from nextcloud/fix-settingsmenu

Adjust shadows and fix positioning in header menus

Adjust shadows and fix positioning

Signed-off-by: Julius Haertl <jus@bitgrid.net>

Update third-party ref for new sabre/uri version

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Merge pull request #2725 from nextcloud/memcached-connect-once

[downstream] Set options, then add servers

Merge pull request #2722 from nextcloud/failed-to-create-share-fix

[downstream] commit transaction after select query

Merge pull request #2720 from nextcloud/fix-25692

[downstream] Do not validate return code is set is successful

Add integration test for creating folder with colon

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Consider all channel except blank and git to be signed

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Set options, then add servers

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Return 1 if integrity check is failed. Fixes #22806

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

commit transaction after select query

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Die in OCS v1.php on exception

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Do not validate return code is set is successful

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Merge pull request #2707 from nextcloud/clear_appstore_cache_on_upgrade

Clear appstore cache on version upgrade

Merge pull request #2504 from nextcloud/downstream-ldap-15

Downstream LDAP Range Support

Merge pull request #2550 from nextcloud/smb-notify-rename

Fix order of parameters when getting notified of smb renames

Merge pull request #2714 from amittel/patch-1

Changed anchor

Merge pull request #1678 from nextcloud/smb-stat-root

Fix mtimes for share root

Merge pull request #2398 from nextcloud/fix-2368

flicker-free permission change in share dialog

Merge pull request #2695 from nextcloud/remove-leading-slashes-on-share-activity

Remove leading slash from sharing activity

Merge pull request #2715 from nextcloud/fix_dav_toto_tests

Fix TodoTest

Fix TodoTest

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

Changed anchor

from `avatar` to `personal-settings`

fixes #2711

Merge pull request #2625 from nextcloud/fix-todo-filter

Fix the Todos filter

Merge pull request #2681 from nextcloud/changes-to-changelog

let's add a date :D

Clear appstore cache on version upgrade

* Add version to cached json
* Compare version
* Updated calls
* Updated tests

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

let's add a date :D

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

Merge pull request #2698 from nextcloud/dont-disable-apps-on-update-if-at-least-php7

Don't disable apps on update if PHP >= 7.0.0

Don't disable apps on update if PHP >= 7.0.0

When PHP in a version higher than 7.0.0 is used we catch fatal exceptions in app.php and gracefully already disable the app. There is thus no need to also disable the apps on updates.

This has been requested by Jan to fix because that is "the most annoying thing ever" :TM:. – I'd say we give it a try and if that causes problems in the future we can consider alternative approaches.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Merge pull request #2673 from nextcloud/shared-scanner-unmasked

use unmasked permissions in shared scanner

Remove leading slash from sharing activity

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

Add integration tests for uploading files to a permission limited share

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

Merge pull request #2670 from nextcloud/issue-2646-dont-connet-to-database-before-creating-it

Do not connect to database before creating it

Merge pull request #2674 from nextcloud/lookup-server-connector-12

mark nc12 as supported for the lookup_server_connector

Merge pull request #2665 from nextcloud/remove-db-class-and-interface

Remove IDb interface which was deprecated for 3 years already

Merge pull request #2671 from nextcloud/issue-2661-reduce-log-level-on-database-user-creation

Only log as info when we can not create a new DB user

mark nc12 as supporter

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

Merge pull request #2677 from nextcloud/fix-avatars-in-mail

Don't set Content-Disposition header if one already exists

Don't set Content-Disposition header if one already exists

If a Content-Disposition header is already set by another plugin we don't need to set another one as this breaks clients.

Fixes https://github.com/nextcloud/server/issues/1992

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

use unmasked permissions in shared scanner

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

Merge pull request #2668 from nextcloud/master-one-gotta-love-apples-regressions

Safari CSPv3 support is sub-par

Only log as info when we can not create a new DB user

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

Do not connect to database before creating it

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

Safari CSPv3 support is sub-par

With 10.0.1 CSPv3 is broken in Safari if it doesn't run from a local IP. Awesome.

=> Let's remove this for Safari and keep chrome and Firefox in the whitelist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Remove IDb interface which was deprecated for 3 years already

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

Merge pull request #2654 from nextcloud/increase-master-version

Update app versions and requirements

Use the mocked config version

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

Merge pull request #2659 from nextcloud/fix_2641

Fix overwriting parameter

Fix overwriting parameter

Fixes #2641

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

Increase server version

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

Update app versions and requirements

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

Merge pull request #2643 from nextcloud/apps-buttons-wording

fix wording for apps mgmt buttons

Merge pull request #2636 from nextcloud/add-repair-step-to-fix-mounts

Add a repair step to fix broken mounts

Merge pull request #2637 from nextcloud/mount-cache-storageid

also compare storage ids when checking for changed mounts

Update autoloading

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

Add a unit test

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

Add a repair step to fix broken mounts

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

Merge pull request #2642 from nextcloud/avatars_class_name

Avatars class name

fix wording for apps mgmt buttons

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

Merge pull request #2639 from nextcloud/final-increase-of-version

Final version increasement for 11

always use numeric storage id in cacheentry

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

fix cacheentry return wrong storage id

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

Fixed correct filename of MoveAvatarsBackgroundJob

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

Merge pull request #2635 from nextcloud/fix_autoload_checker

Fix autoload checker

reuse cacheentry

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

Final version increasement for 11

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

also compare storage ids when checking for changed mounts

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

Update autoloader

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

The hash can change so checking for it is kind of dangerous

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

Merge pull request #2615 from nextcloud/daita-sharecontroller

Download a file in a subfolder in a sharedlink is not working

update phpdoc

Signed-off-by: Maxence Lange <maxence@pontapreta.net>

Merge pull request #2629 from nextcloud/increase-v-1-again

Increase version once again

Increase version once again

For https://github.com/nextcloud/server/pull/2615

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Merge pull request #2627 from nextcloud/already-increase-version

Increase version to 11.0.0

Merge pull request #2620 from nextcloud/theming-externalfiles

Show theming icons on external storage folders

Increase version to 11.0.0

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>

Fix the Todos filter

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

Merge pull request #2622 from nextcloud/improve-wording

improve wording of admin settings to enable search on the public address book