summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-08-29108-0/+224
* Merge pull request #18423 from owncloud/occ_encrypt_allBjörn Schießle2015-08-288-0/+818
|\
| * occ tool to encrypt all filesBjoern Schiessle2015-08-268-0/+818
* | [tx-robot] updated from transifexJenkins for ownCloud2015-08-254-6/+24
* | Merge pull request #18121 from owncloud/enc_improve_privkey_encryptionLukas Reschke2015-08-2411-37/+343
|\ \ | |/ |/|
| * use uid as additional information for saltBjoern Schiessle2015-08-075-17/+17
| * use password hash instead of the plain password to encrypt the private keyBjoern Schiessle2015-08-0711-29/+335
* | Remove unnecessary DB prefixes from existing query builder usagesJoas Schilling2015-08-102-20/+20
|/
* Fix namespace conflict in OC.Encryption JS codeVincent Petry2015-08-062-12/+4
* Merge pull request #17989 from owncloud/enc_only_update_file_cache_onceBjörn Schießle2015-08-032-7/+22
|\
| * only update database on the first run (first run = we have a version number f...Bjoern Schiessle2015-07-312-7/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-312-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-282-0/+6
* Merge pull request #17413 from owncloud/public-api-querybuilderMorris Jobke2015-07-222-63/+63
|\
| * Fix existing usages by removing the quotesJoas Schilling2015-07-212-44/+44
| * Use the public interface and our method instead of the doctrine thingJoas Schilling2015-07-212-19/+19
* | Merge pull request #17806 from owncloud/enc_improved_app_descriptionRobin McCorkell2015-07-221-13/+8
|\ \ | |/ |/|
| * improved app description and adjust it to the way the new encryption module w...Bjoern Schiessle2015-07-221-13/+8
* | fix mount point detectionBjoern Schiessle2015-07-202-4/+81
|/
* unit testsBjoern Schiessle2015-07-171-2/+36
* don't move keys if the key where already moved in a previous migration runBjoern Schiessle2015-07-174-21/+79
* Merge pull request #17500 from owncloud/encryption_migration_improvementsThomas Müller2015-07-164-8/+71
|\
| * only create new key pair if both keys are missingBjoern Schiessle2015-07-082-7/+68
| * only cleanUp the remaining keys if the migration really finished succesfullyBjoern Schiessle2015-07-082-1/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2015-07-102-2/+2
* | Merge pull request #17473 from owncloud/enc_fix_migrationMorris Jobke2015-07-092-14/+82
|\ \
| * | more secure way to update the databaseBjoern Schiessle2015-07-082-14/+82
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-07-092-0/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-07-032-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-292-0/+2
* update license headers and authorsMorris Jobke2015-06-2527-39/+142
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-254-4/+18
* Merge pull request #17045 from owncloud/enc_improvementsBjörn Schießle2015-06-231-1/+1
|\
| * remove files_encryption from database at the end of the migration processBjoern Schiessle2015-06-191-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-06-202-2/+20
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-182-0/+16
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-172-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-162-2/+94
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-142-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-112-16/+40
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-102-2/+2
* add hint to exceptionBjoern Schiessle2015-06-081-5/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-082-10/+26
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-072-0/+102
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-052-0/+24
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-044-0/+8
* Move the helpful method to the TestCase classJoas Schilling2015-06-036-22/+22
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-032-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-024-0/+30
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-3112-8/+32