equal
deleted
inserted
replaced
164 url(r'^password-reset-done/$', 'password_reset_done'), |
164 url(r'^password-reset-done/$', 'password_reset_done'), |
165 url(r'^password-reset-confirm/(?P<uidb36>[-\w]*)/(?P<token>[-\w]*)$', 'password_reset_confirm'), |
165 url(r'^password-reset-confirm/(?P<uidb36>[-\w]*)/(?P<token>[-\w]*)$', 'password_reset_confirm'), |
166 url(r'^password-reset-complete/$', 'password_reset_complete'), |
166 url(r'^password-reset-complete/$', 'password_reset_complete'), |
167 ) |
167 ) |
168 |
168 |
169 handler404 = 'django.views.defaults.page_not_found' |
169 handler404 = 'project.scipycon.views.handler404' |
|
170 handler500 = 'project.scipycon.views.handler404' |
170 |
171 |
171 # Serve static files in DEBUG = True mode |
172 # Serve static files in DEBUG = True mode |
172 if settings.DEBUG: |
173 if settings.DEBUG: |
173 urlpatterns += patterns('', |
174 urlpatterns += patterns('', |
174 (r'^media/(?P<path>.*)$', 'django.views.static.serve', |
175 (r'^media/(?P<path>.*)$', 'django.views.static.serve', |