Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "make jshint happy" | Thomas Müller | 2015-04-17 | 2 | -20/+17 |
| | | | | This reverts commit a255866a937d906dbbe0ed46aa7394326b30e4f5. | ||||
* | Revert "use a simple function - OC.Encryption is already defined - fixes #15707" | Thomas Müller | 2015-04-17 | 1 | -13/+23 |
| | | | | This reverts commit c1a60a23498abe6502d207b8c803255e31515577. | ||||
* | make jshint happy | Thomas Müller | 2015-04-17 | 2 | -17/+20 |
| | |||||
* | use a simple function - OC.Encryption is already defined - fixes #15707 | Thomas Müller | 2015-04-17 | 1 | -23/+13 |
| | |||||
* | Do not concat translation string | Thomas Müller | 2015-04-17 | 1 | -5/+4 |
| | |||||
* | fixing undefined variable | Thomas Müller | 2015-04-17 | 1 | -8/+8 |
| | |||||
* | Merge pull request #15686 from owncloud/enc_fix_change_password | Thomas Müller | 2015-04-17 | 2 | -5/+38 |
|\ | | | | | fix change password if no user is logged in, occ call | ||||
| * | fix change password if no user is logged in, occ call | Bjoern Schiessle | 2015-04-17 | 2 | -5/+38 |
| | | |||||
* | | always create a new instance of the encryption module | Bjoern Schiessle | 2015-04-17 | 2 | -8/+13 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-17 | 18 | -16/+22 |
| | |||||
* | Merge pull request #15675 from owncloud/enc_error_messages | Clark Tomlinson | 2015-04-16 | 6 | -10/+155 |
|\ | | | | | [encryption] display warning if password changed or if the keys are not initialized | ||||
| * | display warning if password changed or if the keys are not initialized | Bjoern Schiessle | 2015-04-16 | 6 | -10/+155 |
| | | |||||
* | | Merge pull request #15445 from owncloud/enc2_migration | Clark Tomlinson | 2015-04-16 | 12 | -15/+813 |
|\ \ | |/ |/| | add migration script from old encryption to new one | ||||
| * | decrypt private key for public shares correctly | Bjoern Schiessle | 2015-04-16 | 3 | -4/+4 |
| | | |||||
| * | fix decryption of legacy private key | Bjoern Schiessle | 2015-04-16 | 1 | -1/+0 |
| | | |||||
| * | add version | Bjoern Schiessle | 2015-04-16 | 1 | -0/+1 |
| | | |||||
| * | add migration script from old encryption to new one | Bjoern Schiessle | 2015-04-16 | 7 | -10/+808 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-16 | 10 | -2/+34 |
| | | |||||
* | | make sure that encrypted private keys always have a header | Bjoern Schiessle | 2015-04-15 | 2 | -2/+4 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-04-14 | 106 | -0/+2968 |
| | |||||
* | remove calculateUnencryptedSize() - not needed | Thomas Müller | 2015-04-14 | 1 | -10/+0 |
| | |||||
* | fix reading of private key | Thomas Müller | 2015-04-14 | 1 | -1/+1 |
| | |||||
* | add unit test for crypt.php | Bjoern Schiessle | 2015-04-10 | 2 | -29/+283 |
| | |||||
* | Merge pull request #15511 from owncloud/fix-typos | Lukas Reschke | 2015-04-09 | 2 | -6/+9 |
|\ | | | | | Fix typos and some other adjustments | ||||
| * | Fix typos and some other adjustments | Lukas Reschke | 2015-04-09 | 2 | -6/+9 |
| | | |||||
* | | Remove unneeded file | Lukas Reschke | 2015-04-09 | 1 | -33/+0 |
|/ | |||||
* | Fix PHPDoc | Lukas Reschke | 2015-04-09 | 5 | -22/+20 |
| | |||||
* | Fix code style | Lukas Reschke | 2015-04-09 | 1 | -1/+8 |
| | |||||
* | Enforce string as passed type | Lukas Reschke | 2015-04-09 | 1 | -1/+13 |
| | |||||
* | Merge pull request #15472 from owncloud/enc_backward_compatibility | Clark Tomlinson | 2015-04-08 | 3 | -9/+29 |
|\ | | | | | make private key handling backward compatible | ||||
| * | read cipher from key header and always write a key header if a new private ↵ | Bjoern Schiessle | 2015-04-08 | 3 | -9/+29 |
| | | | | | | | | key is stored | ||||
* | | Merge pull request #15443 from owncloud/encryption-user-hook-tests | Thomas Müller | 2015-04-08 | 1 | -0/+217 |
|\ \ | |/ |/| | adding test for user hooks | ||||
| * | adding test for user hooks | Clark Tomlinson | 2015-04-07 | 1 | -0/+217 |
| | | |||||
* | | fix function call | Bjoern Schiessle | 2015-04-08 | 1 | -2/+1 |
|/ | |||||
* | fixing license headers - encryption code related | Thomas Müller | 2015-04-07 | 27 | -86/+243 |
| | |||||
* | adding user setup test and adding 4 tests to keymanager | Clark Tomlinson | 2015-04-07 | 2 | -13/+144 |
| | |||||
* | adding recoverFileTest | Clark Tomlinson | 2015-04-07 | 1 | -2/+43 |
| | |||||
* | adding recovery tests | Clark Tomlinson | 2015-04-07 | 1 | -0/+224 |
| | |||||
* | PHPDoc cleanup - clean code \o/ | Thomas Müller | 2015-04-07 | 2 | -21/+18 |
| | |||||
* | userRecovery() was replaced by setRecoveryForUser() | Bjoern Schiessle | 2015-04-07 | 2 | -17/+0 |
| | |||||
* | remove unused code | Bjoern Schiessle | 2015-04-07 | 1 | -1/+0 |
| | |||||
* | fix versions download and previews | Bjoern Schiessle | 2015-04-07 | 2 | -3/+94 |
| | |||||
* | cleanup | Thomas Müller | 2015-04-07 | 3 | -29/+15 |
| | |||||
* | fixing unit test execution | Thomas Müller | 2015-04-07 | 3 | -47/+5 |
| | |||||
* | adding util test and reducing keymanager instances to one in test | Clark Tomlinson | 2015-04-07 | 2 | -108/+161 |
| | |||||
* | add more descriptive message to the exception, will be displayed to the user | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | cleaning up exception mess | Thomas Müller | 2015-04-07 | 7 | -10/+44 |
| | |||||
* | Set human readable module ids | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| | |||||
* | Fix shouldEncrypt and don't throw exception id fileKey not present - can happen | Thomas Müller | 2015-04-07 | 3 | -54/+25 |
| | |||||
* | make recovery key work | Bjoern Schiessle | 2015-04-07 | 5 | -54/+82 |
| |