summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make recovery settings workBjoern Schiessle2015-04-079-34/+45
* fix unit test executionThomas Müller2015-04-071-5/+13
* fix parameter declaration and class initialisationBjoern Schiessle2015-04-072-4/+5
* fix lib/private/encryption/util.php callBjoern Schiessle2015-04-073-14/+23
* fix unit test execution, variable naming and kill no longer used $cacheFactoryThomas Müller2015-04-071-7/+8
* remove debug code from coreBjoern Schiessle2015-04-071-3/+0
* check if recovery key exists and encrypt the file with the recovery key if ne...Bjoern Schiessle2015-04-074-7/+80
* add public link share key to file if it was shared as public linkBjoern Schiessle2015-04-074-5/+74
* add setting templatesBjoern Schiessle2015-04-075-2/+155
* make sharing and unsharing workBjoern Schiessle2015-04-072-7/+31
* Comment duplicate test methodsThomas Müller2015-04-071-57/+57
* cleanup and removing cachefactoryClark Tomlinson2015-04-0717-354/+287
* read encrypted filesBjoern Schiessle2015-04-073-8/+33
* core: documentation fixesBjoern Schiessle2015-04-072-2/+2
* make sure that all file keys are written to the key storageBjoern Schiessle2015-04-072-3/+32
* core: small fixesBjoern Schiessle2015-04-071-1/+0
* write encrypted file to discBjoern Schiessle2015-04-074-25/+152
* enable encryption unit test executionThomas Müller2015-04-073-112/+1
* encryption app: remove legacy code, we do only server-side encryptionBjoern Schiessle2015-04-072-65/+42
* fixing obvious bugs while testingThomas Müller2015-04-074-144/+149
* implement rename and delete of encryption keysBjoern Schiessle2015-04-072-0/+35
* Updating keystorage movement and fixing hooksClark Tomlinson2015-04-0715-423/+1202
* add deleteKey methods to key storageBjoern Schiessle2015-04-072-7/+63
* fix encryption manager to handle more than one encryption moduleBjoern Schiessle2015-04-072-7/+19
* fix keystorage and add unit testsBjoern Schiessle2015-04-074-441/+9
* Initial commitClark Tomlinson2015-04-0737-253/+2630
* create basic interfaces and wrapper to make encryption more modularBjoern Schiessle2015-04-072-0/+310
* Merge pull request #15345 from rullzer/fix_15263Jan-Christoph Borchardt2015-04-071-0/+9
|\
| * Only show SSL table header if there are certificatesRoeland Jago Douma2015-03-311-0/+9
* | Merge pull request #15424 from owncloud/failing-master-testsThomas Müller2015-04-074-16/+28
|\ \
| * | Select the timezone on the right timestamp and assert itJoas Schilling2015-04-071-8/+11
| * | When guessing the timezone, the offset might only be valid on a given timestampJoas Schilling2015-04-072-5/+14
| * | Remove server timezone dependency from files list testJoas Schilling2015-04-071-3/+3
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-0712-2/+50
* | [tx-robot] updated from transifexJenkins for ownCloud2015-04-0512-22/+36
* | Merge pull request #15403 from Crote/occ-user-add-returnThomas Müller2015-04-041-1/+2
|\ \
| * | Fix occ user:add failure return codesLaurens Post2015-04-041-1/+2
* | | Merge pull request #15338 from owncloud/encryption-mount-optionThomas Müller2015-04-046-16/+60
|\ \ \
| * | | add unit testRobin Appelman2015-04-022-0/+13
| * | | adjust unt testsRobin Appelman2015-04-022-2/+4
| * | | Add mount point to disable the encryption wrapperRobin Appelman2015-03-315-15/+44
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-0426-56/+112
* | | Merge pull request #15229 from owncloud/response-setContentLengthHeaderThomas Müller2015-04-035-4/+33
|\ \ \
| * | | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.Andreas Fischer2015-03-265-4/+33
* | | | Merge pull request #15391 from owncloud/fix-language-cachingThomas Müller2015-04-031-2/+3
|\ \ \ \
| * | | | fix caching of preferred languageRobin Appelman2015-04-031-2/+3
* | | | | Merge pull request #15386 from oparoz/yaml-cnf-mediatypeThomas Müller2015-04-034-10/+86
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Introducing media types for yml, yaml, cnf, confOlivier Paroz2015-04-024-10/+86
* | | | | Merge pull request #15383 from owncloud/fix-exception-messageMorris Jobke2015-04-032-2/+2
|\ \ \ \ \
| * | | | | Fix the exception messagesJoas Schilling2015-04-022-2/+2