summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
* introduce pre-disable-app hook and use it for the encryption app to reset ↵Björn Schießle2013-06-273-0/+25
| | | | migration status if the app was disabled
* [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
| | | | 'recovery key'
* encryption is LDAP compatibleBjörn Schießle2013-06-211-1/+1
|
* Squashed commit of the following:Björn Schießle2013-06-212-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1345201c9da99a82f198e41fba24da6b0d7ae59a Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:27:46 2013 +0200 add l10n support commit bf2c79c8de8710e839a4a55642a91874c374fa1c Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 16:19:10 2013 +0200 only init session if openssl extension is loaded commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:25:40 2013 +0200 first disable app and than show error page commit 55baf593179c433642de59552592e6b0f1932880 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:17:34 2013 +0200 typo fixed commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2 Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 12:15:40 2013 +0200 move dependency check to the encryption app commit c186e95da526f0470e20f014f1bd9513db5518ff Author: Björn Schießle <schiessle@owncloud.com> Date: Thu Jun 20 11:13:11 2013 +0200 make sure that openssl is installed and loaded
* [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
|\ | | | | add some more error messages, in case something went wrong
| * 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
|\ | | | | files_encryption: bug fixes for reported problems.
| * 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
|\ | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php
| * 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
| | |\ | | | | | | | | make sure that only one process can enter the migration mode
| | | * 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 ↵Björn Schießle2013-06-122-69/+24
| | | | | | | | | | | | | | | | migration mode
| | | * 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
| |\| | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php
| * | | cleanup unused method legacyKeyRecryptKeyfileFlorin Peter2013-05-312-41/+0
| | | |
| * | | Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-312-1/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php
| * \ \ \ Merge branch 'master' into files_encryption_upgrade_fixFlorin Peter2013-05-319-141/+139
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php
| * | | | | 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php
| * | | | | Merge pull request #3646 from owncloud/introduce_phpunit_timeoutsThomas Müller2013-06-116-0/+123
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | add timeouts 3/30/90 to phpunit tests
| | * | | | 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 place
| | * | | | | add missing backticks all over the placeJörn Friedrich Dreyer2013-06-101-4/+4
| | |/ / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-15 05:50:10 +0000