From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Tue, 20 Oct 2009 12:42:45 +0000 (+0200)
Subject: Merge branch 'master' of stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/0e5e4a0d816add3c0c13559fbed4f79eb295baf8?ds=sidebyside;hp=--cc

Merge branch 'master' of stigma:platforma

Conflicts:
	platforma/urls.py
---

0e5e4a0d816add3c0c13559fbed4f79eb295baf8
diff --cc platforma/urls.py
index 03056c88,5ff1b6af..786a6538
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@@ -13,14 -13,10 +13,9 @@@ urlpatterns = patterns(''
      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'^management/pull-requests$', 'explorer.views.pull_requests'),
-     
- #    url(r'^images/(?P<folder>[^/]+)/$', 'explorer.views.folder_images', name='folder_image'),
- #    url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'),
-     
++  
      # 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'),