Commit Graph

24438 Commits

Author SHA1 Message Date
Thomas Müller 967e882757 return size from cache in case the cache entry is marked as encrypted 2015-04-14 13:08:59 +02:00
Robin Appelman 0f21303b75 a bit more phpdoc 2015-04-14 12:35:53 +02:00
Thomas Müller 387984a0d5 preserve filesize on rename after upload 2015-04-14 12:27:12 +02:00
Thomas Müller f816acde27 fix reading of private key 2015-04-14 12:23:25 +02:00
Thomas Müller 88cc52c408 Avoid php message "Invalid argument supplied for foreach()" - refs #15590 2015-04-14 11:00:20 +02:00
Thomas Müller ffa115b517 Merge pull request #15566 from owncloud/fix-filepicker
fix filepicker
2015-04-14 00:39:12 +02:00
Lukas Reschke e36c0a0c12 Merge pull request #15585 from owncloud/fix-user-list
Fix user list
2015-04-13 23:30:37 +02:00
Morris Jobke 5f66f867b6 Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 21:51:38 +02:00
Morris Jobke 9eff199a17 Merge pull request #15360 from owncloud/cross-storage-move-cache
Preserve cache data when doing a cross storage move
2015-04-13 21:48:30 +02:00
Morris Jobke 74732cc0d8 Fix user list
* the name cell was changed from td to th because of accessibility
  issues - this adjusts the CSS and JS to behave like before
2015-04-13 21:43:36 +02:00
Robin Appelman f605c98531 Fix cross storage move with shared storages 2015-04-13 17:10:05 +02:00
Robin Appelman 01da6be4d6 upda tests 2015-04-13 17:10:02 +02:00
Robin Appelman addfafd9da Fix moving mount points 2015-04-13 17:10:02 +02:00
Robin Appelman 8688660825 check that we know the parent 2015-04-13 17:10:02 +02:00
Robin Appelman 6b5daca7b7 check for source cache 2015-04-13 17:10:02 +02:00
Robin Appelman caadc8cdd9 reuse cache move logic 2015-04-13 17:10:01 +02:00
Robin Appelman d7b3a1a35a preserve cache data when doing a cross storage move 2015-04-13 17:10:01 +02:00
Joas Schilling 71de1d58cd Fix namespace duplication and other issues in repairlegacystorages 2015-04-13 16:34:10 +02:00
Thomas Müller 660aa7ff1e Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
cach user folder for file search results
2015-04-13 15:16:07 +02:00
Robin Appelman c29419e6d7 fix rebase issue 2015-04-13 15:13:03 +02:00
Robin Appelman d4c91dc835 add missing return for shared 2015-04-13 15:13:03 +02:00
Robin Appelman 0772e3b4c1 Properly handle copy/move failures in cross storage copy/move 2015-04-13 15:13:03 +02:00
Robin Appelman 404773940d Detect storage full when doing cross storage copy/move 2015-04-13 15:13:03 +02:00
Robin Appelman d26c6cab90 properly return false if we cant delete the source file 2015-04-13 15:13:03 +02:00
Robin Appelman c4ec8fbeff Make getSourcePath accessible for storage wrappers 2015-04-13 15:13:03 +02:00
Robin Appelman d16ee4138d Fix test 2015-04-13 15:13:03 +02:00
Robin Appelman d726db7459 Implement move/copyFromStorage for shared storage 2015-04-13 15:13:03 +02:00
Robin Appelman 31e94708f8 Improve cross storage copy between local storages 2015-04-13 15:13:02 +02:00
Robin Appelman 8575bb2cb9 Move cross storage copy logic to the storage 2015-04-13 15:13:02 +02:00
Robin Appelman b302592a64 Small cleanup of rename code 2015-04-13 15:11:03 +02:00
Robin Appelman 2fd44dbde4 rewind and update error message 2015-04-13 14:14:48 +02:00
Robin Appelman dcfe014103 use our own stream copy instead 2015-04-13 14:13:21 +02:00
Morris Jobke a88e013f72 Merge pull request #15570 from owncloud/shares-properlyformatmountpoint
Properly add trailing slash to mount point
2015-04-13 13:16:07 +02:00
Vincent Petry b67301ef99 Merge pull request #15564 from rullzer/fix_13709
Do not try to make user subadmin of group twice
2015-04-13 12:46:43 +02:00
Vincent Petry 2822d0579e Properly add trailing slash to mount point
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
Roeland Jago Douma b21dc35355 Do not try to make user subadmin of group twice
If the provisioning api is used to make a user subadmin of a group that user
is already a subadmin just return success.

Added unit test to ensure things keep working.
2015-04-13 11:42:56 +02:00
Jörn Friedrich Dreyer b717681e3a cach user folder for file search results 2015-04-13 11:29:10 +02:00
Morris Jobke 59efcb63a3 fix filepicker
* add ability to filter for mimetype
* fixes #15526
* fixes #11563
2015-04-13 10:38:08 +02:00
Morris Jobke c3fbc2b6fd Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
Joas Schilling 0a72e66e9f Merge pull request #15562 from owncloud/fix-15560
Properly import used classes
2015-04-13 10:07:01 +02:00
Thomas Müller 906b6b7337 Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282" 2015-04-13 09:43:45 +02:00
Thomas Müller 8450b6aa2d Properly import used classes 2015-04-13 09:26:30 +02:00
Morris Jobke 75adee1ebd Merge pull request #15555 from rullzer/fix_15494
Initial fix for #15494
2015-04-12 23:00:32 +02:00
Lukas Reschke 84041a4fa2 Merge pull request #15541 from owncloud/add-reply-to-support
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
Roeland Jago Douma 2b8fc774d0 Initial fix for #15494 2015-04-12 16:29:05 +02:00
Morris Jobke 907719200f Merge pull request #15545 from owncloud/fix-fonts
fix wrong typeface being used for some buttons
2015-04-12 10:03:54 +02:00
Jan-Christoph Borchardt 573c57402f fix wrong typeface being used for some buttons 2015-04-11 13:29:55 +02:00
Morris Jobke 7ce4d2dec9 Merge pull request #15535 from owncloud/smb-1.0.0
update icewind/smb to 1.0.0
2015-04-10 23:43:55 +02:00
Robin McCorkell 2e88f8af43 Merge pull request #15536 from owncloud/fix-mysql-autotest
[autotest.sh] use the DATABASEHOST for the mysql DB drop
2015-04-10 21:56:27 +01:00
Lukas Reschke e3ad99d252 Add "Reply-To" support to sharing mails and refactor code 2015-04-10 17:30:07 +02:00