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
|
6df5c7ebd5
|
streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.
|
2013-10-14 21:33:23 +02:00 |
|
Thomas Müller
|
780280e53f
|
fixing errors regarding wrong function calls / missing parameters
|
2013-10-07 00:35:05 +02:00 |
Bart Visscher
|
61a9098b7d
|
Add Helper and URLGenerator interfaces to server container
|
2013-10-04 18:11:02 +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 |