62bc0e5264
use password hash instead of the plain password to encrypt the private key
2015-08-07 15:21:08 +02:00
a594b41fb0
Fix namespace conflict in OC.Encryption JS code
2015-08-06 15:53:38 +02:00
4105d17133
Merge pull request #17989 from owncloud/enc_only_update_file_cache_once
...
only update database on the first run
2015-08-03 11:33:46 +02:00
2f4bebb045
only update database on the first run (first run = we have a version number from the old encryption app)
2015-07-31 10:47:02 +02:00
de01951da3
[tx-robot] updated from transifex
2015-07-31 01:56:30 -04:00
c683b1d3c9
[tx-robot] updated from transifex
2015-07-28 01:55:00 -04:00
296ed4c276
Merge pull request #17413 from owncloud/public-api-querybuilder
...
Add public api for Doctrine QueryBuilder and ExpressionBuilder
2015-07-22 17:29:08 +02:00
145ab3a28d
Merge pull request #17806 from owncloud/enc_improved_app_description
...
improved app description for the default encryption module
2015-07-22 15:06:08 +01:00
e97c1db728
improved app description and adjust it to the way the new encryption module works
2015-07-22 13:43:46 +02:00
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +02:00
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +02:00
570dd17d4f
fix mount point detection
2015-07-20 16:00:33 +02:00
4dba920fdd
unit tests
2015-07-17 15:19:10 +02:00
3000f0125f
don't move keys if the key where already moved in a previous migration run
2015-07-17 15:19:10 +02:00
d6f02eb703
Merge pull request #17500 from owncloud/encryption_migration_improvements
...
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +02:00
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
42eb18c747
Merge pull request #17473 from owncloud/enc_fix_migration
...
more secure way to update the database
2015-07-09 22:41:56 +02:00
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
1e284b15ff
only create new key pair if both keys are missing
2015-07-08 19:08:41 +02:00
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +02:00
876d7c160d
more secure way to update the database
2015-07-08 13:26:53 +02:00
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
183bd6dd49
[tx-robot] updated from transifex
2015-06-20 01:55:10 -04:00
ed3dc199ae
remove files_encryption from database at the end of the migration process
2015-06-19 14:15:56 +02:00
c4cb34da9d
[tx-robot] updated from transifex
2015-06-18 01:55:14 -04:00
3898b8c9b8
[tx-robot] updated from transifex
2015-06-17 01:55:34 -04:00
0a5d73b874
[tx-robot] updated from transifex
2015-06-16 01:55:41 -04:00
fe9b28a800
[tx-robot] updated from transifex
2015-06-14 01:54:49 -04:00
88d3c9ad40
[tx-robot] updated from transifex
2015-06-11 01:55:05 -04:00
4d88302b3a
[tx-robot] updated from transifex
2015-06-10 01:54:55 -04:00
d743d6d356
add hint to exception
2015-06-08 21:16:23 +02:00
2fb1b0864a
[tx-robot] updated from transifex
2015-06-08 01:55:01 -04:00
3542148761
[tx-robot] updated from transifex
2015-06-07 01:55:03 -04:00
e544d5b2c6
[tx-robot] updated from transifex
2015-06-05 01:55:04 -04:00
66a24ff479
[tx-robot] updated from transifex
2015-06-04 01:56:24 -04:00
d3e3a84cae
Move the helpful method to the TestCase class
2015-06-03 12:33:29 +02:00
410a836702
[tx-robot] updated from transifex
2015-06-03 01:55:29 -04:00
baca5c60c0
[tx-robot] updated from transifex
2015-06-02 01:56:23 -04:00
8d23b34402
[tx-robot] updated from transifex
2015-05-31 01:54:44 -04:00
a3bc112412
[tx-robot] updated from transifex
2015-05-30 01:55:46 -04:00
fff0fb66d6
[tx-robot] updated from transifex
2015-05-29 01:56:13 -04:00
68db3059ee
detect migration status
2015-05-27 21:00:02 +02:00
5549641f1f
improve error messages displayed to the user
2015-05-27 21:00:02 +02:00
06934e7c00
[tx-robot] updated from transifex
2015-05-24 01:55:03 -04:00
e189435499
[tx-robot] updated from transifex
2015-05-23 01:55:05 -04:00
42dd40ad80
[tx-robot] updated from transifex
2015-05-21 01:55:57 -04:00
c49a06a684
[tx-robot] updated from transifex
2015-05-20 01:56:19 -04:00
d90b83725f
Merge pull request #16085 from owncloud/encryption-module-rename
...
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
313994a33d
[tx-robot] updated from transifex
2015-05-19 01:55:35 -04:00
30d165ebf2
Add missing import for the exception
2015-05-18 15:45:47 +02:00
4444db61b7
Add a unit test for the decrypt method
2015-05-18 15:45:11 +02:00
7676166254
add l10n to constructor
2015-05-18 15:43:53 +02:00
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
7d492fefae
also encrypt files in trash bin
2015-05-18 12:51:47 +02:00
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
73a3086945
[tx-robot] updated from transifex
2015-05-18 01:54:58 -04:00
744a9f2c78
[tx-robot] updated from transifex
2015-05-16 01:54:47 -04:00
937306b416
Merge pull request #16323 from owncloud/enc_webdav_fixes
...
some encryption fixes
2015-05-15 10:38:22 +02:00
49c4ee98b4
[tx-robot] updated from transifex
2015-05-15 01:54:49 -04:00
1596a1fd32
[tx-robot] updated from transifex
2015-05-14 01:54:47 -04:00
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
504586aec6
[tx-robot] updated from transifex
2015-05-13 01:55:14 -04:00
deeeca69fe
[tx-robot] updated from transifex
2015-05-12 01:55:10 -04:00
f057efc42e
Merge pull request #16213 from cmeh/patch-5
...
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
a331f6b83e
[tx-robot] updated from transifex
2015-05-11 01:54:43 -04:00
52fc45e6e3
[tx-robot] updated from transifex
2015-05-10 01:56:13 -04:00
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
6f5854a8de
[tx-robot] updated from transifex
2015-05-09 01:55:35 -04:00
4a450c9d0d
improved admin settings
2015-05-08 11:41:38 +02:00
ff0faacf0b
[tx-robot] updated from transifex
2015-05-08 01:54:52 -04:00
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
3dee907b70
[tx-robot] updated from transifex
2015-05-07 01:56:44 -04:00
35292eb66c
rename to 'Default encryption module'
2015-05-06 15:31:05 +02:00
910146824e
[tx-robot] updated from transifex
2015-05-06 01:55:19 -04:00
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
b60dcd91bb
[tx-robot] updated from transifex
2015-05-05 01:55:36 -04:00
ed16127a8d
Merge pull request #16026 from owncloud/enc_ux_improvements
...
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00
eadc2c330c
Display the module settings in the list of the encryption modules
2015-05-04 15:04:03 +02:00
f76c055244
some small ux improvements
2015-05-04 11:55:06 +02:00
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
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
7fa308977b
[tx-robot] updated from transifex
2015-05-04 01:54:47 -04:00
aa0d439ed9
[tx-robot] updated from transifex
2015-05-02 01:54:49 -04:00
4a6808a0f4
Simplify the test
2015-04-30 12:04:02 +02:00
4ef9df8750
skip user if we don't have a public key
2015-04-30 12:04:02 +02:00
70a44621be
check recovery setting for the right user
2015-04-30 11:38:53 +02:00
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
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
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
29bcfb2fdb
method shouldn't be static
2015-04-28 20:21:53 +02:00
d5cbb66b66
also create encryption keys for empty files
2015-04-28 20:21:53 +02:00
df428b76ac
skip update of encryption keys if file is not encrypted
2015-04-28 20:21:53 +02:00
7d05f387fb
make sure that we create a header for the encrypted private key
2015-04-28 13:00:09 +02:00
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
8c0856779b
change error codes to 400
2015-04-24 09:42:02 -04:00
cc3bc6345b
Only get encryption status when logged in
...
This removes useless warnings in the logs.
2015-04-23 13:06:00 +02:00
Bjoern Schiessle
Vincent Petry
Björn Schießle
Jenkins for ownCloud
Morris Jobke
Robin McCorkell
Joas Schilling
Thomas Müller
Christian Hoffmann
Jan-Christoph Borchardt
Clark Tomlinson
Lukas Reschke