summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0620-10/+114
* Merge pull request #15938 from owncloud/enc_update_recovery_share_keyBjörn Schießle2015-05-058-44/+92
|\
| * check recovery setting for the right userBjoern Schiessle2015-04-308-44/+92
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-0598-368/+306
* | Merge pull request #16026 from owncloud/enc_ux_improvementsBjörn Schießle2015-05-041-3/+7
|\ \
| * | some small ux improvementsBjoern Schiessle2015-05-041-3/+7
* | | Merge pull request #15752 from owncloud/feature/fix-encryption-return-valuesThomas Müller2015-05-044-93/+299
|\ \ \ | |/ / |/| |
| * | change error codes to 400Clark Tomlinson2015-04-242-20/+20
| * | fix messages from settings crontrollerClark Tomlinson2015-04-222-14/+15
| * | remove status's and adjust jsClark Tomlinson2015-04-223-67/+88
| * | destupify testsClark Tomlinson2015-04-222-104/+100
| * | fixing return values and adding testsClark Tomlinson2015-04-222-32/+220
* | | Merge pull request #15584 from owncloud/enc_fix_upload_shared_folderThomas Müller2015-05-044-3/+83
|\ \ \
| * | | Simplify the testJoas Schilling2015-04-303-14/+8
| * | | skip user if we don't have a public keyBjoern Schiessle2015-04-303-1/+87
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-042-2/+2
* | | [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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 00:28:57 +0000