Thomas Müller
|
0385a62363
|
Merge pull request #19597 from owncloud/update-license-headers
update licence headers via script
|
2015-10-06 11:18:35 +02:00 |
Jenkins for ownCloud
|
3ff60cc2e3
|
[tx-robot] updated from transifex
|
2015-10-06 01:55:00 -04:00 |
Morris Jobke
|
b945d71384
|
update licence headers via script
|
2015-10-05 21:15:52 +02:00 |
Bjoern Schiessle
|
bf82015254
|
add some output to explain the pre-conditions for decrypt-all
|
2015-10-05 12:41:05 +02:00 |
|
Jenkins for ownCloud
|
e0084059b9
|
[tx-robot] updated from transifex
|
2015-10-03 01:56:20 -04:00 |
|
Jenkins for ownCloud
|
60f123193b
|
[tx-robot] updated from transifex
|
2015-09-28 05:07:18 -04:00 |
|
Bjoern Schiessle
|
90f1e3dc94
|
no need to list users if all users already had a key-pair
|
2015-09-24 12:47:46 +02:00 |
|
Bjoern Schiessle
|
daf5d1ff2e
|
fix small typo
|
2015-09-21 16:48:15 +02:00 |
|
Jenkins for ownCloud
|
7b483dfcbe
|
[tx-robot] updated from transifex
|
2015-09-21 01:54:41 -04:00 |
|
Thomas Müller
|
b59c42e5df
|
Merge pull request #18983 from owncloud/fix_18926
check for the right user if we can change his password
|
2015-09-18 11:59:57 +02:00 |
|
Bjoern Schiessle
|
9bd4f2d41e
|
occ script to disable encryption and to decrypt all files again
|
2015-09-15 22:39:44 +02:00 |
Lukas Reschke
|
7953cc9494
|
Function does return void
This function does return void and not a bool.
|
2015-09-15 14:02:10 +02:00 |
|
Bjoern Schiessle
|
7f459c64cb
|
check for the right user if we can change his password
|
2015-09-14 11:49:16 +02:00 |
|
Jenkins for ownCloud
|
211a243784
|
[tx-robot] updated from transifex
|
2015-09-14 01:55:35 -04:00 |
|
Jenkins for ownCloud
|
9860a79441
|
[tx-robot] updated from transifex
|
2015-09-12 01:55:35 -04:00 |
|
Jenkins for ownCloud
|
0ef7b84d77
|
[tx-robot] updated from transifex
|
2015-09-10 01:54:52 -04:00 |
|
Lukas Reschke
|
46a328a75a
|
Merge pull request #18873 from owncloud/enc_use_master_password
Allow admin to use a master key for all files
|
2015-09-09 17:05:53 +02:00 |
|
Bjoern Schiessle
|
b2e6d7b5f4
|
occ command to enable master key
|
2015-09-08 14:58:42 +02:00 |
|
Bjoern Schiessle
|
acfc7d7c4d
|
enable usage of a master key
|
2015-09-07 16:08:41 +02:00 |
|
Jenkins for ownCloud
|
3642fb701a
|
[tx-robot] updated from transifex
|
2015-09-06 01:54:56 -04:00 |
|
Jenkins for ownCloud
|
f3b8634058
|
[tx-robot] updated from transifex
|
2015-09-05 01:55:18 -04:00 |
|
Jenkins for ownCloud
|
4100b151cc
|
[tx-robot] updated from transifex
|
2015-09-04 01:55:31 -04:00 |
|
Jenkins for ownCloud
|
310084cc25
|
[tx-robot] updated from transifex
|
2015-09-01 14:03:19 -04:00 |
|
Jenkins for ownCloud
|
65784227d6
|
[tx-robot] updated from transifex
|
2015-08-31 01:54:45 -04:00 |
|
Bjoern Schiessle
|
166e57cf61
|
return false if private key is not valid
|
2015-08-30 15:31:19 +02:00 |
|
Bjoern Schiessle
|
f893de4136
|
use login name for password reset
|
2015-08-30 15:31:19 +02:00 |
|
Jenkins for ownCloud
|
114d1acd2c
|
[tx-robot] updated from transifex
|
2015-08-30 01:54:51 -04:00 |
|
Jenkins for ownCloud
|
64652b3000
|
[tx-robot] updated from transifex
|
2015-08-29 01:55:05 -04:00 |
Björn Schießle
|
6e210d960c
|
Merge pull request #18423 from owncloud/occ_encrypt_all
occ command line tool to encrypt all files
|
2015-08-28 20:44:55 +02:00 |
|
Bjoern Schiessle
|
8c08dd0ac2
|
occ tool to encrypt all files
|
2015-08-26 14:58:22 +02:00 |
|
Jenkins for ownCloud
|
2171cc02c3
|
[tx-robot] updated from transifex
|
2015-08-25 12:39:10 -04:00 |
|
Lukas Reschke
|
cca35f0c3e
|
Merge pull request #18121 from owncloud/enc_improve_privkey_encryption
use password hash to encrypt private key
|
2015-08-24 12:03:27 +02:00 |
Joas Schilling
|
e6eb74958f
|
Remove unnecessary DB prefixes from existing query builder usages
|
2015-08-10 16:21:41 +02:00 |
|
Bjoern Schiessle
|
854fd63ea9
|
use uid as additional information for salt
|
2015-08-07 15:51:43 +02:00 |
|
Bjoern Schiessle
|
62bc0e5264
|
use password hash instead of the plain password to encrypt the private key
|
2015-08-07 15:21:08 +02:00 |
Vincent Petry
|
a594b41fb0
|
Fix namespace conflict in OC.Encryption JS code
|
2015-08-06 15:53:38 +02:00 |
|
Björn Schießle
|
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 |
|
Bjoern Schiessle
|
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 |
|
Jenkins for ownCloud
|
de01951da3
|
[tx-robot] updated from transifex
|
2015-07-31 01:56:30 -04:00 |
|
Jenkins for ownCloud
|
c683b1d3c9
|
[tx-robot] updated from transifex
|
2015-07-28 01:55:00 -04:00 |
|
Morris Jobke
|
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 |
Robin McCorkell
|
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 |
|
Bjoern Schiessle
|
e97c1db728
|
improved app description and adjust it to the way the new encryption module works
|
2015-07-22 13:43:46 +02:00 |
|
Joas Schilling
|
f77e5f411d
|
Fix existing usages by removing the quotes
|
2015-07-21 15:25:47 +02:00 |
|
Joas Schilling
|
de348180ae
|
Use the public interface and our method instead of the doctrine thing
|
2015-07-21 15:25:47 +02:00 |
|
Bjoern Schiessle
|
570dd17d4f
|
fix mount point detection
|
2015-07-20 16:00:33 +02:00 |
|
Bjoern Schiessle
|
4dba920fdd
|
unit tests
|
2015-07-17 15:19:10 +02:00 |
|
Bjoern Schiessle
|
3000f0125f
|
don't move keys if the key where already moved in a previous migration run
|
2015-07-17 15:19:10 +02:00 |
|
Thomas Müller
|
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 |
|
Jenkins for ownCloud
|
176dabd976
|
[tx-robot] updated from transifex
|
2015-07-10 01:54:55 -04:00 |
|
Morris Jobke
|
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 |
|
Jenkins for ownCloud
|
6d9bb17360
|
[tx-robot] updated from transifex
|
2015-07-09 01:54:53 -04:00 |
|
Bjoern Schiessle
|
1e284b15ff
|
only create new key pair if both keys are missing
|
2015-07-08 19:08:41 +02:00 |
|
Bjoern Schiessle
|
85c3b9d5cf
|
only cleanUp the remaining keys if the migration really finished succesfully
|
2015-07-08 18:23:18 +02:00 |
|
Bjoern Schiessle
|
876d7c160d
|
more secure way to update the database
|
2015-07-08 13:26:53 +02:00 |
|
Jenkins for ownCloud
|
b8f5b2c47a
|
[tx-robot] updated from transifex
|
2015-07-03 01:54:57 -04:00 |
|
Jenkins for ownCloud
|
733d59ed44
|
[tx-robot] updated from transifex
|
2015-06-29 01:54:44 -04:00 |
|
Morris Jobke
|
f63915d0c8
|
update license headers and authors
|
2015-06-25 14:13:49 +02:00 |
|
Jenkins for ownCloud
|
dddbfb903f
|
[tx-robot] updated from transifex
|
2015-06-25 01:55:15 -04:00 |
|
Björn Schießle
|
cce841c665
|
Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
|
2015-06-23 14:30:21 +02:00 |
|
Jenkins for ownCloud
|
183bd6dd49
|
[tx-robot] updated from transifex
|
2015-06-20 01:55:10 -04:00 |
|
Bjoern Schiessle
|
ed3dc199ae
|
remove files_encryption from database at the end of the migration process
|
2015-06-19 14:15:56 +02:00 |
|
Jenkins for ownCloud
|
c4cb34da9d
|
[tx-robot] updated from transifex
|
2015-06-18 01:55:14 -04:00 |
|
Jenkins for ownCloud
|
3898b8c9b8
|
[tx-robot] updated from transifex
|
2015-06-17 01:55:34 -04:00 |
|
Jenkins for ownCloud
|
0a5d73b874
|
[tx-robot] updated from transifex
|
2015-06-16 01:55:41 -04:00 |
|
Jenkins for ownCloud
|
fe9b28a800
|
[tx-robot] updated from transifex
|
2015-06-14 01:54:49 -04:00 |
|
Jenkins for ownCloud
|
88d3c9ad40
|
[tx-robot] updated from transifex
|
2015-06-11 01:55:05 -04:00 |
|
Jenkins for ownCloud
|
4d88302b3a
|
[tx-robot] updated from transifex
|
2015-06-10 01:54:55 -04:00 |
|
Bjoern Schiessle
|
d743d6d356
|
add hint to exception
|
2015-06-08 21:16:23 +02:00 |
|
Jenkins for ownCloud
|
2fb1b0864a
|
[tx-robot] updated from transifex
|
2015-06-08 01:55:01 -04:00 |
|
Jenkins for ownCloud
|
3542148761
|
[tx-robot] updated from transifex
|
2015-06-07 01:55:03 -04:00 |
|
Jenkins for ownCloud
|
e544d5b2c6
|
[tx-robot] updated from transifex
|
2015-06-05 01:55:04 -04:00 |
|
Jenkins for ownCloud
|
66a24ff479
|
[tx-robot] updated from transifex
|
2015-06-04 01:56:24 -04:00 |
|
Joas Schilling
|
d3e3a84cae
|
Move the helpful method to the TestCase class
|
2015-06-03 12:33:29 +02:00 |
|
Jenkins for ownCloud
|
410a836702
|
[tx-robot] updated from transifex
|
2015-06-03 01:55:29 -04:00 |
|
Jenkins for ownCloud
|
baca5c60c0
|
[tx-robot] updated from transifex
|
2015-06-02 01:56:23 -04:00 |
|
Jenkins for ownCloud
|
8d23b34402
|
[tx-robot] updated from transifex
|
2015-05-31 01:54:44 -04:00 |
|
Jenkins for ownCloud
|
a3bc112412
|
[tx-robot] updated from transifex
|
2015-05-30 01:55:46 -04:00 |
|
Jenkins for ownCloud
|
fff0fb66d6
|
[tx-robot] updated from transifex
|
2015-05-29 01:56:13 -04:00 |
|
Bjoern Schiessle
|
68db3059ee
|
detect migration status
|
2015-05-27 21:00:02 +02:00 |
|
Bjoern Schiessle
|
5549641f1f
|
improve error messages displayed to the user
|
2015-05-27 21:00:02 +02:00 |
|
Jenkins for ownCloud
|
06934e7c00
|
[tx-robot] updated from transifex
|
2015-05-24 01:55:03 -04:00 |
|
Jenkins for ownCloud
|
e189435499
|
[tx-robot] updated from transifex
|
2015-05-23 01:55:05 -04:00 |
|
Jenkins for ownCloud
|
42dd40ad80
|
[tx-robot] updated from transifex
|
2015-05-21 01:55:57 -04:00 |
|
Jenkins for ownCloud
|
c49a06a684
|
[tx-robot] updated from transifex
|
2015-05-20 01:56:19 -04:00 |
|
Thomas Müller
|
d90b83725f
|
Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
|
2015-05-19 11:13:33 +02:00 |
|
Jenkins for ownCloud
|
313994a33d
|
[tx-robot] updated from transifex
|
2015-05-19 01:55:35 -04:00 |
|
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 |