summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-092-0/+5
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-082-3/+7
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-072-0/+4
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-064-0/+28
|
* remove wrong closing bracketBjörn Schießle2013-07-051-1/+0
|
* added helper function to escape glob patternBjörn Schießle2013-07-053-5/+15
| | | | | | Conflicts: apps/files_encryption/lib/helper.php
* fix getUidAndFilename() testBjörn Schießle2013-07-051-1/+1
|
* only check for external mount points if the external storage app is enabledBjörn Schießle2013-07-051-9/+12
|
* only escape glob patternBjörn Schießle2013-07-052-4/+9
|
* del share keys from correct locationBjörn Schießle2013-07-051-3/+16
|
* always return normalized pathBjörn Schießle2013-07-051-1/+1
|
* delete file keys from the correct locationBjörn Schießle2013-07-051-1/+8
|
* handle rename correctly for system wide mountsBjörn Schießle2013-07-051-9/+16
|
* move isSystemWideMountPoint() to util.phpBjörn Schießle2013-07-052-19/+19
|
* some performance improvements, check for system wide mounts only once while ↵Björn Schießle2013-07-051-40/+25
| | | | writing share keys
* fix path to OC_Mount_ConfigBjörn Schießle2013-07-052-2/+2
|
* handle system wide mount pointsBjörn Schießle2013-07-052-17/+62
|
* [tx-robot] updated from transifexJenkins for ownCloud2013-07-0518-33/+1
|
* Merge pull request #3899 from owncloud/encryption_check_php_versionVicDeo2013-07-044-10/+24
|\ | | | | check php version, the encryption app needs php >= 5.3.3
| * more verbose error messageBjörn Schießle2013-07-041-1/+1
| |
| * Merge branch 'master' into encryption_check_php_versionBjörn Schießle2013-07-021-1/+1
| |\ | | | | | | | | | | | | Conflicts: apps/files_encryption/files/error.php
| * \ Merge branch 'encryption_check_php_version' of github.com:owncloud/core into ↵Björn Schießle2013-07-022-5/+4
| |\ \ | | | | | | | | | | | | encryption_check_php_version
| | * | no ?> at the end of a fileThomas Müller2013-07-011-2/+1
| | | | | | | | | | | | | | | | missing .
| | * | 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.log
| * | | 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
|\ \ \ \ | | | | | | | | | | introduce pre-disable-app hook and first usage in files_encryption
| * | | | fix function documentationBjörn Schießle2013-06-271-1/+1
| | | | |
| * | | | 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-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 ↵Bart Visscher2013-06-281-15/+3
|\ \ \ | | | | | | | | | | | | | | | | owncloud/fix_pdo_statement_wrapper_numrows_on_modification Fix pdo statement wrapper numrows on modification
| * | | 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
| | | | '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