9ff231590c
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 16:11:41 +01:00
6aa9daf4e6
Users of getFolderContent are mostly interested in the unecrypted file size
2013-12-06 15:51:49 +01:00
db0b291f63
Merge pull request #6213 from owncloud/fix-full-name-edit
...
Fix full name edit for repetitive edit
2013-12-06 06:46:34 -08:00
b18c8e5c53
Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
...
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
ae38ed51fe
Merge pull request #6211 from owncloud/fix-5865
...
Multiselect too slow patched
2013-12-06 04:59:24 -08:00
ac77218d57
parent().parent() -> closest()
2013-12-06 13:53:01 +01:00
cf9b7e343a
extend test case for etag preservation
2013-12-06 13:00:58 +01:00
e447d978d3
it is not possible to unshare files
2013-12-06 12:35:47 +01:00
9371944e43
fix typo
2013-12-06 12:20:42 +01:00
58c0117c3d
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-06 12:20:31 +01:00
8082ef2073
show change password form if key couldn't be decrypted
2013-12-06 12:20:22 +01:00
85467b973a
add method to check if users private/public key exists
2013-12-06 12:20:14 +01:00
54e47b4180
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 12:04:17 +01:00
4dd84b3627
[tx-robot] updated from transifex
2013-12-05 22:24:39 -05:00
008bfc6793
Fix full name edit for repetive edit
...
fixes #6212
fixes the data attributes after edit
fixes markup to successfully re-edit display name
2013-12-05 23:44:59 +01:00
1dc9998920
Remove reference to ownCloud.
2013-12-05 17:01:51 -05:00
853373348c
Slide duration set to 200ms for multiselect (same duration as user menu)
2013-12-05 15:46:13 -05:00
ec0aa6bb65
Revert "Merge pull request #6210 from owncloud/fix-5865"
...
This reverts commit f12363d90beba35d28cd
2013-12-05 21:03:17 +01:00
9c4bbf9ad7
Revert "Revert "Fix user's displayName being overwritten by (old) cookie""
...
This reverts commit eba35d28cd
2013-12-05 20:53:11 +01:00
f12363d90b
Merge pull request #6210 from owncloud/fix-5865
...
#5865 Multiselect animation is too slow patch
2013-12-05 11:19:06 -08:00
fd3aae6691
Changed duration of slideDown, slideUp and fadeOut to 200ms
2013-12-05 13:15:52 -05:00
e7748613ef
Link to enable-javascript.com
2013-12-05 12:06:20 -05:00
3f7aac1a79
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-05 17:29:15 +01:00
ace1d40ed6
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-05 17:25:01 +01:00
eba35d28cd
Revert "Fix user's displayName being overwritten by (old) cookie"
...
This reverts commit 2a7380cc21
2013-12-05 16:12:46 +01:00
1687ec0cd2
Make noscript message translatable
2013-12-05 09:52:13 -05:00
38745e4bd1
Move message up 10%
2013-12-05 09:48:20 -05:00
cec17fd3e2
Merge pull request #6199 from nicokaiser/fix-5306-master
...
Fix user's displayName being overwritten by (old) cookie. #3694
2013-12-05 06:32:20 -08:00
f2f44bd092
Merge pull request #6196 from owncloud/installation-error-css
...
fix appearance of error message - .errors is outdated
2013-12-05 06:25:48 -08:00
01ab15a2b0
reuse etags when doing a background scan
2013-12-05 15:23:34 +01:00
bdab0409c4
Add overlay noscript message to fix #6032
2013-12-05 09:19:46 -05:00
2a7380cc21
Fix user's displayName being overwritten by (old) cookie
2013-12-05 14:18:32 +01:00
2ff1bdaba3
add test case for removing background jobs that are throwing exceptions
2013-12-05 13:29:35 +01:00
1620015531
fix appearance of error message - .errors is outdated
2013-12-05 11:23:30 +01:00
125dff8997
master is ownCloud 7 pre alpha now
2013-12-05 10:35:19 +01:00
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
3480766a78
LDAP Wizard: don't generate filter when not allowed
2013-12-04 18:59:30 +01:00
60b1191c88
some equals are more equal than other equals
2013-12-04 18:59:12 +01:00
01af3bdb05
LDAP Wizard: return correct var
2013-12-04 18:58:52 +01:00
06577f1fe2
LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions.
2013-12-04 18:58:29 +01:00
cc725674e0
LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly
2013-12-04 18:58:09 +01:00
a10d1977b5
LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work
2013-12-04 18:57:54 +01:00
9808dee149
LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner
2013-12-04 18:57:32 +01:00
301d469813
Symfonys addCollection() with multiple arguments is deprecated, fix deprecation warning
2013-12-04 18:01:51 +01:00
430f85cc59
LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page
2013-12-04 17:57:47 +01:00
1c6568cf68
LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143
2013-12-04 17:57:40 +01:00
b919a65432
enable more tests
2013-12-04 17:43:38 +01:00
737b9a990f
Merge pull request #6181 from owncloud/auto_expire_trash
...
config switch to disable auto expire for the trash bin
2013-12-04 07:44:02 -08:00
3fa11bd426
Dont use exceptions for the backgroundjob test cases
2013-12-04 16:28:27 +01:00
6b7fdda4f5
config switch to disable auto expire for the trash bin
2013-12-04 16:11:40 +01:00
Bjoern Schiessle
Bart Visscher
Vincent Petry
Björn Schießle
Morris Jobke
Robin Appelman
root
Jenkins for ownCloud
ringmaster
unknown
pdessauw
Nico Kaiser
Frank Karlitschek
Arthur Schiwon