Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | make sure that initial encryption also starts for a fresh installation | Bjoern Schiessle | 2013-09-03 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -68/+97 | |
|\| | | | | | | | | | | | | | | Conflicts: apps/files/index.php | |||||
| * | | 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 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | 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 | |
| |/ | ||||||
* | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -1/+2 | |
| | | ||||||
* | | encryption error messages, distinguish between a re-enabled encryption app ↵ | Bjoern Schiessle | 2013-09-02 | 1 | -55/+5 | |
| | | | | | | | | and a password change from outside | |||||
* | | improved error messaging, initial commit | Bjoern Schiessle | 2013-08-30 | 1 | -0/+52 | |
|/ | ||||||
* | 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 | 1 | -93/+6 | |
|\ | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | |||||
| * | change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal | Bjoern Schiessle | 2013-08-12 | 1 | -30/+6 | |
| | | ||||||
| * | remove old comments, TODos, etc. | Bjoern Schiessle | 2013-08-09 | 1 | -63/+0 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | encrypt/decrypt file versions | Bjoern Schiessle | 2013-07-30 | 1 | -3/+124 | |
| | | ||||||
* | | improved error handling | Bjoern Schiessle | 2013-07-30 | 1 | -10/+26 | |
| | | ||||||
* | | working decrypt files method | Bjoern Schiessle | 2013-07-29 | 1 | -6/+96 | |
|/ | ||||||
* | only check for external mount points if the external storage app is enabled | Björn Schießle | 2013-07-05 | 1 | -9/+12 | |
| | ||||||
* | always return normalized path | Björn Schießle | 2013-07-05 | 1 | -1/+1 | |
| | ||||||
* | move isSystemWideMountPoint() to util.php | Björn Schießle | 2013-07-05 | 1 | -0/+15 | |
| | ||||||
* | fix path to OC_Mount_Config | Björn Schießle | 2013-07-05 | 1 | -1/+1 | |
| | ||||||
* | handle system wide mount points | Björn Schießle | 2013-07-05 | 1 | -8/+22 | |
| | ||||||
* | fix numRows usage in files_encryption | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -15/+3 | |
| | ||||||
* | add some more error messages, in case something went wrong | Björn Schießle | 2013-06-19 | 1 | -8/+11 | |
| | ||||||
* | fix for path_hash not unique as reported at #3641 | Florin Peter | 2013-06-13 | 1 | -2/+2 | |
| | ||||||
* | fix memory problems as reported at #3620 | Florin Peter | 2013-06-13 | 1 | -4/+3 | |
| | ||||||
* | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-13 | 1 | -49/+57 | |
|\ | | | | | | | | | | | Conflicts: apps/files_encryption/appinfo/app.php apps/files_encryption/lib/util.php | |||||
| * | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-13 | 1 | -22/+42 | |
| |\ | ||||||
| | * | fix typo in var name | Björn Schießle | 2013-06-13 | 1 | -1/+1 | |
| | | | ||||||
| | * | use number of manipulated rows as idicator if it was possible to enter the ↵ | Björn Schießle | 2013-06-12 | 1 | -68/+20 | |
| | | | | | | | | | | | | migration mode | |||||
| | * | use constants for different migration status | Björn Schießle | 2013-06-11 | 1 | -8/+11 | |
| | | | ||||||
| | * | make sure that only one process can enter the migration mode | Björn Schießle | 2013-06-11 | 1 | -9/+74 | |
| | | | ||||||
| * | | Merge branch 'master' into files_encryption_upgrade_fix | Björn Schießle | 2013-06-12 | 1 | -4/+4 | |
| |\| | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php | |||||
| * | | Merge branch 'master' into files_encryption_upgrade_fix | Florin Peter | 2013-05-31 | 1 | -29/+38 | |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/util.php | |||||
| * | | | fix re-encrypt legacy files | Florin Peter | 2013-05-31 | 1 | -27/+15 | |
| | | | | ||||||
* | | | | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-11 | 1 | -4/+4 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php | |||||
| * | | | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -4/+4 | |
| | |/ | |/| | ||||||
* | | | reformat code | Florin Peter | 2013-06-03 | 1 | -19/+26 | |
| | | | ||||||
* | | | introduce decryptPrivateKey() method which also checks if the result is a ↵ | Björn Schießle | 2013-06-03 | 1 | -9/+7 | |
|/ / | | | | | | | valid private key to avoid additional checks on various places | |||||
* | | fixed problems with file_get_contents and file_put_contents this problem was ↵ | Florin Peter | 2013-05-30 | 1 | -28/+19 | |
| | | | | | | | | related to text editor with big text files | |||||
* | | Merge branch 'master' into file_encryption_external_storage_fixes | Florin Peter | 2013-05-30 | 1 | -16/+20 | |
|\| | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php | |||||
| * | changes after review | Florin Peter | 2013-05-29 | 1 | -1/+5 | |
| | | ||||||
| * | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-29 | 1 | -1/+1 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/hooks/hooks.php apps/files_encryption/lib/proxy.php apps/files_encryption/lib/session.php apps/files_encryption/lib/stream.php | |||||
| * \ | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-28 | 1 | -4/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php |