summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-1018-12/+219
|\
| * Merge pull request #3610 from owncloud/encryption_recovery_for_ldapBjörn Schießle2013-06-102-0/+10
| |\
| | * use pre_setPassword hook to update the encryption keys if the back-end doesn'...Björn Schießle2013-06-062-0/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-081-10/+10
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-071-1/+19
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-063-2/+27
| * [tx-robot] updated from transifexJenkins for ownCloud2013-06-056-6/+109
| * Merge pull request #3561 from owncloud/usericewind19912013-06-031-1/+1
| |\
| | * fix broken testsFlorin Peter2013-05-311-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-021-1/+19
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-014-1/+23
| * | also fix login errors while filesystem is not loaded in app.phpFlorin Peter2013-05-311-0/+6
| * | Merge branch 'master' into files_encryption_fs_loaded_fixFlorin Peter2013-05-316-142/+128
| |\|
| * | fix login errors while filesystem is not loadedFlorin Peter2013-05-311-0/+5
* | | add a hint that the admin can recover your files; Don't let the user change t...Björn Schießle2013-06-051-3/+9
* | | allow to press enter to update the passwordBjörn Schießle2013-06-051-15/+23
* | | tell the user what he can do to regain access to his filesBjörn Schießle2013-06-051-1/+1
* | | only show personal settings if the recovery feature is enabled or if no priva...Björn Schießle2013-06-051-6/+13
* | | improved error msg and removed duplicate stringFlorin Peter2013-06-041-3/+5
* | | improved label for the password recovery featureBjörn Schießle2013-06-041-2/+2
* | | link directly to the encryption settingsBjörn Schießle2013-06-042-1/+2
* | | better handling for http postFlorin Peter2013-06-042-1/+9
* | | changed redirect handlingFlorin Peter2013-06-034-16/+46
* | | fixed typoFlorin Peter2013-06-031-1/+1
* | | reformat codeFlorin Peter2013-06-0310-74/+83
* | | use generated private key fro m setUp()Björn Schießle2013-06-031-4/+2
* | | added test for decryptPrivateKey()Björn Schießle2013-06-031-0/+18
* | | let user update private key password in case it was changed from outside, e.g...Björn Schießle2013-06-034-0/+118
* | | $session->setPrivateKey expects only one parameterBjörn Schießle2013-06-031-1/+1
* | | control files are no longer needed, remove them from the testsBjörn Schießle2013-06-031-6/+0
* | | introduce decryptPrivateKey() method which also checks if the result is a val...Björn Schießle2013-06-036-40/+49
* | | code optimized and cleaned up unused varsFlorin Peter2013-05-311-23/+47
* | | allow the user to login but do not allow upload and show error message on the...Florin Peter2013-05-313-7/+26
* | | check if the decrypted private key is valid on login and on read/write filesFlorin Peter2013-05-312-7/+31
| |/ |/|
* | Merge pull request #3527 from owncloud/file_encryption_external_storage_fixesFlorinPeter2013-05-316-142/+128
|\ \ | |/ |/|
| * added our own file extension .part will not work here if we use file_get_cont...Florin Peter2013-05-302-5/+5
| * fix share and un-share for single fileFlorin Peter2013-05-301-23/+13
| * fixed problems with file_get_contents and file_put_contents this problem was ...Florin Peter2013-05-303-127/+92
| * Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-3016-718/+757
| |\
| * | fixed typoFlorin Peter2013-05-291-1/+1
| * | Merge branch 'master' into file_encryption_external_storage_fixesFlorin Peter2013-05-299-31/+36
| |\ \
| * | | fix for share folder on external storageFlorin Peter2013-05-292-2/+33
| * | | check list of users with access to the file from the bottom to the top. This ...Björn Schießle2013-05-291-2/+2
| * | | fixed if fopen returns false typically on external storageFlorin Peter2013-05-281-1/+1
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-313-0/+12
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-3011-18/+35
| |_|/ |/| |
* | | reformat codeFlorin Peter2013-05-292-16/+16
* | | changed " to 'Florin Peter2013-05-293-13/+13
* | | changed l10n to full sentencesFlorin Peter2013-05-291-14/+25
* | | changes l10n after reviewFlorin Peter2013-05-291-5/+5