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
Jens-Christian Fischer
9c95315a9e
clarify the duplication of the $params array
2015-04-12 14:49:18 +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
Jens-Christian Fischer
22c6216f5c
don't update identical values
...
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.
This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +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
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
Clark Tomlinson
294f14a793
Merge pull request #15538 from owncloud/encryption-crypt-tests
...
add unit test for crypt.php
2015-04-10 10:24:01 -04: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
Morris Jobke
20a1a110de
Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2
...
Fix master unit test: Clear leftover shares from other tests
2015-04-10 15:42:16 +02:00
Bjoern Schiessle
d1fa3c6b32
add unit test for crypt.php
2015-04-10 15:12:57 +02:00
Lukas Reschke
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
Robin Appelman
a41fbf7a92
update icewind/smb to 1.0.0
2015-04-10 14:59:16 +02:00
Vincent Petry
4a225aa12c
Clear leftover shares from other tests
2015-04-10 14:53:17 +02:00
Morris Jobke
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
Morris Jobke
c72ea81137
[autotest.sh] use the DATABASEHOST for the mysql DB drop
2015-04-10 14:46:08 +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
Morris Jobke
75312f96d4
Merge pull request #15530 from owncloud/davclient-catchmoreexceptions
...
Catch more exceptions in DAV client
2015-04-10 14:17:42 +02:00
Vincent Petry
b51b5b64e6
Fix converting Guzzle error codes in s2s storage
2015-04-10 12:12:05 +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
Thomas Müller
79ef54fe00
Merge pull request #15528 from owncloud/share-loading
...
fix share input loading spinner, fix #15522
2015-04-10 11:45:24 +02:00
Jan-Christoph Borchardt
9c76bcd479
fix share input loading spinner, fix #15522
2015-04-10 11:32:02 +02:00