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 |
|
Bjoern Schiessle
|
fb88aba8f4
|
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
|
2014-04-23 12:54:26 +02:00 |
|
Bjoern Schiessle
|
a86d97295e
|
fix encryption tests after the removal of the shared folder
|
2014-04-23 12:54:25 +02:00 |
|
Jenkins for ownCloud
|
3f453d1641
|
[tx-robot] updated from transifex
|
2014-04-23 01:56:35 -04:00 |
|
Robin Appelman
|
b42ce6c30a
|
Prevent error if previously cached data doesn't have an etag
|
2014-04-22 15:24:38 +02:00 |
|
Robin Appelman
|
c82adb8c5d
|
merge master into webdav-injection
|
2014-04-15 20:03:00 +02:00 |
|
Jenkins for ownCloud
|
2a2aabbdaf
|
[tx-robot] updated from transifex
|
2014-04-14 01:55:09 -04:00 |
Lukas Reschke
|
e704bc2bf0
|
Merge pull request #7807 from sarciszewski/patch-1
Update crypt.php
|
2014-04-11 19:19:02 +02:00 |
|
Jenkins for ownCloud
|
796f719548
|
[tx-robot] updated from transifex
|
2014-04-09 01:56:49 -04:00 |
|
Jenkins for ownCloud
|
a9d49de465
|
[tx-robot] updated from transifex
|
2014-04-06 01:56:11 -04:00 |
|
Jenkins for ownCloud
|
54783550e8
|
[tx-robot] updated from transifex
|
2014-04-03 01:56:12 -04:00 |
|
Vincent Petry
|
a6de5efbab
|
Merge pull request #7978 from owncloud/enc_cleanup
there is no need to re-calculate the shares after a touch
|
2014-04-02 18:23:33 +02:00 |
|
Morris Jobke
|
1782dcbb50
|
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
always encrypt files to owner
|
2014-04-02 13:20:51 +02:00 |
|
Jenkins for ownCloud
|
73dd5ff26c
|
[tx-robot] updated from transifex
|
2014-04-02 01:56:39 -04:00 |
Bart Visscher
|
630b5b648f
|
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
Correct the remembering of the trashbin app state in encryption test
|
2014-04-01 21:23:53 +02:00 |
|
Bart Visscher
|
f37a76c396
|
Remember before change works better
|
2014-04-01 19:46:46 +02:00 |
|
Björn Schießle
|
c45793033d
|
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
move check if a file should be encrypted to the pre hook
|
2014-04-01 13:56:46 +02:00 |
|
Vincent Petry
|
18acfa8bb3
|
Merge pull request #7915 from owncloud/replace-personalblock
Replace personalblock with .section
|
2014-04-01 11:20:16 +02:00 |
|
Jenkins for ownCloud
|
7a4a836abe
|
[tx-robot] updated from transifex
|
2014-04-01 01:56:15 -04:00 |
|
Bjoern Schiessle
|
c578ab68fe
|
there is no need to re-calculate the shares after a touch
|
2014-03-31 18:24:53 +02:00 |
|
Bjoern Schiessle
|
8e34812393
|
always encrypt files to owner
|
2014-03-31 18:19:48 +02:00 |
|
Bjoern Schiessle
|
aa867ad647
|
don't call getFileInfo() to avoid to open the same file twice
|
2014-03-31 15:29:16 +02:00 |
|
Bjoern Schiessle
|
8ebb1f15d3
|
move check if a file should be encrypted to the pre hook
|
2014-03-31 15:29:16 +02:00 |
Jan-Christoph Borchardt
|
2be2a5d2c5
|
external storage: fix merge conflict, indentation
|
2014-03-31 13:12:04 +02:00 |