summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Filter potential dangerous characters in path nameLukas Reschke2015-03-261-0/+5
* Merge pull request #13654 from oparoz/tmpfile-with-extensionVincent Petry2015-03-262-3/+10
|\
| * Make the method compatible with all types of extensionsOlivier Paroz2015-03-191-1/+4
| * Fix the office classOlivier Paroz2015-03-191-3/+7
| * Keep the extension in temp filesOlivier Paroz2015-03-191-1/+1
* | Merge pull request #14925 from owncloud/ext-mountoptions-uiRobin McCorkell2015-03-261-1/+1
|\ \
| * | Make sure mountOptions keep their data typeVincent Petry2015-03-261-1/+1
* | | Merge pull request #13802 from owncloud/share-partfilepermissionsMorris Jobke2015-03-261-6/+15
|\ \ \
| * | | Fix permission checks in Sabre connectorVincent Petry2015-03-191-6/+15
* | | | Merge pull request #14488 from owncloud/enhancement/security/inline-dispositionMorris Jobke2015-03-261-0/+19
|\ \ \ \
| * | | | Remove unneeded argumentLukas Reschke2015-03-261-1/+1
| * | | | Serve all files with a Content-Disposition of 'attachment' via WebDAVLukas Reschke2015-03-261-0/+19
* | | | | Merge pull request #15234 from owncloud/encryption2_coreThomas Müller2015-03-2612-0/+1877
|\ \ \ \ \
| * | | | | implement basic encryption functionallity in core to enable multiple encrypti...Bjoern Schiessle2015-03-2612-0/+1877
* | | | | | Merge pull request #14399 from owncloud/ignore-empty-pluralsLukas Reschke2015-03-262-21/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Revert "Correctly fallback to english, if the plural case is not translated"Joas Schilling2015-02-202-21/+3
* | | | | | Merge pull request #15129 from owncloud/version-command-busLukas Reschke2015-03-263-3/+16
|\ \ \ \ \ \
| * | | | | | check limit of serialized command in unit testsRobin Appelman2015-03-261-0/+3
| * | | | | | ensure commands can be serialized in unit testsRobin Appelman2015-03-261-1/+4
| * | | | | | Handle exceptions thrown during hooks when running unit testsRobin Appelman2015-03-261-0/+3
| * | | | | | Force test cases using background commands to handle setting up the filesystemRobin Appelman2015-03-262-2/+6
* | | | | | | Merge pull request #14665 from owncloud/fileid-incrementMorris Jobke2015-03-263-0/+38
|\ \ \ \ \ \ \
| * | | | | | | Add repair step to fix SQLite autoincrementVincent Petry2015-03-261-0/+2
| * | | | | | | Rename platformRobin Appelman2015-03-252-2/+2
| * | | | | | | Add custom sqlite platform to set auto incrementRobin Appelman2015-03-252-0/+36
* | | | | | | | Merge pull request #14495 from owncloud/update-mailmap-01Thomas Müller2015-03-26323-2093/+6562
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Update license headersJenkins for ownCloud2015-03-26323-2093/+6562
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #15224 from owncloud/issue/15191-app-code-checker-error-listJoas Schilling2015-03-261-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Correctly only send the errors of the current file to the eventJoas Schilling2015-03-261-2/+3
* | | | | | | | Revert "adding OC-ETag header"Vincent Petry2015-03-262-20/+2
* | | | | | | | Revert "adding unit tests"Vincent Petry2015-03-261-2/+5
|/ / / / / / /
* | | | | | | Merge pull request #15168 from owncloud/oc-etag-masterVincent Petry2015-03-262-2/+17
|\ \ \ \ \ \ \
| * | | | | | | adding unit testsThomas Müller2015-03-261-5/+2
| * | | | | | | adding OC-ETag headerThomas Müller2015-03-242-2/+20
* | | | | | | | Merge pull request #14125 from dratini0/masterLukas Reschke2015-03-261-1/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Removed simplified X-accel-redirect even furtherdratini02015-03-231-6/+1
| * | | | | | | Changed the disputed while loop to a single if.dratini02015-03-231-2/+2
| * | | | | | | Extending the X-accel redirect functionality with a more scalable approach.dratini02015-02-111-1/+10
| * | | | | | | Revert "Fix: X-Accel-Redirect did not support custom data dir and local mounts"dratini02015-02-111-1/+1
| * | | | | | | Revert "removed a little duplication"dratini02015-02-111-1/+3
* | | | | | | | Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-269-174/+488
|\ \ \ \ \ \ \ \
| * | | | | | | | Add wrapper for GuzzleLukas Reschke2015-03-259-174/+488
| | |_|/ / / / / | |/| | | | | |
* / | | | | | | Do not use APCu when apc.enabled is Off.Andreas Fischer2015-03-251-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #15171 from owncloud/sabre-logforbiddenasdebugThomas Müller2015-03-241-0/+3
|\ \ \ \ \ \ \
| * | | | | | | Log forbidden in debug levelVincent Petry2015-03-241-0/+3
* | | | | | | | Merge pull request #14949 from owncloud/sabre-2.1.3Lukas Reschke2015-03-241-1/+2
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix Principal connector overrideVincent Petry2015-03-171-1/+2
* | | | | | | | Merge pull request #15153 from owncloud/uniquename-nodeLukas Reschke2015-03-241-0/+12
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add `getNonExistingName()` to the node apiRobin Appelman2015-03-241-0/+12
* | | | | | | | Merge pull request #15150 from owncloud/sabre-removerangeexceptionforencryptionVincent Petry2015-03-241-14/+0
|\ \ \ \ \ \ \ \