Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix check if app is enabled | Bjoern Schiessle | 2013-09-25 | 1 | -4/+3 |
| | |||||
* | check if key exists before reading it | Bjoern Schiessle | 2013-09-25 | 1 | -1/+4 |
| | |||||
* | Merge pull request #4708 from owncloud/encryption_fixes | Björn Schießle | 2013-09-18 | 1 | -1/+2 |
|\ | | | | | make sure that initial encryption also starts for a fresh installation | ||||
| * | make sure that initial encryption also starts for a fresh installation | Bjoern Schiessle | 2013-09-03 | 1 | -1/+2 |
| | | |||||
* | | Merge pull request #4719 from owncloud/port_4701_master | Thomas Müller | 2013-09-12 | 1 | -60/+61 |
|\ \ | | | | | | | Always check variable type before using readdir to avoid surprises | ||||
| * | | more is_resource checks before readdir | Arthur Schiwon | 2013-09-05 | 1 | -60/+61 |
| |/ | |||||
* | | coding style fixes | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 |
| | | |||||
* | | fix part file handling and real size calculation, this should also solve #4581 | Bjoern Schiessle | 2013-09-06 | 3 | -45/+24 |
| | | | | | | | | | | Conflicts: apps/files_encryption/lib/stream.php | ||||
* | | check shares for the real file and not for the .part file | Bjoern Schiessle | 2013-09-06 | 1 | -0/+5 |
| | | |||||
* | | first check if a extension exists before comparing it | Bjoern Schiessle | 2013-09-06 | 1 | -1/+1 |
| | | |||||
* | | handle part files correctly | Bjoern Schiessle | 2013-09-06 | 1 | -6/+27 |
|/ | |||||
* | This function doesn't cache anymore. Adjusted PHPDoc to suit. | ringmaster | 2013-09-02 | 1 | -1/+1 |
| | |||||
* | Don't cache the pkey, skip generation if the keyfile exists | ringmaster | 2013-09-02 | 1 | -5/+2 |
| | |||||
* | Employ config option for OpenSSL config file, if provided. | Owen Winkler | 2013-09-02 | 2 | -6/+20 |
| | | | | This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS. | ||||
* | Start a branch for easier OpenSSL configuration. | Owen Winkler | 2013-09-02 | 2 | -1/+12 |
| | |||||
* | Merge pull request #4537 from owncloud/no-realpath | Thomas Müller | 2013-08-22 | 1 | -1/+1 |
|\ | | | | | Do not use realpath() on includes. | ||||
| * | Use __DIR__ instead of dirname(__FILE__). | Andreas Fischer | 2013-08-21 | 1 | -1/+1 |
| | | | | | | | | This is possible because we require PHP 5.3 or higher. | ||||
| * | Do not use realpath() on includes. | Andreas Fischer | 2013-08-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | If the file does not exist, realpath() returns false and "include false;" produces "Failed opening '' for inclusion" which is a useless error message. 'include' works just fine with symlinks, "./" and "../". | ||||
* | | Merge pull request #4239 from owncloud/decrypt_files_again | Björn Schießle | 2013-08-18 | 4 | -64/+351 |
|\ \ | | | | | | | Enable user to decrypt files again after encryption app was disabled | ||||
| * | | don't change the etags if a file gets encrypted/decrypted to avoid that the ↵ | Bjoern Schiessle | 2013-08-18 | 1 | -24/+32 |
| | | | | | | | | | | | | sync client downloads all files again | ||||
| * | | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 3 | -199/+36 |
| |\| | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | ||||
| * | | remove whitespaces and some leftover code from testing | Bjoern Schiessle | 2013-08-15 | 1 | -1/+1 |
| | | | |||||
| * | | preserve mtime if file gets encrypted/decrypted | Bjoern Schiessle | 2013-08-12 | 1 | -1/+13 |
| | | | |||||
| * | | fix array declaration | Bjoern Schiessle | 2013-08-12 | 1 | -1/+1 |
| | | | |||||
| * | | use OC\Files\View to read encrypted file, so that it also works with ↵ | Bjoern Schiessle | 2013-07-31 | 1 | -4/+7 |
| | | | | | | | | | | | | external storages | ||||
| * | | we need to use the path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| | | | |||||
| * | | handle error if we can't handle the given path | Bjoern Schiessle | 2013-07-30 | 2 | -2/+7 |
| | | | |||||
| * | | remove unused method, the right one is in util.php | Bjoern Schiessle | 2013-07-30 | 1 | -4/+0 |
| | | | |||||
| * | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 |
| | | | |||||
| * | | only write keyfiles if it was a new file, otherwise nothing changed | Bjoern Schiessle | 2013-07-30 | 1 | -38/+45 |
| | | | |||||
| * | | use path relative to data/ | Bjoern Schiessle | 2013-07-30 | 1 | -4/+1 |
| | | | |||||
| * | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -10/+26 |
| | | | |||||
| * | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 1 | -6/+96 |
| | | | |||||
| * | | add ajax call to decrypt all files | Björn Schießle | 2013-07-29 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/crypt.php | ||||
| * | | user interface to allow user to decrypt all his files once the encryption ↵ | Björn Schießle | 2013-07-29 | 3 | -8/+39 |
| | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php | ||||
* | | | Add _many_ newlines at the end of files | kondou | 2013-08-18 | 2 | -2/+2 |
| |/ |/| | |||||
* | | Merge pull request #4352 from owncloud/encryption_clean_up | Björn Schießle | 2013-08-17 | 2 | -198/+18 |
|\ \ | | | | | | | crypt.php clean up | ||||
| * | | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 |
| | | | |||||
| * | | Merge branch 'encryption_clean_up' of github.com:owncloud/core into ↵ | Bjoern Schiessle | 2013-08-09 | 1 | -4/+3 |
| |\ \ | | | | | | | | | | | | | encryption_clean_up | ||||
| | * | | fixing typos and PHPDoc | Thomas Müller | 2013-08-08 | 1 | -4/+3 |
| | | | | |||||
| * | | | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 1 | -63/+0 |
| |/ / | |||||
| * | | remove todo item | Bjoern Schiessle | 2013-08-08 | 1 | -4/+0 |
| | | | |||||
| * | | make methods private which are not used from outside | Bjoern Schiessle | 2013-08-08 | 1 | -101/+13 |
| |/ | |||||
* | | more error messages which might be useful for the user to debug his server ↵ | Bjoern Schiessle | 2013-08-08 | 2 | -2/+6 |
| | | | | | | | | config | ||||
* | | also write error message to the log | Bjoern Schiessle | 2013-08-08 | 1 | -0/+1 |
| | | |||||
* | | catch broken server config and disable encryption app. | Bjoern Schiessle | 2013-08-08 | 1 | -0/+12 |
|/ | |||||
* | remove wrong closing bracket | Björn Schießle | 2013-07-05 | 1 | -1/+0 |
| | |||||
* | added helper function to escape glob pattern | Björn Schießle | 2013-07-05 | 2 | -4/+14 |
| | | | | | | Conflicts: apps/files_encryption/lib/helper.php | ||||
* | only check for external mount points if the external storage app is enabled | Björn Schießle | 2013-07-05 | 1 | -9/+12 |
| | |||||
* | only escape glob pattern | Björn Schießle | 2013-07-05 | 1 | -3/+7 |
| |