Commit Graph

1234 Commits

Author SHA1 Message Date
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Bjoern Schiessle 5397101e1c improved unit tests 2014-07-04 17:37:35 +02:00
Bjoern Schiessle ddac446c5b always take unencrypted size 2014-07-04 16:44:50 +02:00
Bjoern Schiessle 673b0f5eb9 add owner as parameter for delShareKey 2014-07-04 12:19:59 +02:00
Bjoern Schiessle e9f5730869 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 10:34:54 +02:00
Jenkins for ownCloud 9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
Björn Schießle f3973c1c20 Merge pull request #9240 from owncloud/enc_check_if_file_exists
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
Bjoern Schiessle 618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Jenkins for ownCloud 589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Jenkins for ownCloud ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Morris Jobke d5462fdb50 Merge pull request #9265 from owncloud/fix-whitespace
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
Jenkins for ownCloud 26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Bjoern Schiessle 1004836fd3 unit tests 2014-06-27 23:09:31 +02:00
Bjoern Schiessle e4c45b5e26 check if file exists before deleting keys, and add debug output for every
delete operation
2014-06-27 23:09:31 +02:00
Bjoern Schiessle 706a8ace58 normalize path before comparison to make sure that we always find the mount point 2014-06-27 22:53:26 +02:00
Jan-Christoph Borchardt b7cb4f5a63 fix trailing whitespace noted by Scrutinizer 2014-06-27 18:25:56 +02:00
Jenkins for ownCloud 36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Björn Schießle aabee3e4b0 Merge pull request #9171 from owncloud/enc_always_use_oc_view
[encryption] always use oc view
2014-06-26 15:11:08 +02:00
Jenkins for ownCloud a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Bjoern Schiessle d3d1955ef4 fix unit tests 2014-06-25 12:38:26 +02:00
Jenkins for ownCloud b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Bjoern Schiessle 3d0805f27d always use a \OC\Files\View 2014-06-25 12:27:30 +02:00
Bjoern Schiessle 709691548d always use oc filesystem for rename operation 2014-06-25 12:27:30 +02:00
Bjoern Schiessle 9c45a3196b add unit tests 2014-06-24 10:43:07 +02:00
Bjoern Schiessle 6b85fe819c always use '/' as directory seperator 2014-06-24 09:29:11 +02:00
Jenkins for ownCloud 6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04:00
Jenkins for ownCloud b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Jenkins for ownCloud 2b4c2a7b14 [tx-robot] updated from transifex 2014-06-22 01:54:36 -04:00
Jenkins for ownCloud e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Morris Jobke 1973fdb11d Merge pull request #9093 from owncloud/remove_unused_code
remove unused code
2014-06-19 01:17:36 +02:00
Björn Schießle edbc6b5db1 Merge pull request #9068 from owncloud/trashbin_unittests_master
fix trash bin expire operation and add unit tests
2014-06-18 15:32:16 +02:00
Bjoern Schiessle bcc88be4c7 adjust encryption tests to the trash bin changes 2014-06-18 14:41:16 +02:00
Bjoern Schiessle e20bb71a42 remove unused code 2014-06-18 13:26:42 +02:00
Bjoern Schiessle a921ad8925 fix rename of encryption keys 2014-06-18 12:19:33 +02:00
Jenkins for ownCloud baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
icewind1991 8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing
Add server<->server sharing
2014-06-17 17:40:05 +02:00
Robin Appelman 07fdeba50b Fix moving movablemount over webdav 2014-06-17 14:10:11 +02:00
Jenkins for ownCloud ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Jenkins for ownCloud ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Jenkins for ownCloud 4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Robin Appelman 790d51ea1e Fix checking for external share in encryption 2014-06-14 10:14:07 +02:00
Bjoern Schiessle 277f25222a if file doesn't exist, check parent folder 2014-06-14 10:14:07 +02:00
Bjoern Schiessle c580aeb455 exclude mounted server-to-server shares from encryption 2014-06-14 10:14:07 +02:00
Bjoern Schiessle 961317d911 make sure to enable incognito mode when mounting a public link and update init status of the encryption app 2014-06-14 10:14:07 +02:00
Jenkins for ownCloud 4a26219ecf [tx-robot] updated from transifex 2014-06-14 01:55:24 -04:00
Volkan Gezer cea2c77fd2 fix some minor issues 2014-06-13 00:16:36 +02:00
Jenkins for ownCloud 55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Bjoern Schiessle 4cef7f9d4b disable failing tests 2014-06-11 17:21:57 +02:00
Jenkins for ownCloud f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Jenkins for ownCloud 6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Jenkins for ownCloud 1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Jenkins for ownCloud e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Bjoern Schiessle cf5eb0fef5 remove unused variable 2014-06-06 09:56:00 +02:00
Bjoern Schiessle 329bfd81c3 remove encryption keys if user unshares a file 2014-06-06 09:55:59 +02:00
Jenkins for ownCloud ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Thomas Müller e9011a8c55 adding unit tests for encryption data migration 2014-06-05 16:54:04 +02:00
Bjoern Schiessle eb29b2984c use oc_preferences instead of oc_encryption to store encyption settings 2014-06-05 16:54:04 +02:00
Jenkins for ownCloud cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Thomas Müller 76e04027bc Upgrade SabreDAV to 1.8.10
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
Thomas Müller 4ab77f90d2 Merge pull request #8662 from owncloud/f-lock
f-lock
2014-06-04 10:26:02 +02:00
Thomas Müller 917f389747 workaround to get the unit test going 2014-06-04 08:21:28 +02:00
Jenkins for ownCloud f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Bjoern Schiessle 2c8288d8f9 get the storage from the view 2014-06-04 07:55:46 +02:00
Bjoern Schiessle 3a698bce6e don't ask for fileInfo if we already have one 2014-06-04 07:55:45 +02:00
Bjoern Schiessle e6712bc12e make sure to close the stream at the end of each test 2014-06-04 07:55:45 +02:00
Thomas Müller d3e830e938 Merge pull request #8729 from owncloud/add-phpseclib-master
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
Thomas Müller 17cbfc714a use phpseclib from 3rdparty
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
Morris Jobke 390d8e53b4 Merge pull request #8676 from owncloud/encryption_improvements
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
Bjoern Schiessle b16b17f920 ceanup encryption code, improved return codes 2014-06-02 13:15:11 +02:00
Jenkins for ownCloud 36b0c599f5 [tx-robot] updated from transifex 2014-06-01 01:55:19 -04:00
Jenkins for ownCloud cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Jenkins for ownCloud 929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Robin McCorkell 32a50563d3 Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
get mount point from mount manager
2014-05-29 17:52:28 +01:00
Jenkins for ownCloud 368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Bjoern Schiessle 9ed5083efd get mount point from mount manager 2014-05-28 17:28:31 +02:00
Jenkins for ownCloud 80641cae72 [tx-robot] updated from transifex 2014-05-28 01:56:09 -04:00
Thomas Müller 4e2cdb2f8a Merge pull request #8713 from owncloud/typo-files-encr
fix grammar
2014-05-27 23:03:32 +02:00
Vincent Petry c64e920b4d Adjust core apps to use "requiremin" instead of "require"
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Volkan Gezer 59125cb796 fix grammar 2014-05-25 20:42:52 +02:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Vincent Petry 9b23a210c9 Merge pull request #8637 from owncloud/enc_improved_error_handling
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
Morris Jobke dc36d30953 Remove all occurences of @brief and @returns from PHPDoc
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
Bjoern Schiessle d9f715bdad only start migration if the encryption was initialized; allow to overwrite keys if no files exists 2014-05-19 15:53:50 +02:00
Robin McCorkell e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Robin McCorkell 6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Jenkins for ownCloud 43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Jenkins for ownCloud d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Jenkins for ownCloud c9df98abae [tx-robot] updated from transifex 2014-05-14 01:55:31 -04:00
Thomas Müller 58857b8df5 @returns -> @return 2014-05-13 19:09:15 +01:00
Björn Schießle b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Bjoern Schiessle a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +02:00
Thomas Müller e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Thomas Müller 4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
Bjoern Schiessle 57b671ebec only update the values which really changed 2014-04-30 12:48:16 +02:00
Bjoern Schiessle 73a2d87ab4 fix shouldEncrypt() method and improved decryptAll() unit tests 2014-04-28 14:49:19 +02:00
Robin Appelman 6c20a014ea merge master into webdav-injection 2014-04-25 11:47:06 +02:00
Jenkins for ownCloud 3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00