]> git.parisson.com Git - mezzo.git/commitdiff
reinit migrations after branch breakout
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 14 Jul 2016 16:56:11 +0000 (18:56 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Thu, 14 Jul 2016 16:56:11 +0000 (18:56 +0200)
43 files changed:
app/migrations/__init__.py [deleted file]
app/migrations/blog/0001_initial.py
app/migrations/blog/0002_auto_20150527_1555.py [deleted file]
app/migrations/blog/0003_auto_20151223_1313.py [deleted file]
app/migrations/conf/0001_initial.py
app/migrations/conf/0002_auto_20151223_1313.py [deleted file]
app/migrations/forms/0001_initial.py
app/migrations/forms/0002_auto_20141227_0224.py [deleted file]
app/migrations/forms/0003_emailfield.py [deleted file]
app/migrations/forms/0004_auto_20150517_0510.py [deleted file]
app/migrations/forms/0005_auto_20151223_1313.py [deleted file]
app/migrations/forms/0006_auto_20160407_2249.py [deleted file]
app/migrations/galleries/0001_initial.py
app/migrations/galleries/0002_auto_20141227_0224.py [deleted file]
app/migrations/galleries/0003_auto_20151223_1313.py [deleted file]
app/migrations/mezzanine_agenda/0001_initial.py [deleted file]
app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py [deleted file]
app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py [deleted file]
app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py [deleted file]
app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py [deleted file]
app/migrations/mezzanine_agenda/0006_remove_event_featured.py [deleted file]
app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py [deleted file]
app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py [deleted file]
app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py [deleted file]
app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py [deleted file]
app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py [deleted file]
app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py [deleted file]
app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py [deleted file]
app/migrations/mezzanine_agenda/0014_event_brochure.py [deleted file]
app/migrations/mezzanine_agenda/__init__.py [deleted file]
app/migrations/pages/0001_initial.py
app/migrations/pages/0002_auto_20141227_0224.py [deleted file]
app/migrations/pages/0003_auto_20150527_1555.py [deleted file]
app/migrations/pages/0004_auto_20151223_1313.py [deleted file]
app/organization/core/migrations/0001_initial.py
app/organization/featured/migrations/0001_initial.py
app/organization/festival/migrations/0001_initial.py
app/organization/magazine/migrations/0001_initial.py
app/organization/media/migrations/0001_initial.py
app/organization/project/migrations/0001_initial.py
app/organization/team/migrations/0001_initial.py
app/organization/team/migrations/0002_auto_20160714_1756.py [deleted file]
scripts/makemigrations.sh

diff --git a/app/migrations/__init__.py b/app/migrations/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
index e5734a62cf4273530ca89a157ab4838b21caeb5f..2158ee9a3c979c55b9de28b388500a649c87c5b9 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:58
+# Generated by Django 1.9.7 on 2016-07-14 16:52
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -14,8 +14,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('sites', '0002_alter_domain_unique'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -30,8 +30,8 @@ class Migration(migrations.Migration):
                 ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
             ],
             options={
-                'verbose_name': 'Blog Category',
                 'ordering': ('title',),
+                'verbose_name': 'Blog Category',
                 'verbose_name_plural': 'Blog Categories',
             },
         ),
@@ -73,8 +73,8 @@ class Migration(migrations.Migration):
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blogposts', to=settings.AUTH_USER_MODEL, verbose_name='Author')),
             ],
             options={
-                'verbose_name': 'Blog post',
                 'ordering': ('-publish_date',),
+                'verbose_name': 'Blog post',
                 'verbose_name_plural': 'Blog posts',
             },
             bases=(models.Model, mezzanine.utils.models.AdminThumbMixin),
diff --git a/app/migrations/blog/0002_auto_20150527_1555.py b/app/migrations/blog/0002_auto_20150527_1555.py
deleted file mode 100644 (file)
index a5cb65c..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='blogpost',
-            name='publish_date',
-            field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True),
-        ),
-    ]
diff --git a/app/migrations/blog/0003_auto_20151223_1313.py b/app/migrations/blog/0003_auto_20151223_1313.py
deleted file mode 100644 (file)
index 2d1da52..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0002_auto_20150527_1555'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='blogcategory',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='blogcategory',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='_meta_title_en',
-            field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='_meta_title_fr',
-            field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='description_en',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='description_fr',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='blogpost',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-    ]
index 0713b0191dd76576de851172add5f4a38dc78891..7bb278f5bc8110c3fa547cbae2c175e8c3884f49 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:58
+# Generated by Django 1.9.7 on 2016-07-14 16:52
 from __future__ import unicode_literals
 
 from django.db import migrations, models
diff --git a/app/migrations/conf/0002_auto_20151223_1313.py b/app/migrations/conf/0002_auto_20151223_1313.py
deleted file mode 100644 (file)
index fb2bf3c..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('conf', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='setting',
-            name='value_en',
-            field=models.CharField(max_length=2000, null=True),
-        ),
-        migrations.AddField(
-            model_name='setting',
-            name='value_fr',
-            field=models.CharField(max_length=2000, null=True),
-        ),
-    ]
index a64c78e30cd55b9492d0f0a8e7cd4472a41db9db..d9e76bdd1fa2c64f8457ada6a1db9f5249bfb4cf 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:58
+# Generated by Django 1.9.7 on 2016-07-14 16:53
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('pages', '__first__'),
+        ('pages', '0001_initial'),
     ]
 
     operations = [
@@ -41,9 +41,9 @@ class Migration(migrations.Migration):
                 ('help_text_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Help text')),
             ],
             options={
-                'verbose_name': 'Field',
                 'ordering': ('_order',),
                 'verbose_name_plural': 'Fields',
+                'verbose_name': 'Field',
             },
         ),
         migrations.CreateModel(
@@ -82,9 +82,9 @@ class Migration(migrations.Migration):
                 ('email_message_en', models.TextField(blank=True, help_text='Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.', null=True, verbose_name='Message')),
             ],
             options={
-                'verbose_name': 'Form',
                 'ordering': ('_order',),
                 'verbose_name_plural': 'Forms',
+                'verbose_name': 'Form',
             },
             bases=('pages.page', models.Model),
         ),
diff --git a/app/migrations/forms/0002_auto_20141227_0224.py b/app/migrations/forms/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 8e8905e..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('forms', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='field',
-            name='_order',
-            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/forms/0003_emailfield.py b/app/migrations/forms/0003_emailfield.py
deleted file mode 100644 (file)
index 9f826c6..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.pages.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('forms', '0002_auto_20141227_0224'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='form',
-            name='email_from',
-            field=models.EmailField(help_text='The address the email will be sent from', max_length=254, verbose_name='From address', blank=True),
-        ),
-    ]
diff --git a/app/migrations/forms/0004_auto_20150517_0510.py b/app/migrations/forms/0004_auto_20150517_0510.py
deleted file mode 100644 (file)
index b7cb552..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('forms', '0003_emailfield'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='form',
-            name='button_text',
-            field=models.CharField(max_length=50, verbose_name='Button text', blank=True),
-        ),
-    ]
diff --git a/app/migrations/forms/0005_auto_20151223_1313.py b/app/migrations/forms/0005_auto_20151223_1313.py
deleted file mode 100644 (file)
index 852552a..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('forms', '0004_auto_20150517_0510'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='field',
-            name='choices_en',
-            field=models.CharField(help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, null=True, verbose_name='Choices', blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='choices_fr',
-            field=models.CharField(help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, null=True, verbose_name='Choices', blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='default_en',
-            field=models.CharField(max_length=2000, null=True, verbose_name='Default value', blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='default_fr',
-            field=models.CharField(max_length=2000, null=True, verbose_name='Default value', blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='help_text_en',
-            field=models.CharField(max_length=100, null=True, verbose_name='Help text', blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='help_text_fr',
-            field=models.CharField(max_length=100, null=True, verbose_name='Help text', blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='label_en',
-            field=models.CharField(max_length=200, null=True, verbose_name='Label'),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='label_fr',
-            field=models.CharField(max_length=200, null=True, verbose_name='Label'),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='placeholder_text_en',
-            field=models.CharField(verbose_name='Placeholder Text', max_length=100, null=True, editable=False, blank=True),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='placeholder_text_fr',
-            field=models.CharField(verbose_name='Placeholder Text', max_length=100, null=True, editable=False, blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='button_text_en',
-            field=models.CharField(max_length=50, null=True, verbose_name='Button text', blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='button_text_fr',
-            field=models.CharField(max_length=50, null=True, verbose_name='Button text', blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='email_message_en',
-            field=models.TextField(help_text='Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.', null=True, verbose_name='Message', blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='email_message_fr',
-            field=models.TextField(help_text='Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.', null=True, verbose_name='Message', blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='email_subject_en',
-            field=models.CharField(max_length=200, null=True, verbose_name='Subject', blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='email_subject_fr',
-            field=models.CharField(max_length=200, null=True, verbose_name='Subject', blank=True),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='response_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Response'),
-        ),
-        migrations.AddField(
-            model_name='form',
-            name='response_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Response'),
-        ),
-    ]
diff --git a/app/migrations/forms/0006_auto_20160407_2249.py b/app/migrations/forms/0006_auto_20160407_2249.py
deleted file mode 100644 (file)
index c8af308..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-07 20:49
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('forms', '0005_auto_20151223_1313'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='field',
-            name='placeholder_text',
-            field=models.CharField(blank=True, max_length=100, verbose_name='Placeholder Text'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='placeholder_text_en',
-            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='placeholder_text_fr',
-            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text'),
-        ),
-    ]
index e434b347bb9125f37e4f9f2fe235710f945267e1..95b29ad548f5087462128f194eb5601d7884dd18 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:58
+# Generated by Django 1.9.7 on 2016-07-14 16:53
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('pages', '__first__'),
+        ('pages', '0001_initial'),
     ]
 
     operations = [
@@ -26,9 +26,9 @@ class Migration(migrations.Migration):
                 ('zip_import', models.FileField(blank=True, help_text="Upload a zip file containing images, and they'll be imported into this gallery.", upload_to='galleries', verbose_name='Zip import')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'Gallery',
                 'verbose_name_plural': 'Galleries',
+                'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
         ),
@@ -44,9 +44,9 @@ class Migration(migrations.Migration):
                 ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='galleries.Gallery')),
             ],
             options={
-                'ordering': ('_order',),
                 'verbose_name': 'Image',
                 'verbose_name_plural': 'Images',
+                'ordering': ('_order',),
             },
         ),
     ]
diff --git a/app/migrations/galleries/0002_auto_20141227_0224.py b/app/migrations/galleries/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 89bf633..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('galleries', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='galleryimage',
-            name='_order',
-            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/galleries/0003_auto_20151223_1313.py b/app/migrations/galleries/0003_auto_20151223_1313.py
deleted file mode 100644 (file)
index 2a61852..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('galleries', '0002_auto_20141227_0224'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='gallery',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='gallery',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='galleryimage',
-            name='description_en',
-            field=models.CharField(max_length=1000, null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='galleryimage',
-            name='description_fr',
-            field=models.CharField(max_length=1000, null=True, verbose_name='Description', blank=True),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0001_initial.py b/app/migrations/mezzanine_agenda/0001_initial.py
deleted file mode 100644 (file)
index 063a464..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-import mezzanine.utils.models
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sites', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Event',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('comments_count', models.IntegerField(default=0, editable=False)),
-                ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)),
-                ('rating_count', models.IntegerField(default=0, editable=False)),
-                ('rating_sum', models.IntegerField(default=0, editable=False)),
-                ('rating_average', models.FloatField(default=0, editable=False)),
-                ('title', models.CharField(max_length=500, verbose_name='Title')),
-                ('title_fr', models.CharField(max_length=500, null=True, verbose_name='Title')),
-                ('title_en', models.CharField(max_length=500, null=True, verbose_name='Title')),
-                ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)),
-                ('_meta_title', models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True)),
-                ('description', models.TextField(verbose_name='Description', blank=True)),
-                ('gen_description', models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description')),
-                ('created', models.DateTimeField(null=True, editable=False)),
-                ('updated', models.DateTimeField(null=True, editable=False)),
-                ('status', models.IntegerField(default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status', choices=[(1, 'Draft'), (2, 'Published')])),
-                ('publish_date', models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True)),
-                ('expiry_date', models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True)),
-                ('short_url', models.URLField(null=True, blank=True)),
-                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('start', models.DateTimeField(verbose_name='Start')),
-                ('end', models.DateTimeField(null=True, verbose_name='End', blank=True)),
-                ('facebook_event', models.BigIntegerField(null=True, verbose_name='Facebook', blank=True)),
-                ('allow_comments', models.BooleanField(default=True, verbose_name='Allow comments')),
-                ('featured_image', mezzanine.core.fields.FileField(max_length=255, null=True, verbose_name='Featured Image', blank=True)),
-            ],
-            options={
-                'ordering': ('-start',),
-                'verbose_name': 'Event',
-                'verbose_name_plural': 'Events',
-            },
-            bases=(models.Model, mezzanine.utils.models.AdminThumbMixin),
-        ),
-        migrations.CreateModel(
-            name='EventLocation',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(max_length=500, verbose_name='Title')),
-                ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)),
-                ('address', models.TextField()),
-                ('mappable_location', models.CharField(help_text='This address will be used to calculate latitude and longitude. Leave blank and set Latitude and Longitude to specify the location yourself, or leave all three blank to auto-fill from the Location field.', max_length=128, blank=True)),
-                ('lat', models.DecimalField(decimal_places=7, max_digits=10, blank=True, help_text='Calculated automatically if mappable location is set.', null=True, verbose_name='Latitude')),
-                ('lon', models.DecimalField(decimal_places=7, max_digits=10, blank=True, help_text='Calculated automatically if mappable location is set.', null=True, verbose_name='Longitude')),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
-            ],
-            options={
-                'ordering': ('title',),
-                'verbose_name': 'Event Location',
-                'verbose_name_plural': 'Event Locations',
-            },
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='location',
-            field=models.ForeignKey(blank=True, to='mezzanine_agenda.EventLocation', null=True),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='site',
-            field=models.ForeignKey(editable=False, to='sites.Site'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='user',
-            field=models.ForeignKey(related_name='events', verbose_name='Author', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py b/app/migrations/mezzanine_agenda/0002_auto_20160224_1142.py
deleted file mode 100644 (file)
index 7ef6f21..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py b/app/migrations/mezzanine_agenda/0003_auto_20160309_1621.py
deleted file mode 100644 (file)
index 51e65fe..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-03-09 15:21
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0002_auto_20160224_1142'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventCategory',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=512, verbose_name='name')),
-                ('description', models.TextField(blank=True, verbose_name='description')),
-            ],
-            options={
-                'verbose_name_plural': 'Event categories',
-                'verbose_name': 'Event category',
-            },
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='external_id',
-            field=models.IntegerField(blank=True, null=True, verbose_name='external_id'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='featured',
-            field=models.BooleanField(default=False, verbose_name='featured'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='featured_image_description',
-            field=models.TextField(blank=True, verbose_name='featured image description'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='featured_image_header',
-            field=mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='featured image header'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='children', to='mezzanine_agenda.Event', verbose_name='parent'),
-        ),
-        migrations.AlterField(
-            model_name='event',
-            name='allow_comments',
-            field=models.BooleanField(default=False, verbose_name='Allow comments'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='category',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='events', to='mezzanine_agenda.EventCategory', verbose_name='category'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py b/app/migrations/mezzanine_agenda/0004_auto_20160331_1832.py
deleted file mode 100644 (file)
index d48289d..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-03-31 16:32
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0003_auto_20160309_1621'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='event',
-            name='location',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='mezzanine_agenda.EventLocation'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py b/app/migrations/mezzanine_agenda/0005_auto_20160404_0043.py
deleted file mode 100644 (file)
index 2d6da8c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-03 22:43
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0004_auto_20160331_1832'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='Description'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0006_remove_event_featured.py b/app/migrations/mezzanine_agenda/0006_remove_event_featured.py
deleted file mode 100644 (file)
index f01b067..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-07 20:49
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0005_auto_20160404_0043'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='event',
-            name='featured',
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py b/app/migrations/mezzanine_agenda/0007_auto_20160410_2148.py
deleted file mode 100644 (file)
index bfe547d..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-10 19:48
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0006_remove_event_featured'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='EventPrice',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('price', models.FloatField(verbose_name='price')),
-                ('unit', models.CharField(blank=True, max_length=16, verbose_name='Unit')),
-            ],
-            options={
-                'verbose_name': 'Event price',
-                'verbose_name_plural': 'Event pricies',
-            },
-        ),
-        migrations.AlterModelOptions(
-            name='event',
-            options={'ordering': ('start',), 'verbose_name': 'Event', 'verbose_name_plural': 'Events'},
-        ),
-        migrations.AddField(
-            model_name='eventlocation',
-            name='description',
-            field=mezzanine.core.fields.RichTextField(blank=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='eventlocation',
-            name='link',
-            field=models.URLField(blank=True, max_length=512),
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='prices',
-            field=models.ManyToManyField(blank=True, related_name='events', to='mezzanine_agenda.EventPrice', verbose_name='prices'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py b/app/migrations/mezzanine_agenda/0008_auto_20160410_2149.py
deleted file mode 100644 (file)
index cf8aff9..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-10 19:49
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0007_auto_20160410_2148'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='eventlocation',
-            name='description_en',
-            field=mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='description'),
-        ),
-        migrations.AddField(
-            model_name='eventlocation',
-            name='description_fr',
-            field=mezzanine.core.fields.RichTextField(blank=True, null=True, verbose_name='description'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py b/app/migrations/mezzanine_agenda/0009_auto_20160410_2154.py
deleted file mode 100644 (file)
index fd2605c..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-10 19:54
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0008_auto_20160410_2149'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='eventlocation',
-            name='featured_name',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='fearured name'),
-        ),
-        migrations.AlterField(
-            model_name='eventlocation',
-            name='link',
-            field=models.URLField(blank=True, max_length=512, null=True),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py b/app/migrations/mezzanine_agenda/0010_eventlocation_external_id.py
deleted file mode 100644 (file)
index 8a2c376..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-10 21:18
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0009_auto_20160410_2154'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='eventlocation',
-            name='external_id',
-            field=models.IntegerField(blank=True, null=True, verbose_name='external_id'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py b/app/migrations/mezzanine_agenda/0011_auto_20160410_2330.py
deleted file mode 100644 (file)
index 53985ab..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-10 21:30
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0010_eventlocation_external_id'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='eventprice',
-            name='price',
-        ),
-        migrations.AddField(
-            model_name='eventprice',
-            name='value',
-            field=models.FloatField(default=0, verbose_name='value'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='eventlocation',
-            name='featured_name',
-            field=models.CharField(blank=True, max_length=512, null=True, verbose_name='featured name'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py b/app/migrations/mezzanine_agenda/0012_auto_20160410_2336.py
deleted file mode 100644 (file)
index e7f9fac..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-04-10 21:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0011_auto_20160410_2330'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='eventprice',
-            name='unit',
-            field=models.CharField(blank=True, max_length=16, null=True, verbose_name='Unit'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py b/app/migrations/mezzanine_agenda/0013_auto_20160510_1542.py
deleted file mode 100644 (file)
index dbe8de4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-05-10 13:42
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0003_auto_20151223_1313'),
-        ('mezzanine_agenda', '0012_auto_20160410_2336'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='eventprice',
-            options={'ordering': ('-value',), 'verbose_name': 'Event price', 'verbose_name_plural': 'Event pricies'},
-        ),
-        migrations.AddField(
-            model_name='event',
-            name='blog_posts',
-            field=models.ManyToManyField(blank=True, related_name='events', to='blog.BlogPost', verbose_name='blog posts'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/0014_event_brochure.py b/app/migrations/mezzanine_agenda/0014_event_brochure.py
deleted file mode 100644 (file)
index 8233168..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.2 on 2016-05-10 13:56
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('mezzanine_agenda', '0013_auto_20160510_1542'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='event',
-            name='brochure',
-            field=mezzanine.core.fields.FileField(blank=True, max_length=1024, verbose_name='brochure'),
-        ),
-    ]
diff --git a/app/migrations/mezzanine_agenda/__init__.py b/app/migrations/mezzanine_agenda/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
index b9fb46c7fabbb62a38e780599dfd0eb17ff066ef..60272154d873d4bfe8ae6e5052c707a2e39e5d0b 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:58
+# Generated by Django 1.9.7 on 2016-07-14 16:52
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -49,8 +49,8 @@ class Migration(migrations.Migration):
                 ('login_required', models.BooleanField(default=False, help_text='If checked, only logged in users can view this page', verbose_name='Login required')),
             ],
             options={
-                'verbose_name_plural': 'Pages',
                 'verbose_name': 'Page',
+                'verbose_name_plural': 'Pages',
                 'ordering': ('titles',),
             },
         ),
@@ -60,8 +60,8 @@ class Migration(migrations.Migration):
                 ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='pages.Page')),
             ],
             options={
-                'verbose_name_plural': 'Links',
                 'verbose_name': 'Link',
+                'verbose_name_plural': 'Links',
                 'ordering': ('_order',),
             },
             bases=('pages.page',),
@@ -75,8 +75,8 @@ class Migration(migrations.Migration):
                 ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
             ],
             options={
-                'verbose_name_plural': 'Rich text pages',
                 'verbose_name': 'Rich text page',
+                'verbose_name_plural': 'Rich text pages',
                 'ordering': ('_order',),
             },
             bases=('pages.page', models.Model),
diff --git a/app/migrations/pages/0002_auto_20141227_0224.py b/app/migrations/pages/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 85bddb2..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.pages.fields
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='_order',
-            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
-            preserve_default=True,
-        ),
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(max_length=100, null=True, verbose_name='Show in menus', blank=True),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/pages/0003_auto_20150527_1555.py b/app/migrations/pages/0003_auto_20150527_1555.py
deleted file mode 100644 (file)
index b0682fe..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0002_auto_20141227_0224'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='publish_date',
-            field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True),
-        ),
-    ]
diff --git a/app/migrations/pages/0004_auto_20151223_1313.py b/app/migrations/pages/0004_auto_20151223_1313.py
deleted file mode 100644 (file)
index 6f0ca5e..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0003_auto_20150527_1555'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='page',
-            name='_meta_title_en',
-            field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='_meta_title_fr',
-            field=models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='description_en',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='description_fr',
-            field=models.TextField(null=True, verbose_name='Description', blank=True),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='titles_en',
-            field=models.CharField(max_length=1000, null=True, editable=False),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='titles_fr',
-            field=models.CharField(max_length=1000, null=True, editable=False),
-        ),
-        migrations.AddField(
-            model_name='richtextpage',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='richtextpage',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-    ]
index 8431f71c61968fbdc15ced68818b640dd7d552d2..451e32ac9a15d56c85e58e1ad78570c6ad07fcbd 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 09:02
+# Generated by Django 1.9.7 on 2016-07-14 16:53
 from __future__ import unicode_literals
 
 from django.db import migrations, models
index 21b261be29189cf8815306afb431cb640ef29db1..ad3a25c64c36bdec2e05e96894ef9acf0d14b1c8 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:25
+# Generated by Django 1.9.7 on 2016-07-14 16:53
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -10,10 +10,10 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('organization-media', '__first__'),
+        ('organization-core', '0001_initial'),
         ('mezzanine_agenda', '__first__'),
-        ('organization-core', '__first__'),
         ('organization-magazine', '__first__'),
-        ('organization-media', '0001_initial'),
     ]
 
     operations = [
index e3ce5b6e011ff056015d2fad3365fd767ddb3161..95909e599acf15fa63b270886d7bce5888356bae 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:25
+# Generated by Django 1.9.7 on 2016-07-14 16:53
 from __future__ import unicode_literals
 
 from django.db import migrations, models
index 942df5dec8f148baa3602a9369b2e4159297ff35..76757cd3197f9c46fe856dd4e02a55dac6ec9252 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:26
+# Generated by Django 1.9.7 on 2016-07-14 16:53
 from __future__ import unicode_literals
 
 from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('blog', '__first__'),
         ('sites', '0002_alter_domain_unique'),
+        ('blog', '0001_initial'),
     ]
 
     operations = [
index ee7f8296c118449832c1beeee22f11e644a7ca58..74c72d6778eda43a7c7ed1dab7bdc14adbcfea7b 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-13 14:49
+# Generated by Django 1.9.7 on 2016-07-14 16:54
 from __future__ import unicode_literals
 
 from django.db import migrations, models
index 400ebfd22b85bb412c3e0c36b406f9e826870bc8..27b60488fe8355779ec6ca425e0efb584d1c8ef9 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:26
+# Generated by Django 1.9.7 on 2016-07-14 16:54
 from __future__ import unicode_literals
 
 from django.db import migrations, models
index e34ed1ff64c15e8d3f12e14b4726ff7caef1ca33..2a2dac6ec6927894898bb976d1a1c75c3eae0cbc 100644 (file)
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 08:26
+# Generated by Django 1.9.7 on 2016-07-14 16:55
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -42,7 +42,7 @@ class Migration(migrations.Migration):
             name='Address',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('address', models.TextField(blank=True, verbose_name='description')),
+                ('address', models.TextField(blank=True, verbose_name='address')),
                 ('postal_code', models.CharField(blank=True, max_length=16, verbose_name='postal code')),
                 ('country', django_countries.fields.CountryField(max_length=2, verbose_name='country')),
             ],
@@ -58,7 +58,7 @@ class Migration(migrations.Migration):
                 ('description_fr', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('description_en', models.TextField(blank=True, null=True, verbose_name='description')),
                 ('url', models.URLField(blank=True, max_length=512, verbose_name='URL')),
-                ('weaving_class', models.CharField(blank=True, max_length=64, verbose_name='weaving class')),
+                ('weaving_css_class', models.CharField(blank=True, max_length=64, verbose_name='weaving CSS class')),
             ],
             options={
                 'verbose_name': 'department',
@@ -138,8 +138,8 @@ class Migration(migrations.Migration):
                 ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='user')),
             ],
             options={
-                'ordering': ['last_name'],
                 'verbose_name': 'person',
+                'ordering': ['last_name'],
             },
             bases=(mezzanine.utils.models.AdminThumbMixin, models.Model),
         ),
diff --git a/app/organization/team/migrations/0002_auto_20160714_1756.py b/app/organization/team/migrations/0002_auto_20160714_1756.py
deleted file mode 100644 (file)
index d10085e..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 15:56
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('organization-team', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='department',
-            name='weaving_class',
-        ),
-        migrations.AddField(
-            model_name='department',
-            name='weaving_css_class',
-            field=models.CharField(blank=True, max_length=64, verbose_name='weaving CSS class'),
-        ),
-        migrations.AlterField(
-            model_name='address',
-            name='address',
-            field=models.TextField(blank=True, verbose_name='address'),
-        ),
-    ]
index 3841bd30f946c606714f36aa1a29605eab158a94..cc9ec662c1d40b5f14a9f658ec3abf4f9b9ea45e 100755 (executable)
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-docker-compose run app python /srv/app/manage.py makemigrations
+docker-compose run app python /srv/app/manage.py makemigrations $1