Thomas Müller
|
fdeef5e874
|
Merge branch 'master' into fixing-appframework-master
Conflicts:
lib/private/appframework/middleware/security/securitymiddleware.php
tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
|
2013-10-16 15:45:55 +02:00 |
|
Thomas Müller
|
c3f7d22adc
|
Merge pull request #5067 from owncloud/urlParams_fix
Get urlParams registered before Request is instantiated
|
2013-10-16 06:42:09 -07:00 |
|
Thomas Müller
|
7bd5352509
|
php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer
|
2013-10-08 23:14:08 +02:00 |
|
Thomas Müller
|
e071bfc144
|
fixing SecurityMiddleware to use OC6 API
|
2013-10-07 00:33:54 +02:00 |
Thomas Tanghus
|
8603f956ab
|
Get urlParams registered before Request is instantiated
|
2013-10-01 19:03:34 +02:00 |
|
Thomas Müller
|
9c9dc276b7
|
move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
lib/private/vcategories.php
|
2013-09-30 16:36:59 +02:00 |