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
Bjoern Schiessle
d3e2226b38
config switch to disable auto expire for the trash bin
2013-12-04 16:55:07 +01:00
Arthur Schiwon
73fa6259be
LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page
2013-12-04 14:01:31 +01:00
Morris Jobke
dffc2a8b1c
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
...
This reverts commit efbf18652c
2013-12-04 13:26:59 +01:00
Vincent Petry
fd634fdec8
Added unit test for the test() method
...
This is to make sure that method isn't broken
2013-12-04 13:22:25 +01:00
Arthur Schiwon
328ebaefde
LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143
2013-12-04 13:15:17 +01:00
Thomas Müller
4de8c4e5db
Merge pull request #6175 from owncloud/fix_6142
...
LDAP Wizard: make sure auto-detected suggestions are really applied initially, fixes #6142
2013-12-04 02:54:07 -08:00
Frank Karlitschek
8dc3cb2ffb
lower required php version to 5.3.3
2013-12-04 10:51:12 +01:00
Arthur Schiwon
c67ece0f6b
LDAP Wizard: don't generate filter when not allowed
2013-12-03 20:50:46 +01:00
Arthur Schiwon
6640e120b7
some equals are more equal than other equals
2013-12-03 20:45:05 +01:00
Thomas Mueller
6f7b394d99
fixing PHPDoc and spelling
2013-12-03 17:49:37 +01:00
Andreas Fischer
91f47645b0
Use getLastError() everywhere.
2013-12-03 17:49:37 +01:00
Andreas Fischer
18903cc8f7
Add getLastError()
2013-12-03 17:49:37 +01:00
Andreas Fischer
7e467484a8
No function as oci_last_error. It's oci_error.
2013-12-03 17:49:37 +01:00
Andreas Fischer
21bf6abd41
There is no property such as dbusername. It's 'dbuser'.
2013-12-03 17:49:37 +01:00
Andreas Fischer
401728b2a2
Correct property name. It's 'dbpassword', with the 'db' prefix.
2013-12-03 17:49:37 +01:00
Andreas Fischer
bfd0dc3314
Correct property name. It's just 'tableprefix', without the 'db' prefix.
2013-12-03 17:49:37 +01:00
Jan-Christoph Borchardt
ad92b12559
fix time input field properly, details
2013-12-03 17:42:03 +01:00
Morris Jobke
4391992b8c
fix public page - gallery view issues
2013-12-03 17:20:29 +01:00
Morris Jobke
728e6d735a
fix trashbin and pbulic page controls
2013-12-03 17:20:23 +01:00
Morris Jobke
66df8c3bb3
fix and cleanup CSS for public page
2013-12-03 17:20:17 +01:00
