update type hint in PHPDoc
Merge pull request #7864 from owncloud/routing-performance

Routing performance
fixing code style
Merge pull request #7748 from owncloud/postgresversionwarning

Added PostgreSQL version warning on upgrade
use minimum-scale=1.0
adding ellipsis on file names
adding proper notification area for multi line messages
adding ellipsis on file names to public file list as well
[tx-robot] updated from transifex
Fixed share upgrade cleanup tests to use the correct ids
Remove unused setUserVars utility method

That method was moved to the external storage recently so
isn't needed here any more.
idn_to_ascii is only used if available
Pretty print mount.json when possible
Fix merging of external storage configurations

Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
fix undefined index warning in router
Merge pull request #7885 from owncloud/extstorage-prettyprintjson

Pretty print mount.json when possible
merge master into webdav-injection
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig

Fix merging of external storage configurations
SMB/CIFS mount using OwnCloud logon credentials

Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.

Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
Use loginname instead of display name

getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.