Skip to content

Commit 303e886

Browse files
rjsparksrjsparks
committed
pulled several migrations from trunk and reordered the ones here to match
 - Legacy-Id: 9594
1 parent 72b85fc commit 303e886

9 files changed

Lines changed: 251 additions & 7 deletions

File tree

‎ietf/group/migrations/0004_auto_20150430_0847.py‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('group', '0003_auto_20150304_0743'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='group',
16+
name='unused_states',
17+
field=models.ManyToManyField(help_text=b'Document states that have been disabled for the group.', to='doc.State', blank=True),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='group',
22+
name='unused_tags',
23+
field=models.ManyToManyField(help_text=b'Document tags that have been disabled for the group.', to='name.DocTagName', blank=True),
24+
preserve_default=True,
25+
),
26+
migrations.AlterField(
27+
model_name='grouphistory',
28+
name='unused_states',
29+
field=models.ManyToManyField(help_text=b'Document states that have been disabled for the group.', to='doc.State', blank=True),
30+
preserve_default=True,
31+
),
32+
migrations.AlterField(
33+
model_name='grouphistory',
34+
name='unused_tags',
35+
field=models.ManyToManyField(help_text=b'Document tags that have been disabled for the group.', to='name.DocTagName', blank=True),
36+
preserve_default=True,
37+
),
38+
migrations.AlterField(
39+
model_name='groupmilestone',
40+
name='resolved',
41+
field=models.CharField(help_text=b'Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50, blank=True),
42+
preserve_default=True,
43+
),
44+
migrations.AlterField(
45+
model_name='groupmilestonehistory',
46+
name='resolved',
47+
field=models.CharField(help_text=b'Explanation of why milestone is resolved (usually "Done"), or empty if still due.', max_length=50, blank=True),
48+
preserve_default=True,
49+
),
50+
migrations.AlterField(
51+
model_name='role',
52+
name='email',
53+
field=models.ForeignKey(help_text=b'Email address used by person for this role.', to='person.Email'),
54+
preserve_default=True,
55+
),
56+
migrations.AlterField(
57+
model_name='rolehistory',
58+
name='email',
59+
field=models.ForeignKey(help_text=b'Email address used by person for this role.', to='person.Email'),
60+
preserve_default=True,
61+
),
62+
]

‎ietf/ipr/migrations/0003_auto_20150430_0847.py‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('ipr', '0002_remove_legacy_models'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='genericiprdisclosure',
16+
name='holder_contact_info',
17+
field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='holderiprdisclosure',
22+
name='holder_contact_info',
23+
field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
24+
preserve_default=True,
25+
),
26+
migrations.AlterField(
27+
model_name='iprdisclosurebase',
28+
name='compliant',
29+
field=models.BooleanField(default=True, verbose_name=b'Complies to RFC3979'),
30+
preserve_default=True,
31+
),
32+
migrations.AlterField(
33+
model_name='iprdisclosurebase',
34+
name='notes',
35+
field=models.TextField(verbose_name=b'Additional notes', blank=True),
36+
preserve_default=True,
37+
),
38+
migrations.AlterField(
39+
model_name='iprdisclosurebase',
40+
name='other_designations',
41+
field=models.CharField(max_length=255, verbose_name=b'Designations for other contributions', blank=True),
42+
preserve_default=True,
43+
),
44+
migrations.AlterField(
45+
model_name='nondocspecificiprdisclosure',
46+
name='holder_contact_info',
47+
field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
48+
preserve_default=True,
49+
),
50+
migrations.AlterField(
51+
model_name='thirdpartyiprdisclosure',
52+
name='ietfer_contact_info',
53+
field=models.TextField(help_text=b'Address, phone, etc.', blank=True),
54+
preserve_default=True,
55+
),
56+
]

‎ietf/meeting/migrations/0005_auto_20150430_0847.py‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('meeting', '0004_auto_20150308_0446'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='meeting',
16+
name='agenda_note',
17+
field=models.TextField(help_text=b'Text in this field will be placed at the top of the html agenda page for the meeting. HTML can be used, but will not be validated.', blank=True),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='schedule',
22+
name='public',
23+
field=models.BooleanField(default=True, help_text='Make this agenda publically available.'),
24+
preserve_default=True,
25+
),
26+
migrations.AlterField(
27+
model_name='schedule',
28+
name='visible',
29+
field=models.BooleanField(default=True, help_text='Make this agenda available to those who know about it.'),
30+
preserve_default=True,
31+
),
32+
migrations.AlterField(
33+
model_name='scheduledsession',
34+
name='extendedfrom',
35+
field=models.ForeignKey(default=None, to='meeting.ScheduledSession', help_text='Timeslot this session is an extension of.', null=True),
36+
preserve_default=True,
37+
),
38+
migrations.AlterField(
39+
model_name='scheduledsession',
40+
name='pinned',
41+
field=models.BooleanField(default=False, help_text=b'Do not move session during automatic placement.'),
42+
preserve_default=True,
43+
),
44+
migrations.AlterField(
45+
model_name='scheduledsession',
46+
name='session',
47+
field=models.ForeignKey(default=None, to='meeting.Session', help_text='Scheduled session.', null=True),
48+
preserve_default=True,
49+
),
50+
migrations.AlterField(
51+
model_name='session',
52+
name='name',
53+
field=models.CharField(help_text=b'Name of session, in case the session has a purpose rather than just being a group meeting.', max_length=255, blank=True),
54+
preserve_default=True,
55+
),
56+
migrations.AlterField(
57+
model_name='session',
58+
name='short',
59+
field=models.CharField(help_text=b"Short version of 'name' above, for use in filenames.", max_length=32, blank=True),
60+
preserve_default=True,
61+
),
62+
migrations.AlterField(
63+
model_name='timeslot',
64+
name='sessions',
65+
field=models.ManyToManyField(related_name='slots', to='meeting.Session', through='meeting.ScheduledSession', blank=True, help_text='Scheduled session, if any.', null=True),
66+
preserve_default=True,
67+
),
68+
migrations.AlterField(
69+
model_name='timeslot',
70+
name='show_location',
71+
field=models.BooleanField(default=True, help_text=b'Show location in agenda.'),
72+
preserve_default=True,
73+
),
74+
]

ietf/meeting/migrations/0005_auto_20150318_1116.py renamed to ietf/meeting/migrations/0006_auto_20150318_1116.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ def backfill_91_other_meetings(apps, schema_editor):
130130
class Migration(migrations.Migration):
131131

132132
dependencies = [
133-
('meeting', '0004_auto_20150308_0446'),
133+
('meeting', '0005_auto_20150430_0847'),
134134
('name', '0004_auto_20150318_1140'),
135-
('group', '0003_auto_20150304_0743'),
135+
('group', '0004_auto_20150430_0847'),
136136
('person', '0004_auto_20150308_0440'),
137137
]
138138

ietf/meeting/migrations/0006_auto_20150429_1224.py renamed to ietf/meeting/migrations/0007_auto_20150429_1224.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Migration(migrations.Migration):
1717

1818
dependencies = [
1919
('name', '0004_auto_20150318_1140'),
20-
('meeting', '0005_auto_20150318_1116'),
20+
('meeting', '0006_auto_20150318_1116'),
2121
]
2222

2323
operations = [

ietf/meeting/migrations/0007_auto_20150429_1346.py renamed to ietf/meeting/migrations/0008_auto_20150429_1346.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
1616

1717
dependencies = [
1818
('name', '0004_auto_20150318_1140'),
19-
('meeting', '0006_auto_20150429_1224'),
19+
('meeting', '0007_auto_20150429_1224'),
2020
]
2121

2222
operations = [

‎ietf/nomcom/migrations/0002_auto_20150430_0909.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('nomcom', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='nomcom',
16+
name='reminder_interval',
17+
field=models.PositiveIntegerField(help_text=b'If the nomcom user sets the interval field then a cron command will send reminders to the nominees who have not responded using the following formula: (today - nomination_date) % interval == 0.', null=True, blank=True),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='nomcom',
22+
name='send_questionnaire',
23+
field=models.BooleanField(default=False, help_text=b'If you check this box, questionnaires are sent automatically after nominations.', verbose_name=b'Send questionnaires automatically'),
24+
preserve_default=True,
25+
),
26+
]

‎ietf/nomcom/models.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class NomCom(models.Model):
3838
group = models.ForeignKey(Group)
3939
send_questionnaire = models.BooleanField(verbose_name='Send questionnaires automatically', default=False,
4040
help_text='If you check this box, questionnaires are sent automatically after nominations.')
41-
reminder_interval = models.PositiveIntegerField(help_text='If the nomcom user sets the interval field then a cron command will \
42-
send reminders to the nominees who have not responded using \
43-
the following formula: (today - nomination_date) % interval == 0.',
41+
reminder_interval = models.PositiveIntegerField(help_text='If the nomcom user sets the interval field then a cron command will '
42+
'send reminders to the nominees who have not responded using '
43+
'the following formula: (today - nomination_date) % interval == 0.',
4444
blank=True, null=True)
4545
initial_text = models.TextField(verbose_name='Help text for nomination form',
4646
blank=True)

‎ietf/submit/migrations/0002_auto_20150430_0847.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('submit', '0001_initial'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='submission',
16+
name='authors',
17+
field=models.TextField(help_text=b'List of author names and emails, one author per line, e.g. "John Doe <john@example.org>".', blank=True),
18+
preserve_default=True,
19+
),
20+
migrations.AlterField(
21+
model_name='submission',
22+
name='submitter',
23+
field=models.CharField(help_text=b'Name and email of submitter, e.g. "John Doe <john@example.org>".', max_length=255, blank=True),
24+
preserve_default=True,
25+
),
26+
]

0 commit comments

Comments
 (0)