X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/0e5e4a0d816add3c0c13559fbed4f79eb295baf8..e459e4567cc578abd5d7e02e70a01ec9464f474d:/platforma/urls.py diff --git a/platforma/urls.py b/platforma/urls.py old mode 100644 new mode 100755 index 786a6538..1f7372a3 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -13,6 +13,8 @@ urlpatterns = patterns('', url(r'^$', 'explorer.views.file_list', name='file_list'), url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), + url(r'^renderer$', 'explorer.views.renderer_test'), + url(r'^management/pull-requests$', 'explorer.views.pull_requests'), # Editor panels @@ -22,9 +24,12 @@ urlpatterns = patterns('', url(r'^file/(?P[^/]+)/print$', 'explorer.views.print_html', name="file_print"), # Admin panel + (r'^admin/filebrowser/', include('filebrowser.urls')), url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/(.*)', admin.site.root), + + # Our über-restful api url(r'^api/', include('api.urls')),