fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc1f73159f335646ca89be4db72b125e

set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop

add unit test to make sure the infinite loop never comes back

Conflicts:
	apps/user_ldap/tests/wizard.php

Escape error messages

Add support for getting the real client IP behind proxies

Make Entity properties ```protected``` as in docs

Entity properties are marked as ```protected``` to correctly reflect the
documentation.

See also owncloud/documentation@644f2eedac8e912c3019366b29ecdfbd9a15c5d9

Allow specifying the item source in unshareFromSelf().

Fixes https://github.com/owncloud/core/issues/10624

Fix copy paste fail

Add unittest for comma separated headers

Revert 3rdparty

Set email input field to type=email for better UX

add moment.js

Adding type to favicon

CRON call ends in null exception

Add a test to break the slugifyPath() with folder and file afterwards

Do not try to close the same resource multiple times

Remove no longer existing files from the cache when scanning external storage

Log unsuccessful temp file creation and return false

Only load personal external storages for allowed backends

Previously we used uniqid() here.
However this means that the behaviour is not reproducable, so
when uploading files into a "empty" folder, the folders name is
different.

If there would be a md5() hash collition, the deduplicate check
will spot this and append an index later, so this should not be
a problem.

Fix #6722

Warn user on resetting passwords via occ when encryption is enabled

explicit routes for files_external

Stream downloads from Swift object stores without downloading it first

Fix htaccess check error

Comment out mount_file config option

Format file

Removing calls to deprecated classes and using internal method to get via http

Missed a character

Fix inverted logic

Add a trusted domain wizard