Bjoern Schiessle
|
8b08b1b455
|
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/private/util.php
|
2013-10-02 10:11:18 +02:00 |
Bart Visscher
|
b35b22977c
|
Move legacy file to correct location
|
2013-10-02 09:15:31 +02:00 |
|
Bart Visscher
|
46b5202f4a
|
Merge branch 'master' into convert-oc_appconfig
|
2013-10-02 07:42:06 +02:00 |
Thomas Müller
|
4cecede13d
|
code cleanup - remove special case for webdav in handleApacheAuth()
|
2013-10-02 00:55:35 +02:00 |
|
Thomas Müller
|
7e9e23f210
|
Merge branch 'master' into apache-auth-master
|
2013-10-02 00:21:11 +02:00 |
|
Thomas Müller
|
9eab8b39df
|
Merge branch 'master' into fixing-4620-master
|
2013-10-01 22:57:46 +02:00 |
Thomas Tanghus
|
0f13ffb773
|
Remove JSON request parsing from Server
|
2013-10-01 20:15:04 +02:00 |
|
Thomas Tanghus
|
973bcccd7c
|
Implement PUT an PATCH support
|
2013-10-01 20:13:13 +02:00 |
|
Thomas Tanghus
|
cd2e1d0cfe
|
Add patch method to OC_Route
|
2013-10-01 20:13:13 +02:00 |
|
Thomas Tanghus
|
bdad7697ac
|
Check if accessor matched request method.
It's easier to find errors in the code if an exception is thrown.
|
2013-10-01 20:13:13 +02:00 |
|
Thomas Tanghus
|
8603f956ab
|
Get urlParams registered before Request is instantiated
|
2013-10-01 19:03:34 +02:00 |
|
Thomas Müller
|
e2fe71b6e7
|
Merge branch 'master' into lib-private-master-2
|
2013-10-01 16:11:59 +02:00 |
|
Thomas Müller
|
02d6976263
|
Merge branch 'master' into lib-private-master-2
|
2013-09-30 21:29:58 +02:00 |
|
Thomas Müller
|
8e0060405d
|
reorganize file in lib
|
2013-09-30 16:39:03 +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 |