Fix building of demo site

Still needs more attention but this fixes the problems when running
"make demo".

Author: codeinthehole

sites/demo/apps/order/migrations/0014_auto__chg_field_billingaddress_postcode__chg_field_shippingaddress_pos.py

@@ -3,30 +3,24 @@
         "pk": 1, 
         "model": "order.shippingeventtype", 
         "fields": {
-            "is_required": false, 
             "code": "shipped", 
-            "name": "Shipped", 
-            "sequence_number": 0
+            "name": "Shipped"
         }
     }, 
     {
         "pk": 2, 
         "model": "order.shippingeventtype", 
         "fields": {
-            "is_required": false, 
             "code": "returned", 
-            "name": "Returned", 
-            "sequence_number": 0
+            "name": "Returned"
         }
     }, 
     {
         "pk": 3, 
         "model": "order.shippingeventtype", 
         "fields": {
-            "is_required": false, 
             "code": "cancelled", 
-            "name": "Cancelled", 
-            "sequence_number": 0
+            "name": "Cancelled"
         }
     }
-]
+]

sites/demo/apps/order/migrations/0015_auto__del_field_shippingeventtype_is_required__del_field_shippingevent.py

@@ -22,7 +22,7 @@
 SEND_BROKEN_LINK_EMAILS = False
 
 ADMINS = (
-    ('David', '[email protected]'),
+    ('David Winterbottom', '[email protected]'),
 )
 EMAIL_SUBJECT_PREFIX = '[Oscar demo] '
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
@@ -163,6 +163,11 @@
             'format': '%(levelname)s %(message)s'
         },
     },
+    'filters': {
+        'require_debug_false': {
+            '()': 'django.utils.log.RequireDebugFalse'
+        }
+    },
     'handlers': {
         'null': {
             'level': 'DEBUG',
@@ -188,6 +193,7 @@
         'mail_admins': {
             'level': 'ERROR',
             'class': 'django.utils.log.AdminEmailHandler',
+            'filters': ['require_debug_false'],
         },
     },
     'loggers': {
@@ -257,7 +263,7 @@
     'django.contrib.auth.backends.ModelBackend',
 )
 
-LOGIN_REDIRECT_URL = '/accounts/'
+LOGIN_REDIRECT_URL = '/'
 APPEND_SLASH = True
 
 # Haystack settings
@@ -281,7 +287,7 @@
 OSCAR_ALLOW_ANON_CHECKOUT = True
 
 OSCAR_SHOP_NAME = 'Oscar'
-OSCAR_SHOP_TAGLINE = 'Demo site'
+OSCAR_SHOP_TAGLINE = 'Demo'
 
 COMPRESS_ENABLED = False
 COMPRESS_PRECOMPILERS = (