wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15705 commits 157 branches 562 tags 714 MiB
Commit graph

15705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andreas Fischer
5db73c05fb Document memcached settings in config.sample.php 2013-12-09 01:20:10 +01:00
Andreas Fischer
a67c737848 Only run memcached tests if server is available. 2013-12-09 01:02:42 +01:00
Jenkins for ownCloud
079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Morris Jobke
823c85e65f Merge pull request #6202 from owncloud/fix_6032_alt 
Add overlay noscript message to fix #6032
 2013-12-07 08:04:29 -08:00
Morris Jobke
3444c15b86 fix IE8 transparent background 2013-12-07 17:03:53 +01:00
Morris Jobke
67957294c2 fix wrong test data in l10n 2013-12-07 13:29:14 +01:00
Morris Jobke
4c4c9096c4 fix plural translation - fixes #6226 2013-12-07 11:38:01 +01:00
blizzz
6a747106db Merge pull request #6150 from owncloud/backgroundjob-log-exception 
Remove background jobs that are giving errors
 2013-12-06 11:56:53 -08:00
Vincent Petry
123bc9921a Merge pull request #6201 from owncloud/backgroundscan-reuse-etag 
reuse etags when doing a background scan
 2013-12-06 10:13:14 -08:00
Björn Schießle
575a68074f Merge pull request #6220 from owncloud/debug_oracle_errors 
cherry-picks from #5884, just for debugging purpose
 2013-12-06 10:00:04 -08:00
Robin Appelman
9eca2471b3 Merge branch 'master' into backgroundscan-reuse-etag 2013-12-06 18:27:46 +01:00
Robin Appelman
e888bdda30 get rid of failing test that don't cause additional downloads 2013-12-06 18:26:38 +01:00
Bart Visscher
4c8bc61753 XSendfile and encryption don't work together 
The file on disk is encrypted, and not readable on client systems
 2013-12-06 17:59:59 +01:00
blizzz
b5939324b0 Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode 
correctly propagate the return value of ldap_set_option
 2013-12-06 08:54:29 -08:00
Björn Schießle
36c286f879 Merge pull request #6222 from owncloud/enc_reset_enc_file_size 
set unencrypted_size to 0 after decryption
 2013-12-06 08:06:22 -08:00
Bart Visscher
40f148cc6c Don't try to encrypt a file when the temp file isn't created 2013-12-06 17:01:13 +01:00
Bjoern Schiessle
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
Bart Visscher
6aa9daf4e6 Users of getFolderContent are mostly interested in the unecrypted file size 2013-12-06 15:51:49 +01:00
Vincent Petry
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
Björn Schießle
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
Morris Jobke
ae38ed51fe Merge pull request #6211 from owncloud/fix-5865 
Multiselect too slow patched
 2013-12-06 04:59:24 -08:00
Morris Jobke
ac77218d57 parent().parent() -> closest() 2013-12-06 13:53:01 +01:00
Robin Appelman
cf9b7e343a extend test case for etag preservation 2013-12-06 13:00:58 +01:00
Bjoern Schiessle
e447d978d3 it is not possible to unshare files 2013-12-06 12:35:47 +01:00
Bjoern Schiessle
9371944e43 fix typo 2013-12-06 12:20:42 +01:00
Bjoern Schiessle
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
Bjoern Schiessle
8082ef2073 show change password form if key couldn't be decrypted 2013-12-06 12:20:22 +01:00
Bjoern Schiessle
85467b973a add method to check if users private/public key exists 2013-12-06 12:20:14 +01:00
root
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
Jenkins for ownCloud
4dd84b3627 [tx-robot] updated from transifex 2013-12-05 22:24:39 -05:00
Morris Jobke
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
ringmaster
1dc9998920 Remove reference to ownCloud. 2013-12-05 17:01:51 -05:00
unknown
853373348c Slide duration set to 200ms for multiselect (same duration as user menu) 2013-12-05 15:46:13 -05:00
Morris Jobke
ec0aa6bb65 Revert "Merge pull request #6210 from owncloud/fix-5865" 
This reverts commit f12363d90b, reversing
changes made to eba35d28cd.
 2013-12-05 21:03:17 +01:00
Morris Jobke
9c4bbf9ad7 Revert "Revert "Fix user's displayName being overwritten by (old) cookie"" 
This reverts commit eba35d28cd.
 2013-12-05 20:53:11 +01:00
pdessauw
f12363d90b Merge pull request #6210 from owncloud/fix-5865 
#5865 Multiselect animation is too slow patch
 2013-12-05 11:19:06 -08:00
unknown
fd3aae6691 Changed duration of slideDown, slideUp and fadeOut to 200ms 2013-12-05 13:15:52 -05:00
ringmaster
e7748613ef Link to enable-javascript.com 2013-12-05 12:06:20 -05:00
Bjoern Schiessle
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
Bjoern Schiessle
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
Morris Jobke
eba35d28cd Revert "Fix user's displayName being overwritten by (old) cookie" 
This reverts commit 2a7380cc21.
 2013-12-05 16:12:46 +01:00
ringmaster
1687ec0cd2 Make noscript message translatable 2013-12-05 09:52:13 -05:00
ringmaster
38745e4bd1 Move message up 10% 2013-12-05 09:48:20 -05:00
Morris Jobke
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
Morris Jobke
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
Robin Appelman
01ab15a2b0 reuse etags when doing a background scan 2013-12-05 15:23:34 +01:00
ringmaster
bdab0409c4 Add overlay noscript message to fix #6032 2013-12-05 09:19:46 -05:00
Nico Kaiser
2a7380cc21 Fix user's displayName being overwritten by (old) cookie 2013-12-05 14:18:32 +01:00
Robin Appelman
2ff1bdaba3 add test case for removing background jobs that are throwing exceptions 2013-12-05 13:29:35 +01:00
Morris Jobke
1620015531 fix appearance of error message - .errors is outdated 2013-12-05 11:23:30 +01:00