Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Do not return shares for files outside "files" | Vincent Petry | 2015-03-27 | 1 | -11/+48 |
* | Merge pull request #15227 from owncloud/ocetag-header | Vincent Petry | 2015-03-27 | 1 | -0/+46 |
|\ | |||||
| * | Copy Etag header to OC-Etag for sabre calls | Vincent Petry | 2015-03-26 | 1 | -0/+46 |
* | | Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-us... | Morris Jobke | 2015-03-27 | 1 | -0/+9 |
|\ \ | |||||
| * | | Add some generic default headers as well via PHP | Lukas Reschke | 2015-03-26 | 1 | -0/+9 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-27 | 124 | -510/+12 |
* | | | Filter potential dangerous characters in path name | Lukas Reschke | 2015-03-26 | 1 | -0/+5 |
* | | | Merge pull request #13654 from oparoz/tmpfile-with-extension | Vincent Petry | 2015-03-26 | 2 | -3/+10 |
|\ \ \ | |||||
| * | | | Make the method compatible with all types of extensions | Olivier Paroz | 2015-03-19 | 1 | -1/+4 |
| * | | | Fix the office class | Olivier Paroz | 2015-03-19 | 1 | -3/+7 |
| * | | | Keep the extension in temp files | Olivier Paroz | 2015-03-19 | 1 | -1/+1 |
* | | | | Merge pull request #14925 from owncloud/ext-mountoptions-ui | Robin McCorkell | 2015-03-26 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Make sure mountOptions keep their data type | Vincent Petry | 2015-03-26 | 1 | -1/+1 |
* | | | | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 1 | -6/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Fix permission checks in Sabre connector | Vincent Petry | 2015-03-19 | 1 | -6/+15 |
* | | | | | | Merge pull request #14488 from owncloud/enhancement/security/inline-disposition | Morris Jobke | 2015-03-26 | 1 | -0/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove unneeded argument | Lukas Reschke | 2015-03-26 | 1 | -1/+1 |
| * | | | | | | Serve all files with a Content-Disposition of 'attachment' via WebDAV | Lukas Reschke | 2015-03-26 | 1 | -0/+19 |
* | | | | | | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 16 | -2/+2244 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | implement basic encryption functionallity in core to enable multiple encrypti... | Bjoern Schiessle | 2015-03-26 | 16 | -2/+2244 |
* | | | | | | | Merge pull request #14399 from owncloud/ignore-empty-plurals | Lukas Reschke | 2015-03-26 | 2 | -21/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Revert "Correctly fallback to english, if the plural case is not translated" | Joas Schilling | 2015-02-20 | 2 | -21/+3 |
* | | | | | | | Merge pull request #15129 from owncloud/version-command-bus | Lukas Reschke | 2015-03-26 | 3 | -3/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | check limit of serialized command in unit tests | Robin Appelman | 2015-03-26 | 1 | -0/+3 |
| * | | | | | | | ensure commands can be serialized in unit tests | Robin Appelman | 2015-03-26 | 1 | -1/+4 |
| * | | | | | | | Handle exceptions thrown during hooks when running unit tests | Robin Appelman | 2015-03-26 | 1 | -0/+3 |
| * | | | | | | | Force test cases using background commands to handle setting up the filesystem | Robin Appelman | 2015-03-26 | 2 | -2/+6 |
* | | | | | | | | Merge pull request #15232 from owncloud/remove-arg-separator-magic | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove custom `arg_separator.output` | Lukas Reschke | 2015-03-26 | 1 | -1/+0 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #14665 from owncloud/fileid-increment | Morris Jobke | 2015-03-26 | 4 | -0/+123 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add repair step to fix SQLite autoincrement | Vincent Petry | 2015-03-26 | 2 | -0/+87 |
| * | | | | | | | | Rename platform | Robin Appelman | 2015-03-25 | 2 | -2/+2 |
| * | | | | | | | | Add custom sqlite platform to set auto increment | Robin Appelman | 2015-03-25 | 2 | -0/+36 |
* | | | | | | | | | Merge pull request #14495 from owncloud/update-mailmap-01 | Thomas Müller | 2015-03-26 | 473 | -3403/+8997 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 473 | -3403/+8997 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-list | Joas Schilling | 2015-03-26 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Correctly only send the errors of the current file to the event | Joas Schilling | 2015-03-26 | 1 | -2/+3 |
* | | | | | | | | Revert "adding OC-ETag header" | Vincent Petry | 2015-03-26 | 2 | -20/+2 |
* | | | | | | | | Revert "adding unit tests" | Vincent Petry | 2015-03-26 | 1 | -2/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #15168 from owncloud/oc-etag-master | Vincent Petry | 2015-03-26 | 2 | -2/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | adding unit tests | Thomas Müller | 2015-03-26 | 1 | -5/+2 |
| * | | | | | | | adding OC-ETag header | Thomas Müller | 2015-03-24 | 2 | -2/+20 |
* | | | | | | | | Merge pull request #14125 from dratini0/master | Lukas Reschke | 2015-03-26 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Removed simplified X-accel-redirect even further | dratini0 | 2015-03-23 | 1 | -6/+1 |
| * | | | | | | | Changed the disputed while loop to a single if. | dratini0 | 2015-03-23 | 1 | -2/+2 |
| * | | | | | | | Extending the X-accel redirect functionality with a more scalable approach. | dratini0 | 2015-02-11 | 1 | -1/+10 |
| * | | | | | | | Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts" | dratini0 | 2015-02-11 | 1 | -1/+1 |
| * | | | | | | | Revert "removed a little duplication" | dratini0 | 2015-02-11 | 1 | -1/+3 |
* | | | | | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzle | Morris Jobke | 2015-03-26 | 14 | -174/+812 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 14 | -174/+812 |
| | |_|/ / / / / | |/| | | | | | |