fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
insert_tag - inserts only end tag, when no text selected - fixed.
[redakcja.git]
/
project
/
urls.py
diff --git
a/project/urls.py
b/project/urls.py
index
ce2f6b5
..
2c1fab7
100644
(file)
--- a/
project/urls.py
+++ b/
project/urls.py
@@
-22,12
+22,17
@@
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',
+ 'explorer.views.split_success', name='split-success'),
url(r'^editor/'+PATH_SEC+'/print/html$', 'explorer.views.print_html'),
url(r'^editor/'+PATH_SEC+'/print/xml$', 'explorer.views.print_xml'),
# Task managment
url(r'^editor/'+PATH_SEC+'/print/html$', 'explorer.views.print_html'),
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')),
# Admin panel
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
@@
-36,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') ),
)
)