Arthur Schiwon
d343c66f85
LDAP: fix TLS detection
2013-12-13 17:52:19 +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
Bjoern Schiessle
f3e341edac
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-06 14:42:09 +01:00
Bjoern Schiessle
c5d6af3c5a
get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user
2013-12-06 14:41:59 +01:00
Bjoern Schiessle
cc1577054d
it is not possible to unshare files
2013-12-06 12:36:31 +01:00
Björn Schießle
3e6b18b2d0
Merge pull request #6208 from owncloud/enc_only_create_new_key_if_no_other_key_exists
...
[Encryption] Only create new key if no other key exists
2013-12-06 03:07:52 -08:00
Nico Kaiser
7eb505e6dd
Fix user's displayName being overwritten by (old) cookie
2013-12-05 20:56:41 +01:00
Bjoern Schiessle
91ca1cf985
fix typo
2013-12-05 20:02:41 +01:00
Bjoern Schiessle
f8a4bcdd50
only create new key on password change if a recovery key exists or if the user don't have any private/public keys
2013-12-05 19:41:01 +01:00
Bjoern Schiessle
418d401bf9
show change password form if key couldn't be decrypted
2013-12-05 18:50:52 +01:00
Bjoern Schiessle
d0afd774b7
add method to check if users private/public key exists
2013-12-05 18:49:55 +01:00
Morris Jobke
0af65cae37
fix appearance of error message - .errors is outdated
2013-12-05 16:11:52 +01:00
Frank Karlitschek
4d50fe5f12
ownCloud 6 RC3
2013-12-05 12:02:53 +01:00
Vincent Petry
f24aca61a9
Merge pull request #6180 from owncloud/fix_6143
...
fixes checkboxes in Advanced Tab don't save unchecked state anymore, #6143
2013-12-04 08:33:12 -08:00
