Commit graph

6974 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jan-Christoph Borchardt
ca08d21da0 change different shades of grey for public share page to white 2013-12-03 17:20:08 +01:00
Jan-Christoph Borchardt
7d0f458f11 remove app specific code 2013-12-03 17:20:00 +01:00
Jan-Christoph Borchardt
f15aeb3bbc fix details for buttons in header and controls bar 2013-12-03 17:19:53 +01:00
Arthur Schiwon
4df0d2e7e8 LDAP Wizard: return correct var 2013-12-03 16:37:11 +01:00
Vincent Petry
f2e17a0b68 Fixed placeholder after page reload
The placeholder somehow had too many characters stripping from it...
2013-12-03 15:55:24 +01:00
Vincent Petry
e372971f2b Fixed test function for S3
Fixes #5752
2013-12-03 15:55:15 +01:00
Vincent Petry
3bf30377b8 Fixed Amazon S3 ext storage config UI
Optional parameters are now really optional

Fixes #5861
2013-12-03 15:55:08 +01:00
Arthur Schiwon
67b67b6d66 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-03 13:27:45 +01:00
Arthur Schiwon
b8390f15d4 LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly 2013-12-03 13:21:55 +01:00
Arthur Schiwon
02fe013d2f 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-03 12:11:43 +01:00
Bjoern Schiessle
5e5e4fe3a4 make it possible to select folders 2013-12-02 22:23:51 +01:00
Arthur Schiwon
d49e4e53fd 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-02 21:11:20 +01:00
Bjoern Schiessle
2d11290121 check explicitely all possible dir values 2013-12-02 16:06:51 +01:00
Bjoern Schiessle
1a197292da set delete all to true if a complete folder was deleted 2013-12-02 16:06:36 +01:00
Bjoern Schiessle
3b59979746 fix delete files from trash bin 2013-12-02 16:06:24 +01:00
Bjoern Schiessle
259d619af3 fix restore from files in sub-folders 2013-12-02 16:06:14 +01:00
Andreas Fischer
efbf18652c Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). 2013-11-29 20:34:57 +01:00
Vincent Petry
baa587fd3c Merge pull request #6123 from owncloud/extstorage-deletedirs2
Fixed FTP and SMB to use rmdir() when deleting folders
2013-11-29 11:23:02 -08:00
Jenkins for ownCloud
1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Vincent Petry
d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
2013-11-29 13:01:01 +01:00
Frank Karlitschek
0b698e6901 Merge pull request #6111 from owncloud/non-floating-trash-button-chrome
Fix resize issue for trash button in chrome and overflowing spinner in ....
2013-11-29 02:44:49 -08:00
Morris Jobke
41a1a32e5a Merge pull request #6099 from owncloud/fix_source_not_found_warnings
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Morris Jobke
0cbe9d79ba Merge pull request #6106 from owncloud/fix_preview_creation
Fix preview creation
2013-11-28 12:48:19 -08:00
Morris Jobke
587fc1aff3 Fix resize issue for trash button in chrome and overflowing spinner in .update class
fixes #6108
2013-11-28 21:36:43 +01:00
Bjoern Schiessle
b3724cd9c6 remove duplicate 2013-11-28 20:58:32 +01:00
Bjoern Schiessle
348706854c use better coding style 2013-11-28 19:31:35 +01:00
Bjoern Schiessle
bef5108218 detect mimetype from the original filename, without the versioning timestamp 2013-11-28 18:59:38 +01:00
Bjoern Schiessle
863aedf784 detect mimetype from the original filename, without the delete timestamp 2013-11-28 18:59:12 +01:00
ganomi
f723bf744a Merge pull request #6090 from ganomi/summaryfix
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
Morris Jobke
3a31f7eb4a Merge pull request #6097 from owncloud/extstorage-ftptrailingslash
Add trailing slash in FTP root path when missing
2013-11-28 04:52:08 -08:00