summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed key-manager testsFlorin Peter2013-05-181-8/+15
* removed mockery from tests and changed class namesFlorin Peter2013-05-183-171/+12
* fixed typosFlorin Peter2013-05-182-2/+2
* Merge branch 'files_encryption' of github.com:owncloud/core into files_encryp...Björn Schießle2013-05-182-120/+56
|\
| * improved testsFlorin Peter2013-05-171-2/+10
| * remove unused codeFlorin Peter2013-05-171-114/+9
| * added folder move testFlorin Peter2013-05-171-1/+34
| * fix broken legacy testsFlorin Peter2013-05-172-3/+3
* | display a warning if the user has enabled file recovery but the admin tries t...Björn Schießle2013-05-181-3/+7
|/
* fix path to classBjörn Schießle2013-05-171-2/+2
* fix migration to new encryptionBjörn Schießle2013-05-174-48/+18
* re-add 3rdparty submoduleBjörn Schießle2013-05-172-1/+1
* some typo fixedBjörn Schießle2013-05-172-3/+3
* gremove unused codeBjörn Schießle2013-05-173-154/+68
* set migration status after successful upgradeBjörn Schießle2013-05-171-2/+1
* Merge branch 'files_encryption' of github.com:owncloud/core into files_encryp...Björn Schießle2013-05-177-95/+302
|\
| * revert changesFlorin Peter2013-05-171-28/+25
| * added tests for recoveryFlorin Peter2013-05-171-2/+142
| * improved testsFlorin Peter2013-05-172-1/+39
| * moved enable and disable recovery to Helper class for unit testsFlorin Peter2013-05-172-62/+94
| * fix for recover files in subfolderFlorin Peter2013-05-161-1/+1
| * fix typo in addRecoveryKeysFlorin Peter2013-05-161-1/+1
* | upgrade from old encryption to the new one needs to generate share keys tooBjörn Schießle2013-05-173-15/+37
|/
* add pre-shared hooksBjörn Schießle2013-05-161-0/+22
* show nicer warning if the admin recovery password was wrongBjörn Schießle2013-05-162-5/+7
* some error handling in case the recovery password is wrongBjörn Schießle2013-05-162-2/+9
* allow admin to recover users files in case of password lostBjörn Schießle2013-05-1611-30/+159
* improved tests for touchFlorin Peter2013-05-161-1/+22
* added tests for put content, get content, touch and fopenFlorin Peter2013-05-163-3/+76
* fix for re-share and removed check if file exists because we are sometime int...Florin Peter2013-05-162-14/+22
* fix if file is not yet createdFlorin Peter2013-05-161-2/+7
* added test for share with groupFlorin Peter2013-05-161-0/+74
* added test for rename folderFlorin Peter2013-05-151-2/+34
* removed unused codeFlorin Peter2013-05-152-40/+1
* added test for password changeFlorin Peter2013-05-151-0/+34
* Merge branch 'files_encryption' of github.com:owncloud/core into files_encryp...Björn Schießle2013-05-151-25/+28
|\
| * fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been c...Florin Peter2013-05-151-25/+28
* | add recovery key to all files if the user enabled the feature and removes the...Björn Schießle2013-05-153-1/+42
|/
* added missing file to enable the admin to change the recovery key passwordBjörn Schießle2013-05-151-0/+52
* Merge branch 'files_encryption' of github.com:owncloud/core into files_encryp...Björn Schießle2013-05-152-33/+25
|\
| * fix for broken testsFlorin Peter2013-05-151-13/+4
| * fix for previous workaroundFlorin Peter2013-05-151-20/+21
* | enable admin to change the recovery passwordBjörn Schießle2013-05-155-28/+118
|/
* check if the user knows the correct recovery password before changing the rec...Björn Schießle2013-05-155-20/+63
* Merge branch 'files_encryption' of github.com:owncloud/core into files_encryp...Björn Schießle2013-05-151203-18129/+22711
|\
| * workaround for blank page need an other solutionFlorin Peter2013-05-151-20/+20
| * improved files_encryption testsFlorin Peter2013-05-154-4/+4
| * removed FileProxy from testFlorin Peter2013-05-151-5/+6
| * merge changes for files_encryptionFlorin Peter2013-05-151-40/+42
| * fix for losing mount point "/"Florin Peter2013-05-151-1/+4