Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'not-pycon' into 'master'

Browse source 
Use Linux Australia for release and not pycon

See merge request !10
This commit is contained in:
James Polley 2017-07-02 12:14:57 +00:00
commit 7262ed8943
2 changed files with 47 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pinaxcon/proposals/migrations/0002_auto_20170702_1140.py Normal file
View file

@ -0,0 +1,45 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.3 on 2017-07-02 01:40
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('proposals', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='talkproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='talkproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='talkproposal',
name='target_audience',
field=models.IntegerField(choices=[(1, 'User'), (2, 'Business'), (3, 'Community'), (4, 'Developer')]),
),
migrations.AlterField(
model_name='tutorialproposal',
name='materials_release',
field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any other material (such as slides) from presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='tutorialproposal',
name='recording_release',
field=models.BooleanField(default=True, help_text="I allow Linux Australia to release any recordings of presentations covered by this proposal, under the <a href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"),
),
migrations.AlterField(
model_name='tutorialproposal',
name='target_audience',
field=models.IntegerField(choices=[(1, 'User'), (2, 'Business'), (3, 'Community'), (4, 'Developer')]),
),
]

4
pinaxcon/proposals/models.py
View file

@ -21,7 +21,7 @@ class Proposal(ProposalBase):
recording_release = models.BooleanField(
default=True,
help_text="I allow PyCon Australia to release any recordings of "
help_text="I allow Linux Australia to release any recordings of "
"presentations covered by this proposal, under the <a "
"href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "
"Creative Commons Attribution-Share Alike Australia 3.0 Licence</a>"
@ -29,7 +29,7 @@ class Proposal(ProposalBase):
materials_release = models.BooleanField(
default=True,
help_text="I allow PyCon Australia to release any other material "
help_text="I allow Linux Australia to release any other material "
"(such as slides) from presentations covered by this proposal, under "
"the <a "
"href='https://creativecommons.org/licenses/by-sa/3.0/au/deed.en'> "