Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 1 | -4/+6 |
|\ | |||||
| * | fix failing unit test | Morris Jobke | 2015-03-17 | 1 | -4/+6 |
* | | Merge pull request #15240 from owncloud/storage-wrapper-priority | Thomas Müller | 2015-03-27 | 1 | -0/+27 |
|\ \ | |||||
| * | | add priority to storage wrappers | Robin Appelman | 2015-03-26 | 1 | -0/+27 |
* | | | Merge pull request #15261 from owncloud/fix-14268-master | Thomas Müller | 2015-03-27 | 1 | -9/+3 |
|\ \ \ | |||||
| * | | | use StreamResponse to download the log file - fixes #14268 | Thomas Müller | 2015-03-27 | 1 | -9/+3 |
* | | | | Merge pull request #15265 from owncloud/enc2_fixes | Thomas Müller | 2015-03-27 | 1 | -0/+35 |
|\ \ \ \ | |||||
| * | | | | fix check if a file is excluded from encryption or not | Bjoern Schiessle | 2015-03-27 | 1 | -0/+35 |
| |/ / / | |||||
* | | | | Merge pull request #15227 from owncloud/ocetag-header | Vincent Petry | 2015-03-27 | 1 | -0/+43 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Copy Etag header to OC-Etag for sabre calls | Vincent Petry | 2015-03-26 | 1 | -0/+43 |
| |/ / | |||||
* | | | Merge pull request #15252 from owncloud/prevent-directory-characters-in-tempo... | Thomas Müller | 2015-03-27 | 1 | -0/+13 |
|\ \ \ | |||||
| * | | | Filter potential dangerous characters in path name | Lukas Reschke | 2015-03-26 | 1 | -0/+13 |
* | | | | Merge pull request #15255 from owncloud/test-namespacesforrepairtests | Morris Jobke | 2015-03-27 | 4 | -4/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix namespace for repair step tests | Vincent Petry | 2015-03-26 | 4 | -4/+7 |
* | | | | Merge pull request #13654 from oparoz/tmpfile-with-extension | Vincent Petry | 2015-03-26 | 1 | -6/+6 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Make the method compatible with all types of extensions | Olivier Paroz | 2015-03-19 | 1 | -6/+6 |
* | | | | Merge pull request #13802 from owncloud/share-partfilepermissions | Morris Jobke | 2015-03-26 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix share permission related unit tests | Vincent Petry | 2015-03-20 | 1 | -2/+2 |
* | | | | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 3 | -0/+495 |
|\ \ \ \ \ | |||||
| * | | | | | implement basic encryption functionallity in core to enable multiple encrypti... | Bjoern Schiessle | 2015-03-26 | 3 | -0/+495 |
* | | | | | | Merge pull request #14399 from owncloud/ignore-empty-plurals | Lukas Reschke | 2015-03-26 | 2 | -20/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Revert "Correctly fallback to english, if the plural case is not translated" | Joas Schilling | 2015-02-20 | 2 | -20/+1 |
* | | | | | | | Merge pull request #15129 from owncloud/version-command-bus | Lukas Reschke | 2015-03-26 | 1 | -1/+24 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Handle exceptions thrown during hooks when running unit tests | Robin Appelman | 2015-03-26 | 1 | -0/+8 |
| * | | | | | | | Force test cases using background commands to handle setting up the filesystem | Robin Appelman | 2015-03-26 | 1 | -1/+16 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #14665 from owncloud/fileid-increment | Morris Jobke | 2015-03-26 | 2 | -0/+94 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add repair step to fix SQLite autoincrement | Vincent Petry | 2015-03-26 | 1 | -0/+81 |
| * | | | | | | SQLite autoincrement test | Vincent Petry | 2015-03-25 | 1 | -0/+13 |
* | | | | | | | Revert "adding unit tests" | Vincent Petry | 2015-03-26 | 1 | -31/+0 |
* | | | | | | | Merge pull request #15168 from owncloud/oc-etag-master | Vincent Petry | 2015-03-26 | 1 | -0/+31 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | adding unit tests | Thomas Müller | 2015-03-26 | 1 | -0/+31 |
| |/ / / / / / | |||||
* / / / / / / | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 6 | -26/+179 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #15153 from owncloud/uniquename-node | Lukas Reschke | 2015-03-24 | 1 | -0/+36 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add `getNonExistingName()` to the node api | Robin Appelman | 2015-03-24 | 1 | -0/+36 |
* | | | | | | | Merge pull request #15126 from owncloud/sabre-storagenotavailable | Morris Jobke | 2015-03-24 | 1 | -1/+11 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Soft fail in CustomPropertiesBackend whenever storage not available | Vincent Petry | 2015-03-23 | 1 | -1/+11 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | The iran timezone removed the DST handling which breaks the timezone lib | Joas Schilling | 2015-03-23 | 1 | -3/+1 |
|/ / / / / | |||||
* | | | | | Introducing 3D images support (media type) | Olivier Paroz | 2015-03-20 | 1 | -284/+250 |
* | | | | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Create an interface for OC_Image and OCP\Image for the public API | Joas Schilling | 2015-03-16 | 1 | -0/+4 |
* | | | | | | Merge pull request #11884 from owncloud/ext-appframework | Vincent Petry | 2015-03-20 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use storage id + appframework for ext storage CRUD | Vincent Petry | 2015-03-12 | 1 | -1/+2 |
* | | | | | | | Merge pull request #14993 from owncloud/stop-on-missing-deps | Thomas Müller | 2015-03-20 | 1 | -20/+20 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not add apps2/ directory if it does not exist | Joas Schilling | 2015-03-19 | 1 | -20/+20 |
* | | | | | | | | Merge pull request #15035 from owncloud/assocmapper | Morris Jobke | 2015-03-20 | 2 | -25/+54 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | If the execute method on the mapper receives an assoc array, it binds by valu... | Bernhard Posselt | 2015-03-19 | 2 | -25/+54 |
* | | | | | | | | | Merge pull request #14947 from oparoz/repairmimetypes-sql | Morris Jobke | 2015-03-19 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Adding test cases where the extension is using capital letters | Olivier Paroz | 2015-03-17 | 1 | -1/+5 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #15025 from rullzer/ocs_respect_enforced_date | Thomas Müller | 2015-03-19 | 1 | -0/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Added unit test | Roeland Jago Douma | 2015-03-19 | 1 | -0/+35 |
| | |_|_|_|_|/ / | |/| | | | | | |