Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18983 from owncloud/fix_18926 | Thomas Müller | 2015-09-18 | 1 | -4/+61 |
|\ | | | | | check for the right user if we can change his password | ||||
| * | check for the right user if we can change his password | Bjoern Schiessle | 2015-09-14 | 1 | -4/+61 |
| | | |||||
* | | occ script to disable encryption and to decrypt all files again | Bjoern Schiessle | 2015-09-15 | 3 | -0/+258 |
|/ | |||||
* | occ command to enable master key | Bjoern Schiessle | 2015-09-08 | 1 | -0/+103 |
| | |||||
* | enable usage of a master key | Bjoern Schiessle | 2015-09-07 | 3 | -12/+161 |
| | |||||
* | return false if private key is not valid | Bjoern Schiessle | 2015-08-30 | 1 | -0/+15 |
| | |||||
* | use login name for password reset | Bjoern Schiessle | 2015-08-30 | 1 | -9/+23 |
| | |||||
* | Merge pull request #18423 from owncloud/occ_encrypt_all | Björn Schießle | 2015-08-28 | 2 | -0/+298 |
|\ | | | | | occ command line tool to encrypt all files | ||||
| * | occ tool to encrypt all files | Bjoern Schiessle | 2015-08-26 | 2 | -0/+298 |
| | | |||||
* | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryption | Lukas Reschke | 2015-08-24 | 5 | -9/+110 |
|\ \ | |/ |/| | use password hash to encrypt private key | ||||
| * | use password hash instead of the plain password to encrypt the private key | Bjoern Schiessle | 2015-08-07 | 5 | -9/+110 |
| | | |||||
* | | Remove unnecessary DB prefixes from existing query builder usages | Joas Schilling | 2015-08-10 | 1 | -17/+17 |
|/ | |||||
* | only update database on the first run (first run = we have a version number ↵ | Bjoern Schiessle | 2015-07-31 | 1 | -0/+3 |
| | | | | from the old encryption app) | ||||
* | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 1 | -37/+37 |
| | |||||
* | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 1 | -12/+12 |
| | |||||
* | fix mount point detection | Bjoern Schiessle | 2015-07-20 | 1 | -1/+76 |
| | |||||
* | unit tests | Bjoern Schiessle | 2015-07-17 | 1 | -2/+36 |
| | |||||
* | don't move keys if the key where already moved in a previous migration run | Bjoern Schiessle | 2015-07-17 | 1 | -4/+9 |
| | |||||
* | Merge pull request #17500 from owncloud/encryption_migration_improvements | Thomas Müller | 2015-07-16 | 1 | -3/+47 |
|\ | | | | | Only clean up if migration finished succesfully | ||||
| * | only create new key pair if both keys are missing | Bjoern Schiessle | 2015-07-08 | 1 | -3/+47 |
| | | |||||
* | | more secure way to update the database | Bjoern Schiessle | 2015-07-08 | 1 | -0/+58 |
|/ | |||||
* | update license headers and authors | Morris Jobke | 2015-06-25 | 11 | -16/+66 |
| | |||||
* | Move the helpful method to the TestCase class | Joas Schilling | 2015-06-03 | 6 | -22/+22 |
| | |||||
* | detect migration status | Bjoern Schiessle | 2015-05-27 | 1 | -0/+90 |
| | |||||
* | Add missing import for the exception | Joas Schilling | 2015-05-18 | 1 | -0/+1 |
| | |||||
* | Add a unit test for the decrypt method | Joas Schilling | 2015-05-18 | 1 | -1/+11 |
| | |||||
* | add l10n to constructor | Bjoern Schiessle | 2015-05-18 | 1 | -1/+8 |
| | |||||
* | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash | Vincent Petry | 2015-05-18 | 1 | -0/+25 |
|\ | | | | | also encrypt files in trash bin | ||||
| * | also encrypt files in trash bin | Bjoern Schiessle | 2015-05-18 | 1 | -0/+25 |
| | | |||||
* | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 1 | -7/+11 |
|/ | |||||
* | Merge pull request #15938 from owncloud/enc_update_recovery_share_key | Björn Schießle | 2015-05-05 | 3 | -3/+63 |
|\ | | | | | [encryption] check recovery key setting for the correct user | ||||
| * | check recovery setting for the right user | Bjoern Schiessle | 2015-04-30 | 3 | -3/+63 |
| | | |||||
* | | Merge pull request #15752 from owncloud/feature/fix-encryption-return-values | Thomas Müller | 2015-05-04 | 1 | -0/+179 |
|\ \ | | | | | | | [enc2] fixing return values and adding tests | ||||
| * | | change error codes to 400 | Clark Tomlinson | 2015-04-24 | 1 | -8/+8 |
| | | | |||||
| * | | destupify tests | Clark Tomlinson | 2015-04-22 | 1 | -80/+77 |
| | | | |||||
| * | | fixing return values and adding tests | Clark Tomlinson | 2015-04-22 | 1 | -0/+182 |
| | | | |||||
* | | | Simplify the test | Joas Schilling | 2015-04-30 | 2 | -12/+4 |
| | | | |||||
* | | | skip user if we don't have a public key | Bjoern Schiessle | 2015-04-30 | 1 | -0/+69 |
| |/ |/| | |||||
* | | Merge pull request #15919 from owncloud/enc_handle_empty_files | Clark Tomlinson | 2015-04-29 | 1 | -7/+66 |
|\ \ | | | | | | | Encryption improve handling of empty and unencrypted files | ||||
| * | | also create encryption keys for empty files | Bjoern Schiessle | 2015-04-28 | 1 | -8/+22 |
| | | | |||||
| * | | skip update of encryption keys if file is not encrypted | Bjoern Schiessle | 2015-04-28 | 1 | -2/+47 |
| | | | |||||
* | | | make sure that we create a header for the encrypted private key | Bjoern Schiessle | 2015-04-28 | 1 | -1/+12 |
|/ / | |||||
* / | fall back to the ownCloud default encryption module and aes128 if we read a ↵ | Bjoern Schiessle | 2015-04-27 | 1 | -0/+27 |
|/ | | | | encrypted file without a header | ||||
* | Merge pull request #15677 from owncloud/enc_reset_private_key_password | Thomas Müller | 2015-04-20 | 1 | -0/+222 |
|\ | | | | | [encryption] let user update the private key password | ||||
| * | Dont use the old .status way | Joas Schilling | 2015-04-20 | 1 | -3/+3 |
| | | |||||
| * | Fix several minor things | Joas Schilling | 2015-04-20 | 1 | -7/+8 |
| | | |||||
| * | let user update the private key password in case the login password was ↵ | Bjoern Schiessle | 2015-04-17 | 1 | -0/+221 |
| | | | | | | | | changed from outside | ||||
* | | fix change password if no user is logged in, occ call | Bjoern Schiessle | 2015-04-17 | 1 | -2/+31 |
|/ | |||||
* | decrypt private key for public shares correctly | Bjoern Schiessle | 2015-04-16 | 1 | -1/+1 |
| | |||||
* | add migration script from old encryption to new one | Bjoern Schiessle | 2015-04-16 | 1 | -0/+356 |
| |