summaryrefslogtreecommitdiffstats
path: root/apps/encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-242-0/+26
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-234-2/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-218-0/+26
* [tx-robot] updated from transifexJenkins for ownCloud2015-05-2080-8/+104
* Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-192-3/+3
|\
| * rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-062-3/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-192-0/+2
* | Add missing import for the exceptionJoas Schilling2015-05-182-0/+3
* | Add a unit test for the decrypt methodJoas Schilling2015-05-181-1/+11
* | add l10n to constructorBjoern Schiessle2015-05-183-4/+18
* | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trashVincent Petry2015-05-182-1/+29
|\ \
| * | also encrypt files in trash binBjoern Schiessle2015-05-182-1/+29
* | | a new approach to display the error messageBjoern Schiessle2015-05-185-10/+85
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-182-0/+24
* | [tx-robot] updated from transifexJenkins for ownCloud2015-05-162-0/+2
* | Merge pull request #16323 from owncloud/enc_webdav_fixesThomas Müller2015-05-151-1/+1
|\ \
| * | delete all file keys doesn't need the encryption module as parameter; impleme...Bjoern Schiessle2015-05-131-1/+1
* | | [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 breakChristian Hoffmann2015-05-091-2/+1
* | | [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 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
|\ \
| * | 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