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
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
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
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
01da6be4d6
upda tests
2015-04-13 17:10:02 +02:00
d7b3a1a35a
preserve cache data when doing a cross storage move
2015-04-13 17:10:01 +02:00
71de1d58cd
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 16:34:10 +02:00
0772e3b4c1
Properly handle copy/move failures in cross storage copy/move
2015-04-13 15:13:03 +02:00
31e94708f8
Improve cross storage copy between local storages
2015-04-13 15:13:02 +02:00
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
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
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
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
a85bc5538f
fix filesystem and encryption tests
...
Conflicts:
apps/files_encryption/lib/util.php
apps/files_encryption/tests/hooks.php
2015-04-10 09:12:37 +02:00
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
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
06a5a9d0c2
Fix mock object to return proper type
2015-04-09 18:30:45 +02:00
11c3741526
Fix mock object to return proper type
2015-04-09 17:45:57 +02:00
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
332ea77865
only create a db entry for the user in case of a name conflict on group share
2015-04-09 11:16:08 +02:00
45575d0135
Check if the key exists, before trying to delete it
2015-04-09 10:28:02 +02:00
ba52f6f8fc
Merge pull request #15314 from owncloud/app-categories-15274
...
Add different trust levels to AppStore interface
2015-04-09 10:07:32 +02:00
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
f8cfc03f36
Replace originalStorage in tests with a proper teardown
...
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.
This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
6c327f8331
Merge pull request #14879 from oparoz/fix-preview-caching
...
Introducing the maximum size preview
2015-04-07 18:16:24 +02:00
1fbf5d86df
Merge pull request #14472 from owncloud/feature/wipencryptionapp
...
encryption 2.0 app
2015-04-07 16:46:45 +02:00
74bf9806b0
Introducing the maximum size preview
...
The first time we're asked to generate a preview we'll generate one of the maximum dimension indicated in the configuration and all future resizing requests will be done on that preview in order to not waste time converting the same file over and over.
One of the fixes required for #12465
2015-04-07 16:45:59 +02:00
2d2cb09715
fixing unit test - expected value change due to different size being stored in cache table
2015-04-07 14:30:01 +02:00
6cc3fd9270
Merge pull request #15426 from owncloud/issue/15420-remove-hardcoded-docs-link
...
Remove hardcoded link to performance docs
2015-04-07 13:47:35 +02:00
54a3bdf1c5
fixing unit test execution related to trashbin
2015-04-07 13:30:31 +02:00
268d346b36
fixing unit tests
2015-04-07 13:30:31 +02:00
fce42a3161
fixing unit test execution - test dummy module was behaving wrong
2015-04-07 13:30:31 +02:00
870c53ee37
fixing unit test execution
2015-04-07 13:30:31 +02:00
3d7404fe68
add unit tests to the keystorage
2015-04-07 13:30:31 +02:00
fe74a0cb4f
implement webdav copy
2015-04-07 13:30:31 +02:00
3e3226da4c
Properly set size and unencrypted size in the stream unit tests
2015-04-07 13:30:31 +02:00
b3c5ef3afe
Adding unit test for read and write of big file
2015-04-07 13:30:31 +02:00
104d11ec4c
Fixing encryption storage wrapper tests
2015-04-07 13:30:30 +02:00
e8e5bd61ae
fixing unit tests for encryption stream wrapper seek
2015-04-07 13:30:30 +02:00
8ffa6db110
fixing unit tests for stream wrapper
2015-04-07 13:30:30 +02:00
e0ab2c34ea
update unit tests after ctor signature change of \OC\Encryption\Util
2015-04-07 13:30:28 +02:00
1b42b492dc
kill OC_FileProxy 💥
2015-04-07 13:30:28 +02:00
dbdd754c3f
Further cleanup of files_encryption
2015-04-07 13:30:28 +02:00
00338f9dca
Removing files_encryption left overs
2015-04-07 13:30:28 +02:00
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
498625ea3a
adding unit tests for stream wrapper
2015-04-07 13:30:28 +02:00
a905f641b3
various fixes & start to unit test the encryption storage wrapper
2015-04-07 13:30:28 +02:00
4aa125cc0a
fix unit test execution
2015-04-07 13:30:28 +02:00
Björn Schießle
Morris Jobke
Thomas Müller
Robin Appelman
Joas Schilling
Vincent Petry
Lukas Reschke
Jörn Friedrich Dreyer
Bjoern Schiessle
Olivier Paroz