X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/c99ae5508d64ef5063d7365cc90b5295b5686db8..ba0c44546e27c41f13a0e5d7658ff018e61b22e0:/project/urls.py?ds=sidebyside

diff --git a/project/urls.py b/project/urls.py
index ec919ae3..cf082478 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -12,6 +12,8 @@ urlpatterns = patterns('',
     url(r'^file/text/'+PATH_END, 'explorer.views.file_xml', name='file_xml'),
     url(r'^file/dc/'+PATH_END, 'explorer.views.file_dc', name='file_dc'),
     url(r'^file/upload', 'explorer.views.file_upload', name='file_upload'),
+    url(r'^file/commit/'+PATH_END, 'explorer.views.file_commit', name='file_commit'),
+    url(r'^file/update/'+PATH_END, 'explorer.views.file_update_local', name='file_update'),
 
     url(r'^images/(?P<folder>[^/]+)/$', 'explorer.views.folder_images', name='folder_image'),
     url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'),
@@ -23,6 +25,7 @@ urlpatterns = patterns('',
     url(r'^editor/panel/dceditor/'+PATH_END, 'explorer.views.dceditor_panel', name='dceditor_panel'),
     url(r'^editor/'+PATH_END, 'explorer.views.display_editor', name='editor_view'),
 
+    
     # Task managment
     url(r'^manager/pull-requests$', 'explorer.views.pull_requests'),
 
@@ -37,9 +40,9 @@ urlpatterns = patterns('',
 
 
 # Static files
-if settings.DEBUG:
+if settings.DEBUG and not hasattr(settings, 'DONT_SERVE_STATIC'):
     urlpatterns += patterns('',
-        url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', 
+        url(r'^%s(?P<path>.+)$' % settings.MEDIA_URL[1:], 'django.views.static.serve',
             {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
         url(r'^%s(?P<path>.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
             {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),