wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
40744 commits 157 branches 562 tags 714 MiB
Commit graph

103 commits

Author SHA1 Message Date
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
Lukas Reschke
8a2cd0355d Use the proper content-type 
We should use the proper content-type `application/xml` instead of the default `text/html` here.

Backport requested.
 2014-02-17 16:45:22 +01:00
Thomas Müller
66a2f3b0b9 New OCS route: 
/ocs/cloud/user
Response:
 <?xml version="1.0"?>
 <ocs>
  <meta>
   <status>ok</status>
   <statuscode>100</statuscode>
   <message/>
  </meta>
  <data>
   <id>thomas</id>
   <display-name>DeepDiver</display-name>
   <email>no-response@domain.tld</email>
  </data>
 </ocs>
 2013-10-21 20:14:18 +02:00
Frank Karlitschek
f1836a997f remove the activity call here. it is not implemented anyways. This will be provided by Activity app in the future. 2013-08-31 18:14:46 +02:00
Tom Needham
f14ce1efdc Add quota to core api 2013-08-27 15:39:43 +02:00
kondou
9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Bart Visscher
22d759964f Use raw PathInfo for matching urls 2013-06-28 17:25:36 +02:00
Tom Needham
1e1a8b2f3c Fix typo 2013-04-27 17:52:37 +01:00
Tom Needham
66053693f8 Code style for ocs/routes.php 2013-04-27 17:51:36 +01:00
Tom Needham
59db762dfa Change app identifier for core api routes 2013-04-27 17:45:44 +01:00
Tom Needham
5ad1b63f76 Fix api result merging. 2013-02-09 12:50:19 +00:00
Tom Needham
406922fc6a Merge master 2013-02-04 18:36:39 +00:00
Stefan Herbrechtsmeier
ab2b79cda6 add multiple domains reverse proxy support 
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).

As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
 2013-01-31 18:42:31 +01:00
Tom Needham
0956cae39e Add new /cloud/capabilities route and remove unused methods 2013-01-16 20:43:46 +00:00
Thomas Mueller
42678096bb remove php closing tag 2013-01-14 23:51:58 +01:00
Tom Needham
5fe6129698 Merge master into ocs_api, fix conflicts. 2012-12-14 15:15:05 +00:00
Tom Needham
c7a665a1e4 API: Tidy up routes.php, remove redundant call registration 2012-12-14 14:55:02 +00:00
Tom Needham
3cc3405536 API: Remove old code. Move remaining methods to OC_OCS_Result. 2012-12-12 18:06:07 +00:00
Frank Karlitschek
6cb3774706 make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups. 2012-11-22 19:22:00 +01: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
b2a1b54e9c Detect http protocol in providers.php 2012-10-28 23:59:22 +00:00
Tom Needham
0c55ca1d0a API: Add required auth level to OCS routes, move some routes to provisioning_api app 2012-09-13 15:27:44 +00: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
Thomas Müller
3d74c5b3ec Respect coding style 2012-09-04 13:25:53 +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
Tom Needham
75dbed2208 Fix the api routes 2012-08-01 14:12:59 +01:00
Bart Visscher
7426217e76 Fix /privatedata/getattribute route 2012-07-31 23:26:15 +02:00
Bart Visscher
006b127da4 Routing: Handle MethodNotAllowedException 2012-07-31 22:33:53 +02:00
Bart Visscher
28537037ae Fixup OCS modules 2012-07-31 22:19:11 +02:00
Bart Visscher
7a24f0cd8d Make calling ocs/v1.php/config work 2012-07-30 21:19:02 +02:00
Bart Visscher
372fdf8077 Add 'ocs' as app name to API registration 2012-07-30 21:19:02 +02:00
Tom Needham
9ffaea480f Add the format parameter inside OC_API 2012-07-30 12:44:34 +00:00
Tom Needham
f09ecee63a Move routes to ocs folder 2012-07-30 12:41:26 +00:00
Frank Karlitschek
e7e1f234dd first part of the new new OCS CLOUD module. So far only quota is implemented. 
The specification is developed here:
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
will be moved to
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services
as soon as everything is done.
 2012-07-23 18:34:21 +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
d4ea853fcf use our own serverHost call so that ownCloud works with reverse proxy servers 2012-05-31 20:26:09 +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