Thomas Müller
70480423ff
Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
...
Adding a final fallback for findBinaryPath
2015-04-15 00:16:56 +02:00
Thomas Müller
1aa368effe
Merge pull request #15592 from owncloud/fix-15590-master
...
Avoid php message "Invalid argument supplied for foreach()"
2015-04-15 00:14:08 +02:00
Björn Schießle
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
Morris Jobke
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
Olivier Paroz
bb0c09e994
Adding a final fallback for findBinaryPath
2015-04-14 14:06:58 +02:00
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
Thomas Müller
387984a0d5
preserve filesize on rename after upload
2015-04-14 12:27:12 +02:00
Thomas Müller
88cc52c408
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
2015-04-14 11:00:20 +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
Robin Appelman
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
Robin Appelman
addfafd9da
Fix moving mount points
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
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
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
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
Jörn Friedrich Dreyer
b717681e3a
cach user folder for file search results
2015-04-13 11:29:10 +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
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
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
Lukas Reschke
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
Lukas Reschke
77afef328d
Merge pull request #15458 from owncloud/web-shell-master
...
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
Vincent Petry
e512a69a59
Merge pull request #15395 from owncloud/fix-imagepath
...
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
Thomas Müller
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Lukas Reschke
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
Morris Jobke
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
Thomas Müller
a163243e31
Merge pull request #15510 from owncloud/cron-singleuser
...
block cron when in single user mode
2015-04-10 14:38:50 +02:00
Vincent Petry
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
Jörn Friedrich Dreyer
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
Jörn Friedrich Dreyer
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
Morris Jobke
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
Thomas Müller
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
Morris Jobke
de4a81f462
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
...
fixes #15326
2015-04-09 18:41:18 +02:00
Thomas Müller
f7c906902a
Throw an exception in case checkServer() returns errors
2015-04-09 16:42:34 +02:00
Lukas Reschke
b60d5d3d6f
Merge pull request #14540 from owncloud/windows-setup-check
...
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
Thomas Müller
890a18e1a6
Introduce own console application class
2015-04-09 16:28:53 +02:00
Robin Appelman
8af106cc75
block webdav in single user mode
2015-04-09 15:56:41 +02:00
Lukas Reschke
0abce86b31
Disallow Windows Server in Server Check
...
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
Jörn Friedrich Dreyer
8af52e3876
fixes #15326
2015-04-09 15:37:00 +02:00
Björn Schießle
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00