Merge branch 'master' into prod

pinaxcon/proposals/migrations/0004_auto_20170917_2028.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.4 on 2017-09-18 03:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0003_auto_20170813_1945'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='first_time',
+            field=models.BooleanField(default=False, help_text='Check this field if this is your first time speaking at a technical conference.', verbose_name='First-time speaker?'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='lodging_assistance',
+            field=models.BooleanField(default=False, help_text='Check this field if you require lodging assistance in Petaluma, California during North Bay Python.', verbose_name='Lodging assistance required?'),
+        ),
+        migrations.AlterField(
+            model_name='conferencespeaker',
+            name='travel_assistance',
+            field=models.BooleanField(default=False, help_text='Check this field if you require travel assistance to get to North Bay Python in Petaluma, California.', verbose_name='Travel assistance required?'),
+        ),
+    ]

pinaxcon/proposals/models.py

@@ -28,6 +28,7 @@ class ConferenceSpeaker(SpeakerBase):
 
     first_time = models.BooleanField(
         blank=True,
+        default=False,
         verbose_name=_("First-time speaker?"),
         help_text=_("Check this field if this is your first time speaking "
                     "at a technical conference."),
@@ -45,6 +46,7 @@ class ConferenceSpeaker(SpeakerBase):
 
     travel_assistance = models.BooleanField(
         blank=True,
+        default=False,
         verbose_name=_("Travel assistance required?"),
         help_text=_("Check this field if you require travel assistance to get "
                     "to North Bay Python in Petaluma, California."),
@@ -52,6 +54,7 @@ class ConferenceSpeaker(SpeakerBase):
 
     lodging_assistance = models.BooleanField(
         blank=True,
+        default=False,
         verbose_name=_("Lodging assistance required?"),
         help_text=_("Check this field if you require lodging assistance in "
                     "Petaluma, California during North Bay Python."),

pinaxcon/settings.py

@@ -29,7 +29,6 @@ CANONICAL_HOST = os.environ.get("DJANGO_CANONICAL_HOST", None)
 from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None)
 if from_email is not None:
     DEFAULT_FROM_EMAIL = from_email
-
     SERVER_EMAIL = DEFAULT_FROM_EMAIL
 
 # Local time zone for this installation. Choices can be found here: