Merge branch 'develop' into feature/tp

rowsandall_app/settings_dev.py

@@ -45,8 +45,9 @@ CELERY_SEND_TASK_SENT_EVENT = True
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
+TEMPLATE_DEBUG = DEBUG
 
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['localhost']
 
 
 # Application definition

rowsandall_app/urls.py

@@ -21,6 +21,16 @@ from rowsandall_app.views import rootview
 from django.contrib.auth import views as auth_views
 from rowers import views as rowersviews
 
+from django.conf.urls import (
+    handler400, handler403, handler404, handler500
+)
+
+handler400 = 'rowers.views.error400_view'
+handler403 = 'rowers.views.error403_view'
+handler404 = 'rowers.views.error404_view'
+handler500 = 'rowers.views.error500_view'
+
+
 urlpatterns = [
     url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
     url(r'^password_change/$',auth_views.password_change),

rowsandall_app/views.py

@@ -1,4 +1,5 @@
 from django.shortcuts import render, redirect, render_to_response
+from django.template import RequestContext
 from django.conf import settings
 
 from rowingdata import main as rmain