Thomas Müller
|
221a650815
|
Merge branch 'master' into activities-api
Conflicts:
lib/private/server.php
|
2013-10-16 21:15:25 +02:00 |
|
Thomas Müller
|
926b3c9b7b
|
Merge branch 'master' into activities-api
|
2013-10-09 17:53:57 +02:00 |
|
Thomas Müller
|
780280e53f
|
fixing errors regarding wrong function calls / missing parameters
|
2013-10-07 00:35:05 +02:00 |
Bart Visscher
|
21cbef0d2c
|
passesCSRFCheck added to OCP\IRequest
|
2013-10-04 18:13:04 +02:00 |
|
Bart Visscher
|
61a9098b7d
|
Add Helper and URLGenerator interfaces to server container
|
2013-10-04 18:11:02 +02:00 |
|
Bart Visscher
|
9f777fba98
|
Add L10N interface to server container
|
2013-10-04 18:11:02 +02:00 |
Thomas Tanghus
|
0f13ffb773
|
Remove JSON request parsing from Server
|
2013-10-01 20:15:04 +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 |