aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3715 from owncloud/fixes_for_3641_3620Björn Schießle2013-06-142-9/+8
|\
| * fix for path_hash not unique as reported at #3641Florin Peter2013-06-131-2/+2
| * fix memory problems as reported at #3620Florin Peter2013-06-132-7/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-1422-41/+5
|/
* Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-137-128/+127
|\
| * Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-133-28/+74
| |\
| | * Merge pull request #3668 from owncloud/encryption_migrate_only_onceBjörn Schießle2013-06-133-28/+74
| | |\
| | | * add comment to explain the helper functionBjörn Schießle2013-06-131-0/+8
| | | * fix typo in var nameBjörn Schießle2013-06-131-1/+1
| | | * adapt test to the code changesBjörn Schießle2013-06-121-3/+18
| | | * use number of manipulated rows as idicator if it was possible to enter the mi...Björn Schießle2013-06-122-69/+24
| | | * use constants for different migration statusBjörn Schießle2013-06-111-8/+11
| | | * make sure that only one process can enter the migration modeBjörn Schießle2013-06-112-12/+77
| * | | LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removedBjörn Schießle2013-06-131-18/+0
| * | | Merge branch 'master' into files_encryption_upgrade_fixBjörn Schießle2013-06-1225-18/+375
| |\| |
| * | | cleanup unused method legacyKeyRecryptKeyfileFlorin Peter2013-05-312-41/+0
| * | | Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-312-1/+12
| |\ \ \
| * \ \ \ Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-319-141/+139
| |\ \ \ \
| * | | | | normalize path to prevent following split to failFlorin Peter2013-05-311-0/+2
| * | | | | fix legacy key in until testFlorin Peter2013-05-311-1/+1
| * | | | | fix re-encrypt legacy filesFlorin Peter2013-05-311-27/+15
| * | | | | use legacyDecrypt to decrypt key file like the previous files_encryptionFlorin Peter2013-05-312-2/+2
| * | | | | fix for autoloader while user logged in and system is in maintenanceFlorin Peter2013-05-311-23/+28
* | | | | | Merge branch 'master' into files_encryption_check_private_keyBjörn Schießle2013-06-119-6/+151
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeoutsThomas Müller2013-06-116-0/+123
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | allow 30 sec for testDeleteFileJörn Friedrich Dreyer2013-06-101-0/+1
| | * | | | raise failed tests from first commit to size @mediumJörn Friedrich Dreyer2013-06-101-0/+3
| | * | | | add timeouts 3/30/90 to phpunit testsJörn Friedrich Dreyer2013-06-105-0/+119
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-06-112-2/+23
| * | | | | Merge pull request #3647 from owncloud/missing_backticksMorris Jobke2013-06-101-4/+4
| |\ \ \ \ \
| | * | | | | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-101-4/+4
| | |/ / / /
* | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 12:08:47 +0000