summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-293-0/+34
* Merge pull request #3799 from owncloud/fix_pdo_statement_wrapper_numrows_on_m...Bart Visscher2013-06-281-15/+3
|\
| * fix numRows usage in files_encryptionJörn Friedrich Dreyer2013-06-241-15/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-281-1/+11
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-273-6/+34
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-265-1/+57
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-253-1/+16
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-233-2/+23
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-2224-101/+1
* fix some strings in the admin settings, it's not a 'recovery account' but a '...Björn Schießle2013-06-211-5/+5
* encryption is LDAP compatibleBjörn Schießle2013-06-211-1/+1
* Squashed commit of the following:Björn Schießle2013-06-212-9/+18
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-213-0/+42
* Merge pull request #3788 from owncloud/more_error_messagesBjörn Schießle2013-06-202-26/+28
|\
| * always have a defined return valueBjörn Schießle2013-06-191-4/+4
| * some more error messagesBjörn Schießle2013-06-191-5/+3
| * add some more error messages, in case something went wrongBjörn Schießle2013-06-192-24/+28
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-204-10/+22
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-182-0/+22
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-172-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-165-0/+48
* [tx-robot] updated from transifexJenkins for ownCloud2013-06-154-0/+38
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 11:36:51 +0000