Commit graph

27 commits

Author SHA1 Message Date
Thomas Müller
596177727a OCS API calls will always return English messages 2014-04-15 15:32:08 +02:00
Thomas Müller
6ff96b34ad Merge branch 'master' into load-apps-proper-master
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
2014-03-21 14:05:08 +01:00
Thomas Müller
756bbe8786 Merge pull request #7649 from owncloud/routing-public
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Thomas Müller
88f6dd7db1 fixing method names 2014-03-12 10:00:22 +01:00
Thomas Müller
743addd1e3 set content-type on ocs exceptions 2014-03-12 00:35:19 +01:00
Robin Appelman
26793e1f94 switch OC::getRouter usages to OC::$server->getRouter 2014-03-10 14:06:47 +01:00
Thomas Müller
8f5c641cd8 load all apps in ocs/v1.php 2014-02-18 14:51:59 +01:00
Bart Visscher
22d759964f Use raw PathInfo for matching urls 2013-06-28 17:25:36 +02:00
Tom Needham
5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Felix Moeller
02ec677e3c Style: The last two spaces 2012-11-04 22:57:40 +01:00
Felix Moeller
a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Tom Needham
227ada3257 Fix merge conflicts 2012-09-13 10:23:41 +00:00
Thomas Müller
a3cda32392 Respect coding style 2012-09-04 13:26:13 +03:00
Bart Visscher
4b9200f6f7 Routing: combine all routes into one set 2012-08-02 21:51:31 +02:00
Bart Visscher
6ba2623485 Move loading of routes to OC::getRouter function 2012-08-02 21:44:58 +02:00
Bart Visscher
7952c6a31c Change access to router object to getter function 2012-08-02 17:47:38 +02:00
Bart Visscher
006b127da4 Routing: Handle MethodNotAllowedException 2012-07-31 22:33:53 +02:00
Bart Visscher
7a24f0cd8d Make calling ocs/v1.php/config work 2012-07-30 21:19:02 +02:00
Jörn Friedrich Dreyer
e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Robin Appelman
595b13f1e0 prevent the remaining ob_clean related errors 2011-10-17 01:18:02 +02:00
Klaas Freitag
d3f6f618e6 fixed include for ocs 2011-09-12 16:20:38 +02:00
Jonathan Riddell
d294c2f6bd Fix licencing, make headers refer to intended AGPL, include copy of AGPL 2011-02-09 14:50:27 +00:00
Martin T. H. Sandsmark
64d4d57615 fix permissions, start to implement private data api 2010-07-16 11:36:03 +02:00
Robin
78e54e1909 fixes in log and ocs 2010-05-15 22:29:14 +02:00
Robin
aacda0367d merge 2010-04-28 12:15:52 +02:00
Frank Karlitschek
7adbbfe05c add Open Collaboration API support. You can now connect your ownCloud with the KDE Social Desktop and push notifications to your Social News Plasmoid. This requires KDE trunk or KDE SV 4.5 2010-04-14 16:58:52 +02:00