Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-06 | 4 | -4/+6 |
| | |||||
* | add some output to explain the pre-conditions for decrypt-all | Bjoern Schiessle | 2015-10-05 | 1 | -0/+6 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-03 | 2 | -0/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-28 | 6 | -4/+10 |
| | |||||
* | no need to list users if all users already had a key-pair | Bjoern Schiessle | 2015-09-24 | 1 | -0/+6 |
| | |||||
* | fix small typo | Bjoern Schiessle | 2015-09-21 | 1 | -1/+1 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-21 | 2 | -4/+4 |
| | |||||
* | Merge pull request #18983 from owncloud/fix_18926 | Thomas Müller | 2015-09-18 | 3 | -5/+71 |
|\ | | | | | 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 | 3 | -5/+71 |
| | | |||||
* | | occ script to disable encryption and to decrypt all files again | Bjoern Schiessle | 2015-09-15 | 7 | -2/+510 |
| | | |||||
* | | Function does return void | Lukas Reschke | 2015-09-15 | 1 | -2/+1 |
| | | | | | | | | This function does return void and not a bool. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-14 | 4 | -2/+8 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-12 | 2 | -0/+6 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-10 | 2 | -0/+4 |
| | |||||
* | Merge pull request #18873 from owncloud/enc_use_master_password | Lukas Reschke | 2015-09-09 | 10 | -27/+472 |
|\ | | | | | Allow admin to use a master key for all files | ||||
| * | occ command to enable master key | Bjoern Schiessle | 2015-09-08 | 3 | -0/+196 |
| | | |||||
| * | enable usage of a master key | Bjoern Schiessle | 2015-09-07 | 7 | -27/+276 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-06 | 2 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-05 | 4 | -0/+22 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-04 | 4 | -0/+8 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-09-01 | 4 | -0/+12 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-31 | 4 | -0/+12 |
| | |||||
* | return false if private key is not valid | Bjoern Schiessle | 2015-08-30 | 2 | -1/+16 |
| | |||||
* | use login name for password reset | Bjoern Schiessle | 2015-08-30 | 3 | -11/+40 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-30 | 8 | -2/+22 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-29 | 108 | -0/+224 |
| | |||||
* | Merge pull request #18423 from owncloud/occ_encrypt_all | Björn Schießle | 2015-08-28 | 8 | -0/+818 |
|\ | | | | | occ command line tool to encrypt all files | ||||
| * | occ tool to encrypt all files | Bjoern Schiessle | 2015-08-26 | 8 | -0/+818 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-25 | 4 | -6/+24 |
| | | |||||
* | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryption | Lukas Reschke | 2015-08-24 | 11 | -37/+343 |
|\ \ | |/ |/| | use password hash to encrypt private key | ||||
| * | use uid as additional information for salt | Bjoern Schiessle | 2015-08-07 | 5 | -17/+17 |
| | | |||||
| * | use password hash instead of the plain password to encrypt the private key | Bjoern Schiessle | 2015-08-07 | 11 | -29/+335 |
| | | |||||
* | | Remove unnecessary DB prefixes from existing query builder usages | Joas Schilling | 2015-08-10 | 2 | -20/+20 |
|/ | |||||
* | Fix namespace conflict in OC.Encryption JS code | Vincent Petry | 2015-08-06 | 2 | -12/+4 |
| | |||||
* | Merge pull request #17989 from owncloud/enc_only_update_file_cache_once | Björn Schießle | 2015-08-03 | 2 | -7/+22 |
|\ | | | | | only update database on the first run | ||||
| * | only update database on the first run (first run = we have a version number ↵ | Bjoern Schiessle | 2015-07-31 | 2 | -7/+22 |
| | | | | | | | | from the old encryption app) | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-31 | 2 | -2/+2 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-28 | 2 | -0/+6 |
| | |||||
* | Merge pull request #17413 from owncloud/public-api-querybuilder | Morris Jobke | 2015-07-22 | 2 | -63/+63 |
|\ | | | | | Add public api for Doctrine QueryBuilder and ExpressionBuilder | ||||
| * | Fix existing usages by removing the quotes | Joas Schilling | 2015-07-21 | 2 | -44/+44 |
| | | |||||
| * | Use the public interface and our method instead of the doctrine thing | Joas Schilling | 2015-07-21 | 2 | -19/+19 |
| | | |||||
* | | Merge pull request #17806 from owncloud/enc_improved_app_description | Robin McCorkell | 2015-07-22 | 1 | -13/+8 |
|\ \ | |/ |/| | improved app description for the default encryption module | ||||
| * | improved app description and adjust it to the way the new encryption module ↵ | Bjoern Schiessle | 2015-07-22 | 1 | -13/+8 |
| | | | | | | | | works | ||||
* | | fix mount point detection | Bjoern Schiessle | 2015-07-20 | 2 | -4/+81 |
|/ | |||||
* | 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 | 4 | -21/+79 |
| | |||||
* | Merge pull request #17500 from owncloud/encryption_migration_improvements | Thomas Müller | 2015-07-16 | 4 | -8/+71 |
|\ | | | | | Only clean up if migration finished succesfully | ||||
| * | only create new key pair if both keys are missing | Bjoern Schiessle | 2015-07-08 | 2 | -7/+68 |
| | | |||||
| * | only cleanUp the remaining keys if the migration really finished succesfully | Bjoern Schiessle | 2015-07-08 | 2 | -1/+3 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-07-10 | 2 | -2/+2 |
| | |