* owncloud/master: (30 commits)
Added entry with ext storage info
[tx-robot] updated from transifex
[tx-robot] updated from transifex
clarifying license
remove unused method tail()
reliable detect encrypted files
[tx-robot] updated from transifex
remove duplicated code
add missing quotes + field declarations
Do not use xcache variable cache if cache size is 0.
always show home breadcrumb in files view
Use DEBUG instead of ERROR when favourites not found. Fix#6419
update file cache for target file
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
Fixed JS plural function to be per app
call set password hook because it doesn't get triggered during test execution and fix paths
Do not use L10n when logging exceptions
Also add default to the \OCP\IConfig interface
add default parameter for AllConfig->get*Value()
always show 'Deleted Files' breadcrumb
...
Conflicts:
lib/private/memcache/xcache.php
In some specific situations, the L10N bundle isn't loadable yet (for
example when there is an issue with the app_config table). In such case,
we still want to be able to log the real exception.
This fixes errors that say "OC_L10N_String::__toString must not throw
exceptions"
* owncloud/master: (1989 commits)
[tx-robot] updated from transifex
dont try to register background jobs if we haven't upgraded yet
adjust test
coding style
coding style
On webdav sesssions, loginname was compared to username which does not need to match necessarily
rely only on php DateTime to parse the db datetime string
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
Fix webroot for update page
Update 3rdparty ref
update 3rdparty
toggle select all checkbox
remove unneeded ; in comment
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes#6283
Add test for having utf8 filenames in the cache
fix fallback overwriting result of getHome
[tx-robot] updated from transifex
fix smbclient directory listing parser
cache the home folder of a User
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
...
Conflicts:
lib/util.php
On the update page, config.js was missing which caused oc_webroot to not
be available. That would trigger the faulty oc_webroot fallback that
didn't take URLs like "/owncloud/index.php/files/apps" into account.
This fix adds config.js in the update page and also a fix for the
oc_webroot fallback, in case it is used elsewhere.
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
OC_L10N_String values
Thomas Müller
icewind1991
Vincent Petry
Frank Karlitschek
Andreas Fischer
Robin Appelman
Oliver Gasser
Thomas Tanghus
Arthur Schiwon
Jörn Friedrich Dreyer
Morris Jobke