summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14987 from rullzer/ocs_password_fix2Morris Jobke2015-04-084-34/+341
|\
| * Fix unit testRoeland Jago Douma2015-03-301-0/+4
| * No injectionsRoeland Jago Douma2015-03-301-3/+7
| * OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-03-304-34/+333
* | Merge pull request #15469 from owncloud/fix/15463Lukas Reschke2015-04-083-6/+20
|\ \
| * | Fix language level incompatibiltiesLukas Reschke2015-04-083-6/+20
* | | Merge pull request #15464 from owncloud/fixmasterunittestsVincent Petry2015-04-0813-89/+27
|\ \ \ | |/ / |/| |
| * | Replace originalStorage in tests with a proper teardownVincent Petry2015-04-0813-89/+27
* | | Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenanceVincent Petry2015-04-081-1/+1
|\ \ \
| * | | Disable OCS api when in maintenance modeJoas Schilling2015-04-081-1/+1
* | | | Merge pull request #15443 from owncloud/encryption-user-hook-testsThomas Müller2015-04-081-0/+217
|\ \ \ \ | |/ / / |/| | |
| * | | adding test for user hooksClark Tomlinson2015-04-071-0/+217
* | | | Merge pull request #15333 from owncloud/copy-cross-deviceMorris Jobke2015-04-081-0/+13
|\ \ \ \
| * | | | fix copying folder across devicesRobin Appelman2015-03-311-0/+13
* | | | | Merge pull request #15453 from owncloud/enc2_fixMorris Jobke2015-04-081-2/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | fix function callBjoern Schiessle2015-04-081-2/+1
| | |/ / | |/| |
* | | | Merge pull request #14879 from oparoz/fix-preview-cachingMorris Jobke2015-04-073-138/+319
|\ \ \ \ | |/ / / |/| | |
| * | | Introducing the maximum size previewOlivier Paroz2015-04-073-138/+319
* | | | Merge pull request #15441 from owncloud/fix-file-headers-masterMorris Jobke2015-04-0749-314/+461
|\ \ \ \
| * | | | fixing license headers - encryption code relatedThomas Müller2015-04-0749-314/+461
|/ / / /
* | | | Merge pull request #14472 from owncloud/feature/wipencryptionappThomas Müller2015-04-07303-17549/+5541
|\ \ \ \ | |/ / / |/| | |
| * | | fixing unit test - expected value change due to different size being stored i...Thomas Müller2015-04-072-2/+2
| * | | In case of encryption exceptions we return 503 - this will allow the client t...Thomas Müller2015-04-071-55/+69
| * | | fixing unit test execution related to trashbinThomas Müller2015-04-073-1/+28
| * | | fixing unit testsThomas Müller2015-04-071-1/+7
| * | | respect mount option while encryptingThomas Müller2015-04-071-1/+6
| * | | adding user setup test and adding 4 tests to keymanagerClark Tomlinson2015-04-072-13/+144
| * | | adding recoverFileTestClark Tomlinson2015-04-071-2/+43
| * | | adding recovery testsClark Tomlinson2015-04-071-0/+224
| * | | fixing unit test execution - test dummy module was behaving wrongThomas Müller2015-04-072-2/+2
| * | | fixing unit test executionThomas Müller2015-04-071-7/+12
| * | | PHPDoc cleanup - clean code \o/Thomas Müller2015-04-076-43/+42
| * | | userRecovery() was replaced by setRecoveryForUser()Bjoern Schiessle2015-04-072-17/+0
| * | | comment change as it broke unit testsThomas Müller2015-04-071-1/+1
| * | | Encryption storage wrapper is enabled by default - necessary to detect encryp...Thomas Müller2015-04-072-5/+14
| * | | fix versions testsBjoern Schiessle2015-04-071-0/+6
| * | | add unit tests to the keystorageBjoern Schiessle2015-04-072-41/+46
| * | | implement webdav copyBjoern Schiessle2015-04-074-13/+138
| * | | Using stream_get_contents in file_get_contents implementation + close handleThomas Müller2015-04-071-12/+7
| * | | Adjusting count on readjknockaert2015-04-071-1/+2
| * | | Properly set size and unencrypted size in the stream unit testsThomas Müller2015-04-071-9/+8
| * | | remove unused codeBjoern Schiessle2015-04-071-1/+0
| * | | fix versions download and previewsBjoern Schiessle2015-04-072-3/+94
| * | | Adding unit test for read and write of big fileThomas Müller2015-04-071-0/+16
| * | | Fixing encryption stream wrapper seek - thanks @jknockaertjknockaert2015-04-071-0/+3
| * | | Fixing encryption storage wrapper testsThomas Müller2015-04-074-9/+133
| * | | Introducing trait LocalTempFileTraitThomas Müller2015-04-072-40/+88
| * | | reset init status before loginBjoern Schiessle2015-04-071-1/+7
| * | | cleanupThomas Müller2015-04-073-29/+15
| * | | fixing unit tests for encryption stream wrapper seekThomas Müller2015-04-071-0/+13