summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-151-1/+1
|\ | | | | some encryption fixes
| * delete all file keys doesn't need the encryption module as parameter; ↵Bjoern Schiessle2015-05-131-1/+1
| | | | | | | | implement rmdir; getFileKeyDir should also work for part files and complete directories
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-158-2/+8
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-144-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-1312-6/+40
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-1226-26/+16
|
* Merge pull request #16213 from cmeh/patch-5Morris Jobke2015-05-111-2/+1
|\ | | | | Grammar, removal of line break
| * Grammar, removal of line breakChristian Hoffmann2015-05-091-2/+1
| | | | | | | | * Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17. * Removed line break from line 17 to line 18.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-114-0/+18
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-1016-6/+82
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-0988-446/+82
|
* improved admin settingsBjoern Schiessle2015-05-083-63/+90
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-084-4/+16
|
* Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-pageMorris Jobke2015-05-073-7/+5
|\ | | | | Display the module settings in the list of the encryption modules
| * Display the module settings in the list of the encryption modulesJoas Schilling2015-05-043-7/+5
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-076-2/+36
| |
* | [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
|\ \ | | | | | | [encryption] check recovery key setting for the correct user
| * | 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
|\ \ \ | |_|/ |/| | [encryption] some small ux improvements
| * | 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
|\ \ \ | |/ / |/| | [enc2] fixing return values and adding tests
| * | 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
|\ \ \ | | | | | | | | skip user if we don't have a public key
| * | | 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
|\ \ | | | | | | Encryption improve handling of empty and unencrypted files
| * | 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 key
| * | | 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
| * | 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 ↵Bjoern Schiessle2015-04-273-3/+47
| | | | | | | | | | | | encrypted file without a header
* | | Only get encryption status when logged inVincent Petry2015-04-231-1/+1
| | | | | | | | | | | | This removes useless warnings in the logs.
* | | [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
|\ \ | | | | | | [enc2] Fixing JS errors
| * | 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
| | | | | | | | | | | | This reverts commit ae681f0061f534b48b45cf9a41f6110c0ff20b1d.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-20 09:00:25 +0000