CopyleftConf/copyleftconf-website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into prod

Browse source
This commit is contained in:
Christopher Neugebauer 2017-09-17 20:28:56 -07:00
commit 0f76f1c295
3 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pinaxcon/proposals/migrations/0004_auto_20170917_2028.py Normal file
View file

@ -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?'),
),
]

3
pinaxcon/proposals/models.py
View file

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

3
pinaxcon/settings.py
View file

@ -29,8 +29,7 @@ CANONICAL_HOST = os.environ.get("DJANGO_CANONICAL_HOST", None)
from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None) from_email = os.environ.get("DJANGO_DEFAULT_FROM_EMAIL", None)
if from_email is not None: if from_email is not None:
DEFAULT_FROM_EMAIL = from_email 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: # Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name