DC resource. More merge tests.

[redakcja.git] / project / urls.py

diff --git a/project/urls.py b/project/urls.py
index ae7a636..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'),
     # 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',
 
     url(r'^editor/'+PATH_SEC+'/split$', 'explorer.views.split_text'),
     url(r'^editor/'+PATH_SEC+'/split-success',


@@ -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': '/'}),
     # 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') ),

 )
 
 
 )