Bjoern Schiessle
|
e5c84488ff
|
Merge branch 'files_encryption' of gitorious.org:owncloud/owncloud into files_encryption
Conflicts:
apps/files_encryption/lib/keymanager.php
|
2012-07-26 14:06:39 +02:00 |
|
Bjoern Schiessle
|
bdb406916c
|
fixed path for filesystem view
|
2012-07-26 13:49:22 +02:00 |
Sam Tuke
|
9f51841c57
|
Mainly work on implementing new encryption system (+ keyfile handling) into proxy classs
|
2012-07-25 18:28:56 +01:00 |
|
Sam Tuke
|
adf5c953dd
|
Fixed use of OCFSV in getPrivateKey()
|
2012-07-25 16:56:52 +01:00 |
|
Sam Tuke
|
e6de086fb6
|
Fixed various bugs in hooks class
Fixed documentation syntax in keymanager
|
2012-07-25 16:51:48 +01:00 |
|
Bjoern Schiessle
|
6d1ed388c0
|
keymanager class for basic operations to store and retrieve keys
|
2012-07-25 17:01:11 +02:00 |