Merge branch 'master' of stigma.nowoczesnapolska.org.pl:platforma

[redakcja.git] / project / urls.py

diff --git a/project/urls.py b/project/urls.py
index b357688..2c1fab7 100644 (file)
--- a/project/urls.py
+++ b/project/urls.py
@@ -22,6 +22,7 @@ urlpatterns = patterns('',
     # Editor panels
     url(r'^editor/'+PATH_SEC+'/panel/(?P<name>[a-z]+)/$', 'explorer.views.panel_view', name='panel_view'),
     url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'),
+    url(r'^editor/$', 'explorer.views.file_list', name='editor_base'),
 
     url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'),
     url(r'^editor/'+PATH_SEC+'/split-success',
@@ -31,7 +32,7 @@ urlpatterns = patterns('',
     url(r'^editor/'+PATH_SEC+'/print/xml$', 'explorer.views.print_xml'),
     
     # Task managment
-    url(r'^manager/pull-requests$', 'explorer.views.pull_requests'),
+    # url(r'^manager/pull-requests$', 'explorer.views.pull_requests'),
 
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
@@ -40,6 +41,9 @@ urlpatterns = patterns('',
     # Authorization
     url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}),
     url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}),
+
+    # Our uber-restful api
+    url(r'^api/', include('api.urls') ),
 )