summaryrefslogtreecommitdiffstats
path: root/lib/private/appframework/dependencyinjection
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5458 from owncloud/fixing-5222-masterVicDeo2013-10-231-2/+3
|\
| * fixing php 5.3.3 error:Thomas Müller2013-10-221-2/+3
* | Fix namespace for OCP\Appframework\HttpThomas Tanghus2013-10-231-1/+1
|/
* Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-161-3/+6
|\
| * Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-161-1/+3
| |\
| | * Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-011-1/+3
| * | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainerThomas Müller2013-10-081-2/+3
| |/
* / fixing SecurityMiddleware to use OC6 APIThomas Müller2013-10-071-3/+49
|/
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-301-0/+146