summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
...
| | * | typoThomas Müller2013-07-011-3/+3
| * | | improved error messageBjörn Schießle2013-07-021-1/+1
| |/ /
| * | cast result to boolBjörn Schießle2013-07-011-1/+1
| * | fix error stringBjörn Schießle2013-07-011-1/+1
| * | add correct php versionBjörn Schießle2013-07-011-1/+1
| * | check php version, the encryption app needs php >= 5.3.3Björn Schießle2013-07-013-7/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-047-1/+32
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-033-0/+3
* | | Merge pull request #3858 from owncloud/more_ssl_error_messagesBjörn Schießle2013-07-021-6/+5
|\ \ \
| * | | add openssl_error_string() output to the owncloud.logBjörn Schießle2013-06-261-6/+5
* | | | Merge pull request #3870 from owncloud/reset_migration_statusBjörn Schießle2013-07-023-0/+25
|\ \ \ \
| * | | | fix function documentationBjörn Schießle2013-06-271-1/+1
| * | | | introduce pre-disable-app hook and use it for the encryption app to reset mig...Björn Schießle2013-06-273-0/+25
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-0217-15/+48
| |_|_|/ |/| | |
* | | | improved error messageBjörn Schießle2013-07-021-1/+1
| |_|/ |/| |
* | | [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