Björn Schießle
|
2c8e5ec84f
|
user interface to allow user to decrypt all his files once the encryption app was disabled
Conflicts:
settings/templates/personal.php
|
2013-07-29 13:36:06 +02:00 |
|
Björn Schießle
|
87063918f2
|
remove wrong closing bracket
|
2013-07-05 16:05:05 +02:00 |
|
Björn Schießle
|
9575c2f37c
|
added helper function to escape glob pattern
Conflicts:
apps/files_encryption/lib/helper.php
|
2013-07-05 16:03:20 +02:00 |
VicDeo
|
f67fc78531
|
Merge pull request #3899 from owncloud/encryption_check_php_version
check php version, the encryption app needs php >= 5.3.3
|
2013-07-04 06:53:17 -07:00 |
Thomas Müller
|
a7f2563990
|
typo
|
2013-07-01 21:12:21 +02:00 |
|
Björn Schießle
|
d5c4854708
|
cast result to bool
|
2013-07-01 17:18:16 +02:00 |
|
Björn Schießle
|
16a719173f
|
add correct php version
|
2013-07-01 12:23:26 +02:00 |
|
Björn Schießle
|
adcee5b695
|
check php version, the encryption app needs php >= 5.3.3
|
2013-07-01 12:16:36 +02:00 |
|
Björn Schießle
|
2e6ebe1ab4
|
fix function documentation
|
2013-06-27 14:14:25 +02:00 |
|
Björn Schießle
|
c4aef89278
|
introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled
|
2013-06-27 14:09:22 +02:00 |
|
Björn Schießle
|
13017ce9e1
|
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
settings/ajax/changepassword.php
|
2013-06-10 12:12:07 +02:00 |
|
Björn Schießle
|
d7a9852f7b
|
use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened
|
2013-06-06 13:32:02 +02:00 |
Florin Peter
|
14ac4fab05
|
better handling for http post
|
2013-06-04 00:41:47 +02:00 |
|
Florin Peter
|
ef97481a0d
|
changed redirect handling
|
2013-06-03 23:41:57 +02:00 |
|
Florin Peter
|
dc8bcf0688
|
reformat code
|
2013-06-03 18:42:13 +02:00 |
|
Björn Schießle
|
471d2b732c
|
introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
|
2013-06-03 14:19:31 +02:00 |
|
Florin Peter
|
8c17f26226
|
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
|
2013-05-30 01:13:22 +02:00 |
|
Florin Peter
|
09b54ccb2b
|
Merge branch 'master' into remove_unused_vars
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
|
2013-05-28 11:00:49 +02:00 |
|
Florin Peter
|
6f9e425939
|
fix for losing private key while being logged in and accessing a public link
|
2013-05-28 09:27:04 +02:00 |
|
Florin Peter
|
e1e1c58969
|
changed to public log api
|
2013-05-27 20:51:52 +02:00 |
|
Florin Peter
|
7224fc98b2
|
replace == with === and replace != with !==
|
2013-05-27 20:44:38 +02:00 |
|
Florin Peter
|
5d32e214b7
|
reformat code
|
2013-05-27 17:26:58 +02:00 |
|
Björn Schießle
|
f56802a437
|
no use the recoveryPassword var instead of accessing the POST array
|
2013-05-24 18:37:58 +02:00 |
|
Florin Peter
|
6c8de5ae6d
|
fixes after review from @DeepDiver1975
|
2013-05-23 23:56:31 +02:00 |
|
Florin Peter
|
4bf840e2ca
|
cleanup unused code optimize tests
|
2013-05-21 00:00:55 +02:00 |
|
Florin Peter
|
3b850a2524
|
reformat code added and changed phpdoc
|
2013-05-20 01:24:36 +02:00 |
|
Florin Peter
|
42b4963dd0
|
moved enable and disable recovery to Helper class for unit tests
|
2013-05-17 00:58:41 +02:00 |
|
Björn Schießle
|
9d1e60325c
|
allow admin to recover users files in case of password lost
|
2013-05-16 14:53:04 +02:00 |
|
Florin Peter
|
ec2e193a44
|
removed unused code
|
2013-05-15 21:01:03 +02:00 |
|
Florin Peter
|
a4e9e2fc79
|
added post_deleteUser hook for cleanup public key
|
2013-05-13 22:49:27 +02:00 |
|
Florin Peter
|
b2d021b2a5
|
added post_createUser hook
|
2013-05-13 22:34:11 +02:00 |
|
Björn Schießle
|
a6ef25ba08
|
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
|
2013-05-13 14:28:45 +02:00 |
|
Florin Peter
|
e25aa78caf
|
added helper class and moved hook registration to it
|
2013-05-09 19:36:18 +02:00 |