Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16565 from owncloud/add-urandom-check | Thomas Müller | 2015-05-26 | 1 | -1/+7 |
|\ | |||||
| * | Add check for availability of /dev/urandom | Lukas Reschke | 2015-05-26 | 1 | -1/+7 |
* | | Merge pull request #16561 from owncloud/add-default-timeout-back | Björn Schießle | 2015-05-26 | 1 | -2/+73 |
|\ \ | |||||
| * | | Add connection timeout to default POST options | Lukas Reschke | 2015-05-26 | 1 | -2/+73 |
| |/ | |||||
* | | Merge pull request #16532 from owncloud/cors-no-cookie-auth | Vincent Petry | 2015-05-26 | 1 | -4/+71 |
|\ \ | |||||
| * | | disallow cookie auth for cors requests | Bernhard Posselt | 2015-05-22 | 1 | -4/+71 |
| |/ | |||||
* | | Merge pull request #16452 from owncloud/enc_ftp_upload | Björn Schießle | 2015-05-26 | 2 | -3/+84 |
|\ \ | |||||
| * | | test to simulate a non-seekable stream wrapper | Bjoern Schiessle | 2015-05-21 | 2 | -3/+84 |
* | | | Merge pull request #16339 from owncloud/master-override-channel | Thomas Müller | 2015-05-26 | 1 | -0/+47 |
|\ \ \ | |||||
| * | | | Test overriding channel | Victor Dubiniuk | 2015-05-15 | 1 | -0/+47 |
* | | | | Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload | Vincent Petry | 2015-05-22 | 2 | -1/+23 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | remove part file extension before we read a filekey to reuse a existing key i... | Bjoern Schiessle | 2015-05-22 | 2 | -1/+23 |
* | | | | Get correct mimetype when moving and changing extension | Vincent Petry | 2015-05-21 | 1 | -7/+19 |
|/ / / | |||||
* | | | Merge pull request #16322 from owncloud/trash-view | Morris Jobke | 2015-05-20 | 1 | -12/+25 |
|\ \ \ | |||||
| * | | | add tests for copyFromStorage with same storage | Robin Appelman | 2015-05-19 | 1 | -12/+25 |
* | | | | Merge pull request #16075 from owncloud/skeleton-copy-delay | Vincent Petry | 2015-05-20 | 2 | -5/+4 |
|\ \ \ \ | |||||
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 1 | -5/+1 |
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 1 | -1/+3 |
| * | | | | fix tests | Robin Appelman | 2015-05-18 | 1 | -0/+1 |
* | | | | | Add support for disallowing domains to the ContentSecurityPolicy | Lukas Reschke | 2015-05-20 | 1 | -0/+216 |
* | | | | | Merge pull request #16446 from owncloud/fix-url-generation | Lukas Reschke | 2015-05-20 | 1 | -1/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Added unit tests for download URL in public sharing page | Vincent Petry | 2015-05-19 | 1 | -1/+2 |
* | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2015-05-19 | 2 | -2/+0 |
|/ / / / / | |||||
* | | | | | Merge pull request #16420 from owncloud/update-useconfigtableprefix | Morris Jobke | 2015-05-19 | 1 | -1/+28 |
|\ \ \ \ \ | |||||
| * | | | | | Add unit test for migrator with different prefix | Vincent Petry | 2015-05-19 | 1 | -1/+28 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #15965 from owncloud/conditional-logging | Thomas Müller | 2015-05-19 | 1 | -3/+27 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Conditional logging | Morris Jobke | 2015-05-08 | 1 | -3/+27 |
* | | | | | Merge pull request #16412 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -2/+10 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | add a unit test to make sure that we don't try to read a file during a write ... | Bjoern Schiessle | 2015-05-18 | 1 | -2/+10 |
* | | | | | Merge pull request #16399 from owncloud/enc_rmdir_fix | Clark Tomlinson | 2015-05-18 | 1 | -7/+74 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | only try to delete file keys if it is a valid path | Bjoern Schiessle | 2015-05-18 | 1 | -7/+74 |
* | | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1 | Björn Schießle | 2015-05-18 | 1 | -10/+11 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | correct testSeek | jknockaert | 2015-05-18 | 1 | -4/+4 |
| * | | | | work on tests | jknockaert | 2015-05-18 | 1 | -10/+11 |
* | | | | | Merge pull request #16243 from owncloud/error_if_download_failed | Vincent Petry | 2015-05-18 | 2 | -3/+9 |
|\ \ \ \ \ | |||||
| * | | | | | a new approach to display the error message | Bjoern Schiessle | 2015-05-18 | 2 | -3/+9 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #16364 from owncloud/add-warning-webdav | Morris Jobke | 2015-05-18 | 1 | -0/+65 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add unit tests for \OC\Connector\Sabre\DummyGetResponsePlugin | Lukas Reschke | 2015-05-15 | 1 | -0/+65 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips | Thomas Müller | 2015-05-15 | 1 | -9/+9 |
|\ \ \ \ | |||||
| * | | | | fixing test | Clark Tomlinson | 2015-05-11 | 1 | -9/+9 |
* | | | | | Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota | Vincent Petry | 2015-05-15 | 1 | -9/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Validate the quota value to be a correct value | Thomas Müller | 2015-05-07 | 1 | -9/+10 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection | Thomas Müller | 2015-05-15 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | do not execute integration tests when executing autotest.sh | Thomas Müller | 2015-05-15 | 1 | -0/+3 |
* | | | | | | Merge pull request #16292 from owncloud/webdav-storage-fireprehooks | Joas Schilling | 2015-05-15 | 2 | -38/+306 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fire prehooks when uploading directly to storage | Vincent Petry | 2015-05-13 | 2 | -38/+306 |
* | | | | | | | Properly log out test users in unit tests | Vincent Petry | 2015-05-15 | 1 | -0/+2 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge pull request #16276 from owncloud/dav-quota-root | Robin Appelman | 2015-05-13 | 1 | -1/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Added unit test to quota plugin for free_space argument | Vincent Petry | 2015-05-13 | 1 | -1/+4 |
* | | | | | | Merge pull request #16228 from owncloud/enc_fix_restore | Björn Schießle | 2015-05-12 | 2 | -14/+112 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |