mirror of
https://expo.survex.com/repositories/troggle/.git
synced 2024-11-26 17:21:52 +00:00
merge in survex parsing changes from server.
This commit is contained in:
commit
5265acd9dc
6
urls.py
6
urls.py
@ -143,12 +143,12 @@ actualurlpatterns = patterns('',
|
|||||||
url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
|
url(r'^prospecting/(?P<name>[^.]+).png$', prospecting_image, name="prospecting_image"),
|
||||||
|
|
||||||
# (r'^gallery/(?P<path>.*)$', 'django.views.static.serve',
|
# (r'^gallery/(?P<path>.*)$', 'django.views.static.serve',
|
||||||
# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
|
# {'document_root': settings.PHOTOS_ROOT, 'show_indexes':True}),
|
||||||
|
|
||||||
# for those silly ideas
|
# for those silly ideas
|
||||||
url(r'^experimental.*$', views_logbooks.experimental, name="experimental"),
|
url(r'^experimental.*$', views_logbooks.experimental, name="experimental"),
|
||||||
|
|
||||||
#url(r'^trip_report/?$',views_other.tripreport,name="trip_report")
|
#url(r'^trip_report/?$',views_other.tripreport,name="trip_report")
|
||||||
|
|
||||||
url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"),
|
url(r'^(.*)_edit$', 'flatpages.views.editflatpage', name="editflatpage"),
|
||||||
url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"),
|
url(r'^(.*)$', 'flatpages.views.flatpage', name="flatpage"),
|
||||||
|
Loading…
Reference in New Issue
Block a user