Joas Schilling
30d165ebf2
Add missing import for the exception
2015-05-18 15:45:47 +02:00
Joas Schilling
4444db61b7
Add a unit test for the decrypt method
2015-05-18 15:45:11 +02:00
Bjoern Schiessle
7676166254
add l10n to constructor
2015-05-18 15:43:53 +02:00
Vincent Petry
86cf8e1f68
Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
...
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle
7d492fefae
also encrypt files in trash bin
2015-05-18 12:51:47 +02:00
Bjoern Schiessle
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
Jenkins for ownCloud
73a3086945
[tx-robot] updated from transifex
2015-05-18 01:54:58 -04:00
Jenkins for ownCloud
744a9f2c78
[tx-robot] updated from transifex
2015-05-16 01:54:47 -04:00
Thomas Müller
937306b416
Merge pull request #16323 from owncloud/enc_webdav_fixes
...
some encryption fixes
2015-05-15 10:38:22 +02:00
Jenkins for ownCloud
49c4ee98b4
[tx-robot] updated from transifex
2015-05-15 01:54:49 -04:00
Jenkins for ownCloud
1596a1fd32
[tx-robot] updated from transifex
2015-05-14 01:54:47 -04:00
Bjoern Schiessle
ccbefb6e75
delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories
2015-05-13 19:06:23 +02:00
Jenkins for ownCloud
504586aec6
[tx-robot] updated from transifex
2015-05-13 01:55:14 -04:00
Jenkins for ownCloud
deeeca69fe
[tx-robot] updated from transifex
2015-05-12 01:55:10 -04:00
Morris Jobke
f057efc42e
Merge pull request #16213 from cmeh/patch-5
...
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud
a331f6b83e
[tx-robot] updated from transifex
2015-05-11 01:54:43 -04:00
Jenkins for ownCloud
52fc45e6e3
[tx-robot] updated from transifex
2015-05-10 01:56:13 -04:00
Christian Hoffmann
6441721626
Grammar, removal of line break
...
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
Jenkins for ownCloud
6f5854a8de
[tx-robot] updated from transifex
2015-05-09 01:55:35 -04:00
Bjoern Schiessle
4a450c9d0d
improved admin settings
2015-05-08 11:41:38 +02:00
Jenkins for ownCloud
ff0faacf0b
[tx-robot] updated from transifex
2015-05-08 01:54:52 -04:00
Morris Jobke
12b24ee567
Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
...
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +02:00
Jenkins for ownCloud
3dee907b70
[tx-robot] updated from transifex
2015-05-07 01:56:44 -04:00
Jenkins for ownCloud
910146824e
[tx-robot] updated from transifex
2015-05-06 01:55:19 -04:00
Björn Schießle
2ce01ee0bf
Merge pull request #15938 from owncloud/enc_update_recovery_share_key
...
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
Jenkins for ownCloud
b60dcd91bb
[tx-robot] updated from transifex
2015-05-05 01:55:36 -04:00
Björn Schießle
ed16127a8d
Merge pull request #16026 from owncloud/enc_ux_improvements
...
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00
Joas Schilling
eadc2c330c
Display the module settings in the list of the encryption modules
2015-05-04 15:04:03 +02:00
Bjoern Schiessle
f76c055244
some small ux improvements
2015-05-04 11:55:06 +02:00
Thomas Müller
0f7b8dd338
Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
...
[enc2] fixing return values and adding tests
2015-05-04 11:44:15 +02:00
Thomas Müller
7376ea9b26
Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder
...
skip user if we don't have a public key
2015-05-04 09:57:19 +02:00
Jenkins for ownCloud
7fa308977b
[tx-robot] updated from transifex
2015-05-04 01:54:47 -04:00
Jenkins for ownCloud
aa0d439ed9
[tx-robot] updated from transifex
2015-05-02 01:54:49 -04:00
Joas Schilling
4a6808a0f4
Simplify the test
2015-04-30 12:04:02 +02:00
Bjoern Schiessle
4ef9df8750
skip user if we don't have a public key
2015-04-30 12:04:02 +02:00
Bjoern Schiessle
70a44621be
check recovery setting for the right user
2015-04-30 11:38:53 +02:00
Clark Tomlinson
4209757d61
Merge pull request #15919 from owncloud/enc_handle_empty_files
...
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 -04:00
Björn Schießle
6ebb021359
Merge pull request #15911 from owncloud/enc_create_header_for_new_key
...
make sure that we create a header for the encrypted private key
2015-04-29 09:43:54 +02:00
Lukas Reschke
3e06fd9342
Merge pull request #15706 from owncloud/fix-15705-master
...
move creation of shared key to the login handler
2015-04-29 09:36:34 +02:00
Bjoern Schiessle
29bcfb2fdb
method shouldn't be static
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
d5cbb66b66
also create encryption keys for empty files
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
df428b76ac
skip update of encryption keys if file is not encrypted
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
7d05f387fb
make sure that we create a header for the encrypted private key
2015-04-28 13:00:09 +02:00
Bjoern Schiessle
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +02:00
Clark Tomlinson
8c0856779b
change error codes to 400
2015-04-24 09:42:02 -04:00
Vincent Petry
cc3bc6345b
Only get encryption status when logged in
...
This removes useless warnings in the logs.
2015-04-23 13:06:00 +02:00
Jenkins for ownCloud
f8f354b351
[tx-robot] updated from transifex
2015-04-23 01:54:51 -04:00
Clark Tomlinson
29168665cb
fix messages from settings crontroller
2015-04-22 13:26:06 -04:00
Clark Tomlinson
e3ec1a8bb8
remove status's and adjust js
2015-04-22 11:07:56 -04:00
Clark Tomlinson
1747117edf
destupify tests
2015-04-22 10:46:56 -04:00
