summaryrefslogtreecommitdiff
path: root/coip/urls.py
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-11-08 19:15:22 +0100
committerLeif Johansson <leifj@sunet.se>2011-11-08 19:15:22 +0100
commitfcfd994182d18c10199628427484b3da997fbc33 (patch)
treebcaa7246187b5c8ef317c6ba581c2bcf16a9f871 /coip/urls.py
parent8c9274ab6185ca6e96377f50927712860a2868ab (diff)
enable new opensocial code
Diffstat (limited to 'coip/urls.py')
-rw-r--r--coip/urls.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/coip/urls.py b/coip/urls.py
index d74a332..c5246e2 100644
--- a/coip/urls.py
+++ b/coip/urls.py
@@ -72,10 +72,8 @@ urlpatterns = patterns('',
(r'^rtree/(?P<id>[0-9]+).json$', 'coip.apps.name.views.rtree'),
# APIs
(r'^api/activitystreams/', include('coip.apps.activitystreams.urls')),
- (r'^api/opensocial/1.0/rpc', 'coip.apps.opensocial.common.system'),
- #(r'^opensocial/2.0/activitystreams', include(opensocial_v2_as.urls)),
- (r'^api/opensocial/', include(opensocial_v1.urls)),
+ (r'^api/opensocial/', include('coip.apps.opensocial.urls')),
(r'^api/hello/?', 'coip.apps.name.views.hello'),
- (r'^api/', include(v1_api.urls)),
+ #(r'^api/', include(v1_api.urls)),
(r'^oauth2/', include('django_oauth2_lite.urls'))
)