summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-022-8/+8
* Merge pull request #15919 from owncloud/enc_handle_empty_filesClark Tomlinson2015-04-294-34/+118
|\
| * method shouldn't be staticBjoern Schiessle2015-04-281-1/+1
| * also create encryption keys for empty filesBjoern Schiessle2015-04-282-23/+42
| * skip update of encryption keys if file is not encryptedBjoern Schiessle2015-04-283-13/+78
* | Merge pull request #15911 from owncloud/enc_create_header_for_new_keyBjörn Schießle2015-04-292-3/+14
|\ \
| * | make sure that we create a header for the encrypted private keyBjoern Schiessle2015-04-282-3/+14
| |/
* | Merge pull request #15706 from owncloud/fix-15705-masterLukas Reschke2015-04-292-3/+6
|\ \ | |/ |/|
| * move creation of shared key to the login handler - fixes #15705Thomas Müller2015-04-172-3/+6
* | fall back to the ownCloud default encryption module and aes128 if we read a e...Bjoern Schiessle2015-04-273-3/+47
* | Only get encryption status when logged inVincent Petry2015-04-231-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-232-0/+6
* | add $encryptionModuleId to methods of Keys/IStorageThomas Müller2015-04-223-30/+44
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-2288-8/+280
* | 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
|\