CopyleftConf/copyleftconf-website Changeset - 0f76f1c295c2

Changeset - 0f76f1c295c2

Parent rev.

Child rev.

[Not reviewed]

Merge

0 2 1

Christopher Neugebauer - 7 years ago 2017-09-18 03:28:56
chrisjrn@gmail.com

Merge branch 'master' into prod

3 files changed with 34 insertions and 2 deletions:

pinaxcon/proposals/migrations/0004_auto_20170917_2028.py

pinaxcon/proposals/models.py

pinaxcon/settings.py

0 comments (0 inline, 0 general)

pinaxcon/proposals/migrations/0004_auto_20170917_2028.py

➞

Show inline comments

 new file 100644
 # -*- 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

➞

Show inline comments

@@ ... / @@ -25,12 +25,13 @@ class ConferenceSpeaker(SpeakerBase): @@
         blank=True,
         help_text=_(u"Your Twitter account")
+    )
     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."),
+        )
     experience = models.TextField(blank=True, help_text=_
@@ ... / @@ -42,19 +43,21 @@ class ConferenceSpeaker(SpeakerBase): @@
          verbose_name=_("Past speaking experience"),
+    )
     experience_html = models.TextField(blank=True)
     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."),
+    )
     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."),
+    )
     home_city = models.CharField(

pinaxcon/settings.py

➞

Show inline comments

@@ ... @@
 CANONICAL_HOST = os.environ.get("DJANGO_CANONICAL_HOST", None)
 # If DEFAULT_FROM_EMAIL is not set, email will most likely break in prod.
 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
     SERVER_EMAIL = DEFAULT_FROM_EMAIL
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # On Unix systems, a value of None will cause Django to use the same
 # timezone as the operating system.

0 comments (0 inline, 0 general)