aboutsummaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #15713 from owncloud/fix-15707-masterMorris Jobke2015-04-213-35/+41
|\
| * doc and indentThomas Müller2015-04-212-4/+8
| * Don't pollute the global namespaceThomas Müller2015-04-212-29/+38
| * make jshint happyThomas Müller2015-04-202-14/+17
| * use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-201-23/+13
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-214-8/+14
|/
* Merge pull request #15677 from owncloud/enc_reset_private_key_passwordThomas Müller2015-04-205-10/+379
|\
| * Dont use the old .status wayJoas Schilling2015-04-203-24/+12
| * Fix several minor thingsJoas Schilling2015-04-202-24/+21
| * let user update the private key password in case the login password was chang...Bjoern Schiessle2015-04-174-0/+384
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-198-0/+22
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1890-0/+128
* | Revert "make jshint happy"Thomas Müller2015-04-172-20/+17
* | Revert "use a simple function - OC.Encryption is already defined - fixes #15707"Thomas Müller2015-04-171-13/+23
* | make jshint happyThomas Müller2015-04-172-17/+20
* | use a simple function - OC.Encryption is already defined - fixes #15707Thomas Müller2015-04-171-23/+13
* | Do not concat translation stringThomas Müller2015-04-171-5/+4
* | fixing undefined variableThomas Müller2015-04-171-8/+8
* | Merge pull request #15686 from owncloud/enc_fix_change_passwordThomas Müller2015-04-172-5/+38
|\ \
| * | fix change password if no user is logged in, occ callBjoern Schiessle2015-04-172-5/+38
* | | always create a new instance of the encryption moduleBjoern Schiessle2015-04-172-8/+13
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2015-04-1718-16/+22
|/
* Merge pull request #15675 from owncloud/enc_error_messagesClark Tomlinson2015-04-166-10/+155
|\
| * display warning if password changed or if the keys are not initializedBjoern Schiessle2015-04-166-10/+155
* | Merge pull request #15445 from owncloud/enc2_migrationClark Tomlinson2015-04-1612-15/+813
|\ \ | |/ |/|
| * decrypt private key for public shares correctlyBjoern Schiessle2015-04-163-4/+4
| * fix decryption of legacy private keyBjoern Schiessle2015-04-161-1/+0
| * add versionBjoern Schiessle2015-04-161-0/+1
| * add migration script from old encryption to new oneBjoern Schiessle2015-04-167-10/+808
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-1610-2/+34
* | make sure that encrypted private keys always have a headerBjoern Schiessle2015-04-152-2/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-14106-0/+2968
* remove calculateUnencryptedSize() - not neededThomas Müller2015-04-141-10/+0
* fix reading of private keyThomas Müller2015-04-141-1/+1
* add unit test for crypt.phpBjoern Schiessle2015-04-102-29/+283
* Merge pull request #15511 from owncloud/fix-typosLukas Reschke2015-04-092-6/+9
|\
| * Fix typos and some other adjustmentsLukas Reschke2015-04-092-6/+9
* | Remove unneeded fileLukas Reschke2015-04-091-33/+0
|/
* Fix PHPDocLukas Reschke2015-04-095-22/+20
* Fix code styleLukas Reschke2015-04-091-1/+8
* Enforce string as passed typeLukas Reschke2015-04-091-1/+13
* Merge pull request #15472 from owncloud/enc_backward_compatibilityClark Tomlinson2015-04-083-9/+29
|\
| * read cipher from key header and always write a key header if a new private ke...Bjoern Schiessle2015-04-083-9/+29
* | Merge pull request #15443 from owncloud/encryption-user-hook-testsThomas Müller2015-04-081-0/+217
|\ \ | |/ |/|
| * adding test for user hooksClark Tomlinson2015-04-071-0/+217
* | fix function callBjoern Schiessle2015-04-081-2/+1
|/
* fixing license headers - encryption code relatedThomas Müller2015-04-0727-86/+243
* adding user setup test and adding 4 tests to keymanagerClark Tomlinson2015-04-072-13/+144
* adding recoverFileTestClark Tomlinson2015-04-071-2/+43
* adding recovery testsClark Tomlinson2015-04-071-0/+224