X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/333700b34cb944ab49d1c9243f7193d50d25ebd1..05cab23f88a48c20cde89c7003afe3fa3d2e016d:/project/urls.py?ds=inline diff --git a/project/urls.py b/project/urls.py index c38f3f6c..e107635e 100644 --- a/project/urls.py +++ b/project/urls.py @@ -12,6 +12,9 @@ urlpatterns = patterns('', # Explorer: url(r'^$', 'explorer.views.file_list', name='file_list'), url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'), + + + url(r'^managment/pull-requests$', 'explorer.views.pull_requests'), # url(r'^images/(?P[^/]+)/$', 'explorer.views.folder_images', name='folder_image'), # url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'), @@ -37,7 +40,7 @@ urlpatterns = patterns('', url(r'^admin/(.*)', admin.site.root), # Prototypes - url(r'^wysiwyg-proto/', include('wysiwyg.urls')), +# url(r'^wysiwyg-proto/', include('wysiwyg.urls')), # Our über-restful api url(r'^api/', include('api.urls') ),