From: zuber Date: Sat, 22 Aug 2009 22:08:52 +0000 (+0200) Subject: Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/275dc6c6f5c92630c9a1fca0f1830ba543cd18b7?hp=--cc Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma --- 275dc6c6f5c92630c9a1fca0f1830ba543cd18b7 diff --cc project/urls.py index cc433c05,d153f84d..1ba97d65 --- a/project/urls.py +++ b/project/urls.py @@@ -7,9 -7,10 +7,9 @@@ admin.autodiscover( urlpatterns = patterns('', - # Example: + # Explorer: url(r'^$', 'explorer.views.file_list', name='file_list'), url(r'^file/(?P[^/]+)/$', 'explorer.views.file_xml', name='file_xml'), - url(r'^html/(?P[^/]+)/$', 'explorer.views.file_html', name='file_html'), url(r'^images/(?P[^/]+)/$', 'explorer.views.folder_images', name='folder_image'), url(r'^images/$', 'explorer.views.folder_images', {'folder': '.'}, name='folder_image_ajax'),