Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | check HTTP Referer to check if we come from public.php or from a internal page. | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 | |
|/ | | | | Necessary to detect public access also if a user is logged in. | |||||
* | [wip] make encryption work with public gallery sharing | Bjoern Schiessle | 2013-11-20 | 1 | -4/+30 | |
| | ||||||
* | instead of writing etmp files we write the dummy file to data/user/cache to ↵ | Bjoern Schiessle | 2013-11-14 | 1 | -11/+40 | |
| | | | | avoid that etmp files show up in the users files list | |||||
* | Merge pull request #5447 from owncloud/fixing-5117-master | Vincent Petry | 2013-11-13 | 1 | -0/+43 | |
|\ | | | | | No data corruption duriing parallel upload | |||||
| * | rename fixPartialFilePath() to stripPartialFileExtension(), this name ↵ | Bjoern Schiessle | 2013-11-12 | 1 | -1/+1 | |
| | | | | | | | | describes better what the method actually does | |||||
| * | fixing tests for the new part file handling | Bjoern Schiessle | 2013-11-12 | 1 | -0/+16 | |
| | | ||||||
| * | let encryption app detect transfer id in path and handle it correctly | Bjoern Schiessle | 2013-11-11 | 1 | -0/+27 | |
| | | ||||||
* | | set the init status to "NOT_INITIALIZED" if the encryption app gets enabled | Bjoern Schiessle | 2013-10-22 | 1 | -0/+1 | |
|/ | ||||||
* | block file access if share keys are missing | Bjoern Schiessle | 2013-10-11 | 1 | -4/+16 | |
| | ||||||
* | Merge branch 'master' into encryption_improved_error_messages_4617 | Bjoern Schiessle | 2013-09-16 | 1 | -1/+21 | |
|\ | | | | | | | | | Conflicts: apps/files/index.php | |||||
| * | 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 | 1 | -2/+15 | |
| | | | | | | | | 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 | 1 | -1/+11 | |
| | | ||||||
* | | no longer enforce log out, but provide useful errors/warnings instead | Bjoern Schiessle | 2013-09-06 | 1 | -20/+7 | |
| | | ||||||
* | | encryption error messages, distinguish between a re-enabled encryption app ↵ | Bjoern Schiessle | 2013-09-02 | 1 | -2/+2 | |
| | | | | | | | | and a password change from outside | |||||
* | | improved error messaging, initial commit | Bjoern Schiessle | 2013-08-30 | 1 | -13/+29 | |
|/ | ||||||
* | Merge branch 'master' into decrypt_files_again | Bjoern Schiessle | 2013-08-17 | 1 | -0/+15 | |
|\ | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php | |||||
| * | more error messages which might be useful for the user to debug his server ↵ | Bjoern Schiessle | 2013-08-08 | 1 | -1/+3 | |
| | | | | | | | | 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 | |
| | | ||||||
* | | handle error if we can't handle the given path | Bjoern Schiessle | 2013-07-30 | 1 | -2/+2 | |
| | | ||||||
* | | user interface to allow user to decrypt all his files once the encryption ↵ | Björn Schießle | 2013-07-29 | 1 | -0/+27 | |
|/ | | | | | | | app was disabled Conflicts: settings/templates/personal.php | |||||
* | 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 | 1 | -1/+11 | |
| | | | | | | Conflicts: apps/files_encryption/lib/helper.php | |||||
* | Merge pull request #3899 from owncloud/encryption_check_php_version | VicDeo | 2013-07-04 | 1 | -2/+18 | |
|\ | | | | | check php version, the encryption app needs php >= 5.3.3 | |||||
| * | typo | Thomas Müller | 2013-07-01 | 1 | -3/+3 | |
| | | ||||||
| * | cast result to bool | Björn Schießle | 2013-07-01 | 1 | -1/+1 | |
| | | ||||||
| * | add correct php version | Björn Schießle | 2013-07-01 | 1 | -1/+1 | |
| | | ||||||
| * | check php version, the encryption app needs php >= 5.3.3 | Björn Schießle | 2013-07-01 | 1 | -0/+16 | |
| | | ||||||
* | | fix function documentation | Björn Schießle | 2013-06-27 | 1 | -1/+1 | |
| | | ||||||
* | | introduce pre-disable-app hook and use it for the encryption app to reset ↵ | Björn Schießle | 2013-06-27 | 1 | -0/+9 | |
|/ | | | | migration status if the app was disabled | |||||
* | Merge branch 'master' into files_encryption_check_private_key | Björn Schießle | 2013-06-10 | 1 | -0/+1 | |
|\ | | | | | | | | | Conflicts: settings/ajax/changepassword.php | |||||
| * | use pre_setPassword hook to update the encryption keys if the back-end ↵ | Björn Schießle | 2013-06-06 | 1 | -0/+1 | |
| | | | | | | | | doesn't support password change; improved output to let the admin know what happened | |||||
* | | better handling for http post | Florin Peter | 2013-06-04 | 1 | -1/+5 | |
| | | ||||||
* | | changed redirect handling | Florin Peter | 2013-06-03 | 1 | -0/+9 | |
| | | ||||||
* | | reformat code | Florin Peter | 2013-06-03 | 1 | -1/+1 | |
| | | ||||||
* | | introduce decryptPrivateKey() method which also checks if the result is a ↵ | Björn Schießle | 2013-06-03 | 1 | -7/+1 | |
|/ | | | | 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 | -0/+14 | |
| | | | | related to text editor with big text files | |||||
* | Merge branch 'master' into remove_unused_vars | Florin Peter | 2013-05-28 | 1 | -0/+16 | |
|\ | | | | | | | | | | | Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.php | |||||
| * | fix for losing private key while being logged in and accessing a public link | Florin Peter | 2013-05-28 | 1 | -0/+16 | |
| | | ||||||
* | | changed to public log api | Florin Peter | 2013-05-27 | 1 | -2/+2 | |
| | | ||||||
* | | replace == with === and replace != with !== | Florin Peter | 2013-05-27 | 1 | -4/+1 | |
| | | ||||||
* | | reformat code | Florin Peter | 2013-05-27 | 1 | -42/+42 | |
|/ | ||||||
* | no use the recoveryPassword var instead of accessing the POST array | Björn Schießle | 2013-05-24 | 1 | -1/+1 | |
| | ||||||
* | fixes after review from @DeepDiver1975 | Florin Peter | 2013-05-23 | 1 | -49/+43 | |
| | ||||||
* | cleanup unused code optimize tests | Florin Peter | 2013-05-21 | 1 | -10/+0 | |
| | ||||||
* | reformat code added and changed phpdoc | Florin Peter | 2013-05-20 | 1 | -63/+71 | |
| | ||||||
* | moved enable and disable recovery to Helper class for unit tests | Florin Peter | 2013-05-17 | 1 | -0/+92 | |
| | ||||||
* | allow admin to recover users files in case of password lost | Björn Schießle | 2013-05-16 | 1 | -1/+1 | |
| |