Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #15194 from owncloud/fix-15146 | Thomas Müller | 2015-03-26 | 1 | -0/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Do not use APCu when apc.enabled is Off. | Andreas Fischer | 2015-03-25 | 1 | -0/+2 |
| |/ / / / / | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-26 | 2 | -0/+30 |
* | | | | | | Revert "FIX for webdav.mediencenter.t-online.de" | Morris Jobke | 2015-03-26 | 1 | -5/+0 |
* | | | | | | FIX for webdav.mediencenter.t-online.de | Oliver Kohl D.Sc. | 2015-03-25 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-03-25 | 8 | -0/+18 |
* | | | | | Merge pull request #15171 from owncloud/sabre-logforbiddenasdebug | Thomas Müller | 2015-03-24 | 1 | -0/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Log forbidden in debug level | Vincent Petry | 2015-03-24 | 1 | -0/+3 |
* | | | | | | Merge pull request #14949 from owncloud/sabre-2.1.3 | Lukas Reschke | 2015-03-24 | 1 | -1/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix Principal connector override | Vincent Petry | 2015-03-17 | 1 | -1/+2 |
* | | | | | | Merge pull request #15153 from owncloud/uniquename-node | Lukas Reschke | 2015-03-24 | 2 | -0/+21 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add `getNonExistingName()` to the node api | Robin Appelman | 2015-03-24 | 2 | -0/+21 |
* | | | | | | Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryption | Vincent Petry | 2015-03-24 | 1 | -14/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove range header exception for encryption | jknockaert | 2015-03-24 | 1 | -14/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #15126 from owncloud/sabre-storagenotavailable | Morris Jobke | 2015-03-24 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Soft fail in CustomPropertiesBackend whenever storage not available | Vincent Petry | 2015-03-23 | 1 | -0/+4 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #15149 from owncloud/fix-enable-for-group | Joas Schilling | 2015-03-24 | 1 | -1/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly get array of groups and send OCP\IGroup objects to enable method | Joas Schilling | 2015-03-24 | 1 | -1/+9 |
| | |/ / / / | |/| | | | |