Bjoern Schiessle
8f5dfd0920
always show 'Deleted Files' breadcrumb
2013-12-17 11:01:43 +01:00
Vincent Petry
ae58a385b7
Do not use L10n when logging exceptions
...
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"
2013-12-17 10:56:02 +01:00
Bjoern Schiessle
3160b23291
update file cache for target file
2013-12-16 17:49:14 +01:00
Bjoern Schiessle
73a0b690e9
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 17:49:05 +01:00
Bjoern Schiessle
bdb4890d04
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 17:48:52 +01:00
Bjoern Schiessle
9091dd7833
enable more tests
2013-12-16 17:48:44 +01:00
Thomas Tanghus
a8a35f4d07
Use DEBUG instead of ERROR when favourites not found. Fix #6419
2013-12-16 17:31:03 +01:00
Frank Karlitschek
0d24b22485
6.0.0a
2013-12-14 20:40:17 +01:00
Frank Karlitschek
e8a696cff9
Merge pull request #6389 from owncloud/ignore_comments_on_columns
...
ignore comments on schema as a quickfix for oc6
2013-12-14 11:31:20 -08:00
Vincent Petry
811ef19ada
Removed comments in database schema of encryption app
2013-12-14 11:18:48 +01:00
Jörn Friedrich Dreyer
db696a2dda
ignore comments on schema as a quickfix for oc6
2013-12-13 19:21:14 +01:00
Vincent Petry
0b665700b5
Merge pull request #6406 from owncloud/stable6-no-backgroundjobs-during-upgrade
...
dont try to register background jobs if we haven't upgraded yet
2013-12-13 08:58:50 -08:00
Robin Appelman
0a0d89296b
dont try to register background jobs if we haven't upgraded yet
2013-12-13 17:13:18 +01:00
blizzz
fede36d515
Merge pull request #6308 from owncloud/fix_webdav_session_login_user_comparison
...
Fix webdav session login user comparison
2013-12-13 07:56:28 -08:00
Vincent Petry
527a16852e
Merge pull request #6367 from owncloud/fix_expiration_date_conversion
...
rely only on php DateTime to parse the db datetime string
2013-12-13 07:36:30 -08:00
blizzz
aab7c187f2
Merge pull request #6372 from owncloud/ldap_fix_setConfig
...
LDAP: fix method behind save button on advancend and expert tabs, fixes ...
2013-12-13 07:28:44 -08:00
Vincent Petry
dd7b074dfa
Fix webroot for update page
...
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.
Backport of df1a404
2013-12-13 14:36:35 +01:00
Robin Appelman
71e93c2b79
remove unneeded ; in comment
2013-12-13 13:52:39 +01:00
Robin Appelman
ca161e2a96
Add test for having utf8 filenames in the cache
2013-12-13 13:52:32 +01:00
Arthur Schiwon
ab8691d84b
adjust test
2013-12-13 12:56:06 +01:00
Thomas Müller
a48cf28e17
Merge pull request #6364 from owncloud/backport-6302-stable6
...
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-13 00:56:28 -08:00
Thomas Müller
cd7c974fb6
Updated 3rdparty ref
2013-12-13 00:03:20 +01:00
Arthur Schiwon
3b5d032dd5
LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng
2013-12-12 23:09:31 +01:00
Jörn Friedrich Dreyer
f8088ecd29
rely only on php DateTime to parse the db datetime string
2013-12-12 19:09:21 +01:00
Bjoern Schiessle
e83ff69465
toggle select all checkbox
2013-12-12 18:47:31 +01:00
Andreas Fischer
66af605697
Send "SET NAMES utf8" to MySQL for PHP below 5.3.6
2013-12-12 12:26:17 -05:00
Jörn Friedrich Dreyer
71dc81d420
update 3rdparty
2013-12-12 17:59:46 +01:00
blizzz
02c9bb76ff
Merge pull request #6350 from owncloud/ldap_dont_autofill
...
LDAP: the browser shall not autofill userdn and password, usually login ...
2013-12-12 05:14:44 -08:00
Arthur Schiwon
7b388eb4a8
LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283
2013-12-12 14:04:10 +01:00
Arthur Schiwon
c770089b50
coding style
2013-12-11 14:01:48 +01:00
Arthur Schiwon
afaac05f61
coding style
2013-12-11 13:57:02 +01:00
Arthur Schiwon
aba8199a82
On webdav sesssions, loginname was compared to username which does not need to match necessarily
2013-12-11 13:56:45 +01:00
Andreas Fischer
5ac339b866
Document memcached settings in config.sample.php
2013-12-09 14:35:20 +01:00
Morris Jobke
95c90ddbc4
fix wrong test data in l10n
2013-12-09 10:41:57 +01:00
Morris Jobke
2417c8a49e
fix plural translation - fixes #6226
2013-12-09 10:41:51 +01:00
Frank Karlitschek
26d0adf2fe
6.0.0
2013-12-06 21:20:22 +01:00
Frank Karlitschek
734fdbddea
RC4
2013-12-06 21:06:42 +01:00
Robin Appelman
33144941a9
add test case for removing background jobs that are throwing exceptions
2013-12-06 20:58:12 +01:00
Robin Appelman
f309920bef
Dont use exceptions for the backgroundjob test cases
2013-12-06 20:58:06 +01:00
Robin Appelman
e78a309111
remove background jobs if they are failing
2013-12-06 20:57:58 +01:00
Robin Appelman
46a4ad4f3c
Catch exceptions from background jobs and log them
2013-12-06 20:57:52 +01:00
Frank Karlitschek
3842c0d766
Merge pull request #6225 from owncloud/stable6-backgroundscan-reuse-etag
...
Stable6 backgroundscan reuse etag
2013-12-06 11:55:23 -08:00
Robin Appelman
8369c1f05b
get rid of failing test that don't cause additional downloads
2013-12-06 19:19:10 +01:00
Robin Appelman
cadf1c232e
extend test case for etag preservation
2013-12-06 19:19:10 +01:00
Robin Appelman
713651738c
reuse etags when doing a background scan
2013-12-06 19:19:10 +01:00
Bart Visscher
1475245465
XSendfile and encryption don't work together
...
The file on disk is encrypted, and not readable on client systems
2013-12-06 19:07:22 +01:00
Bart Visscher
281bbf4bd4
Don't try to encrypt a file when the temp file isn't created
2013-12-06 19:07:11 +01:00
Bart Visscher
a2bbbb1448
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 19:06:42 +01:00
root
87a28957aa
correctly propagate the return value of ldap_set_option
...
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
2013-12-06 18:01:42 +01:00
Bjoern Schiessle
01de6c565a
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 17:08:17 +01:00
