Merge branch 'master' into Kerl/mails_rappel

bda/migrations/0003_update_tirage_and_spectacle.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bda', '0002_add_tirage'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='spectacle',
+            name='price',
+            field=models.FloatField(verbose_name=b"Prix d'une place"),
+        ),
+        migrations.AlterField(
+            model_name='tirage',
+            name='active',
+            field=models.BooleanField(default=False, verbose_name=b'Tirage actif'),
+        ),
+    ]

cof/settings_dev.py

@@ -15,6 +15,7 @@ import os
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/