Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14987 from rullzer/ocs_password_fix2 | Morris Jobke | 2015-04-08 | 4 | -34/+341 |
|\ | |||||
| * | Fix unit test | Roeland Jago Douma | 2015-03-30 | 1 | -0/+4 |
| * | No injections | Roeland Jago Douma | 2015-03-30 | 1 | -3/+7 |
| * | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 4 | -34/+333 |
* | | Merge pull request #15469 from owncloud/fix/15463 | Lukas Reschke | 2015-04-08 | 3 | -6/+20 |
|\ \ | |||||
| * | | Fix language level incompatibilties | Lukas Reschke | 2015-04-08 | 3 | -6/+20 |
* | | | Merge pull request #15464 from owncloud/fixmasterunittests | Vincent Petry | 2015-04-08 | 13 | -89/+27 |
|\ \ \ | |/ / |/| | | |||||
| * | | Replace originalStorage in tests with a proper teardown | Vincent Petry | 2015-04-08 | 13 | -89/+27 |
* | | | Merge pull request #15465 from owncloud/issue/15456-disable-ocs-maintenance | Vincent Petry | 2015-04-08 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Disable OCS api when in maintenance mode | Joas Schilling | 2015-04-08 | 1 | -1/+1 |
* | | | | Merge pull request #15443 from owncloud/encryption-user-hook-tests | Thomas Müller | 2015-04-08 | 1 | -0/+217 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | adding test for user hooks | Clark Tomlinson | 2015-04-07 | 1 | -0/+217 |
* | | | | Merge pull request #15333 from owncloud/copy-cross-device | Morris Jobke | 2015-04-08 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | fix copying folder across devices | Robin Appelman | 2015-03-31 | 1 | -0/+13 |
* | | | | | Merge pull request #15453 from owncloud/enc2_fix | Morris Jobke | 2015-04-08 | 1 | -2/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | fix function call | Bjoern Schiessle | 2015-04-08 | 1 | -2/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #14879 from oparoz/fix-preview-caching | Morris Jobke | 2015-04-07 | 3 | -138/+319 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Introducing the maximum size preview | Olivier Paroz | 2015-04-07 | 3 | -138/+319 |
* | | | | Merge pull request #15441 from owncloud/fix-file-headers-master | Morris Jobke | 2015-04-07 | 49 | -314/+461 |
|\ \ \ \ | |||||
| * | | | | fixing license headers - encryption code related | Thomas Müller | 2015-04-07 | 49 | -314/+461 |
|/ / / / | |||||
* | | | | Merge pull request #14472 from owncloud/feature/wipencryptionapp | Thomas Müller | 2015-04-07 | 303 | -17549/+5541 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | fixing unit test - expected value change due to different size being stored i... | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
| * | | | In case of encryption exceptions we return 503 - this will allow the client t... | Thomas Müller | 2015-04-07 | 1 | -55/+69 |
| * | | | fixing unit test execution related to trashbin | Thomas Müller | 2015-04-07 | 3 | -1/+28 |
| * | | | fixing unit tests | Thomas Müller | 2015-04-07 | 1 | -1/+7 |
| * | | | respect mount option while encrypting | Thomas Müller | 2015-04-07 | 1 | -1/+6 |
| * | | | adding user setup test and adding 4 tests to keymanager | Clark Tomlinson | 2015-04-07 | 2 | -13/+144 |
| * | | | adding recoverFileTest | Clark Tomlinson | 2015-04-07 | 1 | -2/+43 |
| * | | | adding recovery tests | Clark Tomlinson | 2015-04-07 | 1 | -0/+224 |
| * | | | fixing unit test execution - test dummy module was behaving wrong | Thomas Müller | 2015-04-07 | 2 | -2/+2 |
| * | | | fixing unit test execution | Thomas Müller | 2015-04-07 | 1 | -7/+12 |
| * | | | PHPDoc cleanup - clean code \o/ | Thomas Müller | 2015-04-07 | 6 | -43/+42 |
| * | | | userRecovery() was replaced by setRecoveryForUser() | Bjoern Schiessle | 2015-04-07 | 2 | -17/+0 |
| * | | | comment change as it broke unit tests | Thomas Müller | 2015-04-07 | 1 | -1/+1 |
| * | | | Encryption storage wrapper is enabled by default - necessary to detect encryp... | Thomas Müller | 2015-04-07 | 2 | -5/+14 |
| * | | | fix versions tests | Bjoern Schiessle | 2015-04-07 | 1 | -0/+6 |
| * | | | add unit tests to the keystorage | Bjoern Schiessle | 2015-04-07 | 2 | -41/+46 |
| * | | | implement webdav copy | Bjoern Schiessle | 2015-04-07 | 4 | -13/+138 |
| * | | | Using stream_get_contents in file_get_contents implementation + close handle | Thomas Müller | 2015-04-07 | 1 | -12/+7 |
| * | | | Adjusting count on read | jknockaert | 2015-04-07 | 1 | -1/+2 |
| * | | | Properly set size and unencrypted size in the stream unit tests | Thomas Müller | 2015-04-07 | 1 | -9/+8 |
| * | | | remove unused code | Bjoern Schiessle | 2015-04-07 | 1 | -1/+0 |
| * | | | fix versions download and previews | Bjoern Schiessle | 2015-04-07 | 2 | -3/+94 |
| * | | | Adding unit test for read and write of big file | Thomas Müller | 2015-04-07 | 1 | -0/+16 |
| * | | | Fixing encryption stream wrapper seek - thanks @jknockaert | jknockaert | 2015-04-07 | 1 | -0/+3 |
| * | | | Fixing encryption storage wrapper tests | Thomas Müller | 2015-04-07 | 4 | -9/+133 |
| * | | | Introducing trait LocalTempFileTrait | Thomas Müller | 2015-04-07 | 2 | -40/+88 |
| * | | | reset init status before login | Bjoern Schiessle | 2015-04-07 | 1 | -1/+7 |
| * | | | cleanup | Thomas Müller | 2015-04-07 | 3 | -29/+15 |
| * | | | fixing unit tests for encryption stream wrapper seek | Thomas Müller | 2015-04-07 | 1 | -0/+13 |