Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php

[files_versions] fix array order

Fix public upload progress bar

adding password protection check to getShareByToken()

Versioning expire function tests

Replaced time() with uniqid() to make sure the file name is unique

Revert "use getAppWebPath() in here as well"

OC_Util::setupFS($user) will create a data dir for the given string - no...

The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.

don't use the user id within the versions preview call as it could be us...

don't use the user id within the versions preview call as it could be used to access previews of another user

use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'

user workaround to compare CLOB column with CHAR value

OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error

Load a separate config (if present) when running unit tests

Reuse the data retrieved from the cache in checkUpdate

When reading the size of "files" mountpoints need to be excluded

Changed jQuery selector for public preview to public_upload to correctly show preview

Quote column names on adding description

The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731