]> git.parisson.com Git - mezzo.git/commitdiff
Cleanup migrations, change mezzanine migrations
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 2 May 2018 15:44:21 +0000 (17:44 +0200)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Wed, 2 May 2018 15:44:57 +0000 (17:44 +0200)
41 files changed:
app/migrations/blog/0001_initial.py [deleted file]
app/migrations/blog/0002_auto_20180307_1152.py [deleted file]
app/migrations/blog/__init__.py [deleted file]
app/migrations/conf/0001_initial.py [deleted file]
app/migrations/conf/__init__.py [deleted file]
app/migrations/forms/0001_initial.py [deleted file]
app/migrations/forms/0002_auto_20180307_1152.py [deleted file]
app/migrations/forms/__init__.py [deleted file]
app/migrations/galleries/0001_initial.py [deleted file]
app/migrations/galleries/__init__.py [deleted file]
app/migrations/generic/0001_initial.py [deleted file]
app/migrations/generic/0002_auto_20141227_0224.py [deleted file]
app/migrations/generic/0003_auto_20160923_1426.py [deleted file]
app/migrations/generic/0004_auto_20180307_1152.py [deleted file]
app/migrations/generic/__init__.py [deleted file]
app/migrations/pages/0001_initial.py [deleted file]
app/migrations/pages/0002_auto_20160725_0143.py [deleted file]
app/migrations/pages/0003_auto_20160804_1451.py [deleted file]
app/migrations/pages/0004_auto_20160804_1547.py [deleted file]
app/migrations/pages/0005_auto_20160923_1219.py [deleted file]
app/migrations/pages/0006_auto_20170223_2352.py [deleted file]
app/migrations/pages/0007_auto_20171213_1703.py [deleted file]
app/migrations/pages/0008_auto_20180307_1152.py [deleted file]
app/migrations/pages/__init__.py [deleted file]
app/migrations/shop/0001_initial.py [deleted file]
app/migrations/shop/0002_auto_20141227_1331.py [deleted file]
app/migrations/shop/0003_emailfield.py [deleted file]
app/migrations/shop/0004_productimage_file_field.py [deleted file]
app/migrations/shop/0005_auto_20150527_1127.py [deleted file]
app/migrations/shop/0006_auto_20150916_0459.py [deleted file]
app/migrations/shop/0007_auto_20150921_2323.py [deleted file]
app/migrations/shop/0008_auto_20160907_1726.py [deleted file]
app/migrations/shop/0009_product_content_model.py [deleted file]
app/migrations/shop/0010_remove_product_content_model.py [deleted file]
app/migrations/shop/0011_product_content_model.py [deleted file]
app/migrations/shop/0012_auto_20180307_1152.py [deleted file]
app/migrations/shop/__init__.py [deleted file]
app/settings.py
lib/mezzanine
lib/mezzanine-agenda
lib/mezzanine-organization

diff --git a/app/migrations/blog/0001_initial.py b/app/migrations/blog/0001_initial.py
deleted file mode 100644 (file)
index 2158ee9..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 16:52
-from __future__ import unicode_literals
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-import mezzanine.utils.models
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('sites', '0002_alter_domain_unique'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='BlogCategory',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
-            ],
-            options={
-                'ordering': ('title',),
-                'verbose_name': 'Blog Category',
-                'verbose_name_plural': 'Blog Categories',
-            },
-        ),
-        migrations.CreateModel(
-            name='BlogPost',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('comments_count', models.IntegerField(default=0, editable=False)),
-                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
-                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('_meta_title', models.CharField(blank=True, 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')),
-                ('_meta_title_fr', models.CharField(blank=True, 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')),
-                ('_meta_title_en', models.CharField(blank=True, 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')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('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(editable=False, null=True)),
-                ('updated', models.DateTimeField(editable=False, null=True)),
-                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
-                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
-                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
-                ('short_url', models.URLField(blank=True, null=True)),
-                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('allow_comments', models.BooleanField(default=True, verbose_name='Allow comments')),
-                ('featured_image', mezzanine.core.fields.FileField(blank=True, max_length=255, null=True, verbose_name='Featured Image')),
-                ('categories', models.ManyToManyField(blank=True, related_name='blogposts', to='blog.BlogCategory', verbose_name='Categories')),
-                ('related_posts', models.ManyToManyField(blank=True, related_name='_blogpost_related_posts_+', to='blog.BlogPost', verbose_name='Related posts')),
-                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='blogposts', to=settings.AUTH_USER_MODEL, verbose_name='Author')),
-            ],
-            options={
-                '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_20180307_1152.py b/app/migrations/blog/0002_auto_20180307_1152.py
deleted file mode 100644 (file)
index 7a01bb0..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2018-03-07 10:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='blogcategory',
-            name='slug',
-            field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'),
-            preserve_default=False,
-        ),
-        migrations.AlterField(
-            model_name='blogpost',
-            name='slug',
-            field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/migrations/blog/__init__.py b/app/migrations/blog/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app/migrations/conf/0001_initial.py b/app/migrations/conf/0001_initial.py
deleted file mode 100644 (file)
index 7bb278f..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 16:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('sites', '0002_alter_domain_unique'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Setting',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=50)),
-                ('value', models.CharField(max_length=2000)),
-                ('value_fr', models.CharField(max_length=2000, null=True)),
-                ('value_en', models.CharField(max_length=2000, null=True)),
-                ('site', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site')),
-            ],
-            options={
-                'verbose_name_plural': 'Settings',
-                'verbose_name': 'Setting',
-            },
-        ),
-    ]
diff --git a/app/migrations/conf/__init__.py b/app/migrations/conf/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app/migrations/forms/0001_initial.py b/app/migrations/forms/0001_initial.py
deleted file mode 100644 (file)
index d9e76bd..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 16:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('pages', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Field',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('label', models.CharField(max_length=200, verbose_name='Label')),
-                ('label_fr', models.CharField(max_length=200, null=True, verbose_name='Label')),
-                ('label_en', models.CharField(max_length=200, null=True, verbose_name='Label')),
-                ('field_type', models.IntegerField(choices=[(1, 'Single line text'), (2, 'Multi line text'), (3, 'Email'), (13, 'Number'), (14, 'URL'), (4, 'Check box'), (5, 'Check boxes'), (6, 'Drop down'), (7, 'Multi select'), (8, 'Radio buttons'), (9, 'File upload'), (10, 'Date'), (11, 'Date/time'), (15, 'Date of birth'), (12, 'Hidden')], verbose_name='Type')),
-                ('required', models.BooleanField(default=True, verbose_name='Required')),
-                ('visible', models.BooleanField(default=True, verbose_name='Visible')),
-                ('choices', models.CharField(blank=True, help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, verbose_name='Choices')),
-                ('choices_fr', models.CharField(blank=True, 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')),
-                ('choices_en', models.CharField(blank=True, 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')),
-                ('default', models.CharField(blank=True, max_length=2000, verbose_name='Default value')),
-                ('default_fr', models.CharField(blank=True, max_length=2000, null=True, verbose_name='Default value')),
-                ('default_en', models.CharField(blank=True, max_length=2000, null=True, verbose_name='Default value')),
-                ('placeholder_text', models.CharField(blank=True, max_length=100, verbose_name='Placeholder Text')),
-                ('placeholder_text_fr', models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text')),
-                ('placeholder_text_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Placeholder Text')),
-                ('help_text', models.CharField(blank=True, max_length=100, verbose_name='Help text')),
-                ('help_text_fr', models.CharField(blank=True, max_length=100, null=True, verbose_name='Help text')),
-                ('help_text_en', models.CharField(blank=True, max_length=100, null=True, verbose_name='Help text')),
-            ],
-            options={
-                'ordering': ('_order',),
-                'verbose_name_plural': 'Fields',
-                'verbose_name': 'Field',
-            },
-        ),
-        migrations.CreateModel(
-            name='FieldEntry',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('field_id', models.IntegerField()),
-                ('value', models.CharField(max_length=2000, null=True)),
-            ],
-            options={
-                'verbose_name': 'Form field entry',
-                'verbose_name_plural': 'Form field entries',
-            },
-        ),
-        migrations.CreateModel(
-            name='Form',
-            fields=[
-                ('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')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('button_text', models.CharField(blank=True, max_length=50, verbose_name='Button text')),
-                ('button_text_fr', models.CharField(blank=True, max_length=50, null=True, verbose_name='Button text')),
-                ('button_text_en', models.CharField(blank=True, max_length=50, null=True, verbose_name='Button text')),
-                ('response', mezzanine.core.fields.RichTextField(verbose_name='Response')),
-                ('response_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Response')),
-                ('response_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Response')),
-                ('send_email', models.BooleanField(default=True, help_text='To send an email to the email address supplied in the form upon submission, check this box.', verbose_name='Send email to user')),
-                ('email_from', models.EmailField(blank=True, help_text='The address the email will be sent from', max_length=254, verbose_name='From address')),
-                ('email_copies', models.CharField(blank=True, help_text='Provide a comma separated list of email addresses to be notified upon form submission. Leave blank to disable notifications.', max_length=200, verbose_name='Send email to others')),
-                ('email_subject', models.CharField(blank=True, max_length=200, verbose_name='Subject')),
-                ('email_subject_fr', models.CharField(blank=True, max_length=200, null=True, verbose_name='Subject')),
-                ('email_subject_en', models.CharField(blank=True, max_length=200, null=True, verbose_name='Subject')),
-                ('email_message', 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.', verbose_name='Message')),
-                ('email_message_fr', 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')),
-                ('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={
-                'ordering': ('_order',),
-                'verbose_name_plural': 'Forms',
-                'verbose_name': 'Form',
-            },
-            bases=('pages.page', models.Model),
-        ),
-        migrations.CreateModel(
-            name='FormEntry',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('entry_time', models.DateTimeField(verbose_name='Date/time')),
-                ('form', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='entries', to='forms.Form')),
-            ],
-            options={
-                'verbose_name': 'Form entry',
-                'verbose_name_plural': 'Form entries',
-            },
-        ),
-        migrations.AddField(
-            model_name='fieldentry',
-            name='entry',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fields', to='forms.FormEntry'),
-        ),
-        migrations.AddField(
-            model_name='field',
-            name='form',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='fields', to='forms.Form'),
-        ),
-    ]
diff --git a/app/migrations/forms/0002_auto_20180307_1152.py b/app/migrations/forms/0002_auto_20180307_1152.py
deleted file mode 100644 (file)
index 1e95c2e..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2018-03-07 10:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('forms', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='field',
-            name='help_text',
-            field=models.TextField(blank=True, verbose_name='Help text'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='help_text_en',
-            field=models.TextField(blank=True, null=True, verbose_name='Help text'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='help_text_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='Help text'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='label',
-            field=models.TextField(verbose_name='Label'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='label_en',
-            field=models.TextField(null=True, verbose_name='Label'),
-        ),
-        migrations.AlterField(
-            model_name='field',
-            name='label_fr',
-            field=models.TextField(null=True, verbose_name='Label'),
-        ),
-    ]
diff --git a/app/migrations/forms/__init__.py b/app/migrations/forms/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app/migrations/galleries/0001_initial.py b/app/migrations/galleries/0001_initial.py
deleted file mode 100644 (file)
index 95b29ad..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 16:53
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('pages', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Gallery',
-            fields=[
-                ('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')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('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={
-                'verbose_name': 'Gallery',
-                'verbose_name_plural': 'Galleries',
-                'ordering': ('_order',),
-            },
-            bases=('pages.page', models.Model),
-        ),
-        migrations.CreateModel(
-            name='GalleryImage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('file', mezzanine.core.fields.FileField(max_length=200, verbose_name='File')),
-                ('description', models.CharField(blank=True, max_length=1000, verbose_name='Description')),
-                ('description_fr', models.CharField(blank=True, max_length=1000, null=True, verbose_name='Description')),
-                ('description_en', models.CharField(blank=True, max_length=1000, null=True, verbose_name='Description')),
-                ('gallery', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='galleries.Gallery')),
-            ],
-            options={
-                'verbose_name': 'Image',
-                'verbose_name_plural': 'Images',
-                'ordering': ('_order',),
-            },
-        ),
-    ]
diff --git a/app/migrations/galleries/__init__.py b/app/migrations/galleries/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app/migrations/generic/0001_initial.py b/app/migrations/generic/0001_initial.py
deleted file mode 100644 (file)
index 31d4077..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('sites', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('django_comments', '__first__'),
-        ('contenttypes', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AssignedKeyword',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('_order', models.IntegerField(null=True, verbose_name='Order')),
-                ('object_pk', models.IntegerField()),
-                ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
-            ],
-            options={
-                'ordering': ('_order',),
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Keyword',
-            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)),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
-            ],
-            options={
-                'verbose_name': 'Keyword',
-                'verbose_name_plural': 'Keywords',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Rating',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('value', models.IntegerField(verbose_name='Value')),
-                ('rating_date', models.DateTimeField(auto_now_add=True, verbose_name='Rating date', null=True)),
-                ('object_pk', models.IntegerField()),
-                ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
-                ('user', models.ForeignKey(related_name='ratings', verbose_name='Rater', to=settings.AUTH_USER_MODEL, null=True)),
-            ],
-            options={
-                'verbose_name': 'Rating',
-                'verbose_name_plural': 'Ratings',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='ThreadedComment',
-            fields=[
-                ('comment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='django_comments.Comment')),
-                ('rating_count', models.IntegerField(default=0, editable=False)),
-                ('rating_sum', models.IntegerField(default=0, editable=False)),
-                ('rating_average', models.FloatField(default=0, editable=False)),
-                ('by_author', models.BooleanField(default=False, verbose_name='By the blog author')),
-                ('replied_to', models.ForeignKey(related_name='comments', editable=False, to='generic.ThreadedComment', null=True)),
-            ],
-            options={
-                'verbose_name': 'Comment',
-                'verbose_name_plural': 'Comments',
-            },
-            bases=('django_comments.comment',),
-        ),
-        migrations.AddField(
-            model_name='assignedkeyword',
-            name='keyword',
-            field=models.ForeignKey(related_name='assignments', verbose_name='Keyword', to='generic.Keyword'),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/generic/0002_auto_20141227_0224.py b/app/migrations/generic/0002_auto_20141227_0224.py
deleted file mode 100644 (file)
index 2515ca4..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 = [
-        ('generic', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='assignedkeyword',
-            name='_order',
-            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/generic/0003_auto_20160923_1426.py b/app/migrations/generic/0003_auto_20160923_1426.py
deleted file mode 100644 (file)
index 71df71d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-23 12:26
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('generic', '0002_auto_20141227_0224'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='keyword',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='keyword',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-    ]
diff --git a/app/migrations/generic/0004_auto_20180307_1152.py b/app/migrations/generic/0004_auto_20180307_1152.py
deleted file mode 100644 (file)
index 7a8406c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2018-03-07 10:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('generic', '0003_auto_20160923_1426'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='keyword',
-            name='slug',
-            field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/migrations/generic/__init__.py b/app/migrations/generic/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app/migrations/pages/0001_initial.py b/app/migrations/pages/0001_initial.py
deleted file mode 100644 (file)
index 6027215..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-14 16:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import django.db.models.deletion
-import mezzanine.core.fields
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-        ('sites', '0002_alter_domain_unique'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Page',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('keywords_string', models.CharField(blank=True, editable=False, max_length=500)),
-                ('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(blank=True, help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL')),
-                ('_meta_title', models.CharField(blank=True, 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')),
-                ('_meta_title_fr', models.CharField(blank=True, 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')),
-                ('_meta_title_en', models.CharField(blank=True, 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')),
-                ('description', models.TextField(blank=True, verbose_name='Description')),
-                ('description_fr', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('description_en', models.TextField(blank=True, null=True, verbose_name='Description')),
-                ('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(editable=False, null=True)),
-                ('updated', models.DateTimeField(editable=False, null=True)),
-                ('status', models.IntegerField(choices=[(1, 'Draft'), (2, 'Published')], default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status')),
-                ('publish_date', models.DateTimeField(blank=True, db_index=True, help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from')),
-                ('expiry_date', models.DateTimeField(blank=True, help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on')),
-                ('short_url', models.URLField(blank=True, null=True)),
-                ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')),
-                ('_order', mezzanine.core.fields.OrderField(null=True, verbose_name='Order')),
-                ('content_model', models.CharField(editable=False, max_length=50, null=True)),
-                ('in_menus', mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer')], max_length=100, null=True, verbose_name='Show in menus')),
-                ('titles', models.CharField(editable=False, max_length=1000, null=True)),
-                ('titles_fr', models.CharField(editable=False, max_length=1000, null=True)),
-                ('titles_en', models.CharField(editable=False, max_length=1000, null=True)),
-                ('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': 'Page',
-                'verbose_name_plural': 'Pages',
-                'ordering': ('titles',),
-            },
-        ),
-        migrations.CreateModel(
-            name='Link',
-            fields=[
-                ('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': 'Link',
-                'verbose_name_plural': 'Links',
-                'ordering': ('_order',),
-            },
-            bases=('pages.page',),
-        ),
-        migrations.CreateModel(
-            name='RichTextPage',
-            fields=[
-                ('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')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('content_fr', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-                ('content_en', mezzanine.core.fields.RichTextField(null=True, verbose_name='Content')),
-            ],
-            options={
-                'verbose_name': 'Rich text page',
-                'verbose_name_plural': 'Rich text pages',
-                'ordering': ('_order',),
-            },
-            bases=('pages.page', models.Model),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='parent',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='pages.Page'),
-        ),
-        migrations.AddField(
-            model_name='page',
-            name='site',
-            field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='sites.Site'),
-        ),
-    ]
diff --git a/app/migrations/pages/0002_auto_20160725_0143.py b/app/migrations/pages/0002_auto_20160725_0143.py
deleted file mode 100644 (file)
index d6871f0..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-07-24 23:43
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer vertical'), (4, 'Footer horizontal')], max_length=100, null=True, verbose_name='Show in menus'),
-        ),
-    ]
diff --git a/app/migrations/pages/0003_auto_20160804_1451.py b/app/migrations/pages/0003_auto_20160804_1451.py
deleted file mode 100644 (file)
index 957dcb1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-04 12:51
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0002_auto_20160725_0143'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (5, 'Magazine'), (3, 'Footer vertical'), (4, 'Footer horizontal')], max_length=100, null=True, verbose_name='Show in menus'),
-        ),
-    ]
diff --git a/app/migrations/pages/0004_auto_20160804_1547.py b/app/migrations/pages/0004_auto_20160804_1547.py
deleted file mode 100644 (file)
index aff97a3..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-08-04 13:47
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0003_auto_20160804_1451'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer vertical'), (4, 'Footer horizontal'), (5, 'Magazine')], max_length=100, null=True, verbose_name='Show in menus'),
-        ),
-    ]
diff --git a/app/migrations/pages/0005_auto_20160923_1219.py b/app/migrations/pages/0005_auto_20160923_1219.py
deleted file mode 100644 (file)
index fd0fda9..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-23 10:19
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0004_auto_20160804_1547'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer vertical'), (4, 'Footer horizontal'), (5, 'Magazine'), (6, 'Vous Ãªtes')], max_length=100, null=True, verbose_name='Show in menus'),
-        ),
-    ]
diff --git a/app/migrations/pages/0006_auto_20170223_2352.py b/app/migrations/pages/0006_auto_20170223_2352.py
deleted file mode 100644 (file)
index 275999a..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2017-02-23 22:52
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0005_auto_20160923_1219'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Header'), (3, 'Footer vertical'), (4, 'Footer horizontal'), (5, 'Magazine'), (6, 'You are')], max_length=100, null=True, verbose_name='Show in menus'),
-        ),
-    ]
diff --git a/app/migrations/pages/0007_auto_20171213_1703.py b/app/migrations/pages/0007_auto_20171213_1703.py
deleted file mode 100644 (file)
index 58ad700..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2017-12-13 16:03
-from __future__ import unicode_literals
-
-from django.db import migrations
-import mezzanine.pages.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0006_auto_20170223_2352'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='in_menus',
-            field=mezzanine.pages.fields.MenusField(blank=True, choices=[(1, 'Action'), (2, 'Departement'), (3, 'Footer vertical'), (4, 'Footer horizontal'), (5, 'Magazine'), (6, 'Vous Ãªtes'), (7, 'Personnes')], max_length=100, null=True, verbose_name='Show in menus'),
-        ),
-    ]
diff --git a/app/migrations/pages/0008_auto_20180307_1152.py b/app/migrations/pages/0008_auto_20180307_1152.py
deleted file mode 100644 (file)
index b163a83..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2018-03-07 10:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0007_auto_20171213_1703'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='page',
-            name='slug',
-            field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/migrations/pages/__init__.py b/app/migrations/pages/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/app/migrations/shop/0001_initial.py b/app/migrations/shop/0001_initial.py
deleted file mode 100644 (file)
index f1d4cf1..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from decimal import Decimal
-import mezzanine.utils.models
-import mezzanine.core.fields
-import cartridge.shop.fields
-
-from mezzanine.conf import settings
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('pages', '0001_initial'),
-        ('sites', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Cart',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('last_updated', models.DateTimeField(null=True, verbose_name='Last updated')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='CartItem',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('sku', cartridge.shop.fields.SKUField(max_length=20, verbose_name='SKU')),
-                ('description', models.CharField(max_length=2000, verbose_name='Description')),
-                ('quantity', models.IntegerField(default=0, verbose_name='Quantity')),
-                ('unit_price', cartridge.shop.fields.MoneyField(decimal_places=2, default=Decimal('0'), max_digits=10, blank=True, null=True, verbose_name='Unit price')),
-                ('total_price', cartridge.shop.fields.MoneyField(decimal_places=2, default=Decimal('0'), max_digits=10, blank=True, null=True, verbose_name='Total price')),
-                ('url', models.CharField(max_length=2000)),
-                ('image', models.CharField(max_length=200, null=True)),
-                ('cart', models.ForeignKey(related_name='items', to='shop.Cart')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Category',
-            fields=[
-                ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page')),
-                ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')),
-                ('featured_image', mezzanine.core.fields.FileField(max_length=255, null=True, verbose_name='Featured Image', blank=True)),
-                ('price_min', cartridge.shop.fields.MoneyField(null=True, verbose_name='Minimum price', max_digits=10, decimal_places=2, blank=True)),
-                ('price_max', cartridge.shop.fields.MoneyField(null=True, verbose_name='Maximum price', max_digits=10, decimal_places=2, blank=True)),
-                ('combined', models.BooleanField(default=True, help_text='If checked, products must match all specified filters, otherwise products can match any specified filter.', verbose_name='Combined')),
-            ],
-            options={
-                'ordering': ('_order',),
-                'verbose_name': 'Product category',
-                'verbose_name_plural': 'Product categories',
-            },
-            bases=('pages.page', models.Model),
-        ),
-        migrations.CreateModel(
-            name='DiscountCode',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(max_length=100, verbose_name='Title')),
-                ('active', models.BooleanField(default=False, verbose_name='Active')),
-                ('discount_deduct', cartridge.shop.fields.MoneyField(null=True, verbose_name='Reduce by amount', max_digits=10, decimal_places=2, blank=True)),
-                ('discount_percent', cartridge.shop.fields.PercentageField(null=True, verbose_name='Reduce by percent', max_digits=5, decimal_places=2, blank=True)),
-                ('discount_exact', cartridge.shop.fields.MoneyField(null=True, verbose_name='Reduce to amount', max_digits=10, decimal_places=2, blank=True)),
-                ('valid_from', models.DateTimeField(null=True, verbose_name='Valid from', blank=True)),
-                ('valid_to', models.DateTimeField(null=True, verbose_name='Valid to', blank=True)),
-                ('code', cartridge.shop.fields.DiscountCodeField(unique=True, max_length=20, verbose_name='Code')),
-                ('min_purchase', cartridge.shop.fields.MoneyField(null=True, verbose_name='Minimum total purchase', max_digits=10, decimal_places=2, blank=True)),
-                ('free_shipping', models.BooleanField(default=False, verbose_name='Free shipping')),
-                ('uses_remaining', models.IntegerField(help_text='If you wish to limit the number of times a code may be used, set this value. It will be decremented upon each use.', null=True, verbose_name='Uses remaining', blank=True)),
-                ('categories', models.ManyToManyField(related_name='discountcode_related', verbose_name='Categories', to='shop.Category', blank=True)),
-            ],
-            options={
-                'verbose_name': 'Discount code',
-                'verbose_name_plural': 'Discount codes',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Order',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('billing_detail_first_name', models.CharField(max_length=100, verbose_name='First name')),
-                ('billing_detail_last_name', models.CharField(max_length=100, verbose_name='Last name')),
-                ('billing_detail_street', models.CharField(max_length=100, verbose_name='Street')),
-                ('billing_detail_city', models.CharField(max_length=100, verbose_name='City/Suburb')),
-                ('billing_detail_state', models.CharField(max_length=100, verbose_name='State/Region')),
-                ('billing_detail_postcode', models.CharField(max_length=10, verbose_name='Zip/Postcode')),
-                ('billing_detail_country', models.CharField(max_length=100, verbose_name='Country')),
-                ('billing_detail_phone', models.CharField(max_length=20, verbose_name='Phone')),
-                ('billing_detail_email', models.EmailField(max_length=75, verbose_name='Email')),
-                ('shipping_detail_first_name', models.CharField(max_length=100, verbose_name='First name')),
-                ('shipping_detail_last_name', models.CharField(max_length=100, verbose_name='Last name')),
-                ('shipping_detail_street', models.CharField(max_length=100, verbose_name='Street')),
-                ('shipping_detail_city', models.CharField(max_length=100, verbose_name='City/Suburb')),
-                ('shipping_detail_state', models.CharField(max_length=100, verbose_name='State/Region')),
-                ('shipping_detail_postcode', models.CharField(max_length=10, verbose_name='Zip/Postcode')),
-                ('shipping_detail_country', models.CharField(max_length=100, verbose_name='Country')),
-                ('shipping_detail_phone', models.CharField(max_length=20, verbose_name='Phone')),
-                ('additional_instructions', models.TextField(verbose_name='Additional instructions', blank=True)),
-                ('time', models.DateTimeField(auto_now_add=True, verbose_name='Time', null=True)),
-                ('key', models.CharField(max_length=40)),
-                ('user_id', models.IntegerField(null=True, blank=True)),
-                ('shipping_type', models.CharField(max_length=50, verbose_name='Shipping type', blank=True)),
-                ('shipping_total', cartridge.shop.fields.MoneyField(null=True, verbose_name='Shipping total', max_digits=10, decimal_places=2, blank=True)),
-                ('tax_type', models.CharField(max_length=50, verbose_name='Tax type', blank=True)),
-                ('tax_total', cartridge.shop.fields.MoneyField(null=True, verbose_name='Tax total', max_digits=10, decimal_places=2, blank=True)),
-                ('item_total', cartridge.shop.fields.MoneyField(null=True, verbose_name='Item total', max_digits=10, decimal_places=2, blank=True)),
-                ('discount_code', cartridge.shop.fields.DiscountCodeField(max_length=20, verbose_name='Discount code', blank=True)),
-                ('discount_total', cartridge.shop.fields.MoneyField(null=True, verbose_name='Discount total', max_digits=10, decimal_places=2, blank=True)),
-                ('total', cartridge.shop.fields.MoneyField(null=True, verbose_name='Order total', max_digits=10, decimal_places=2, blank=True)),
-                ('transaction_id', models.CharField(max_length=255, null=True, verbose_name='Transaction ID', blank=True)),
-                ('status', models.IntegerField(default=settings.SHOP_ORDER_STATUS_CHOICES[0][0], verbose_name='Status', choices=settings.SHOP_ORDER_STATUS_CHOICES)),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
-            ],
-            options={
-                'ordering': ('-id',),
-                'verbose_name': 'Order',
-                'verbose_name_plural': 'Orders',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='OrderItem',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('sku', cartridge.shop.fields.SKUField(max_length=20, verbose_name='SKU')),
-                ('description', models.CharField(max_length=2000, verbose_name='Description')),
-                ('quantity', models.IntegerField(default=0, verbose_name='Quantity')),
-                ('unit_price', cartridge.shop.fields.MoneyField(decimal_places=2, default=Decimal('0'), max_digits=10, blank=True, null=True, verbose_name='Unit price')),
-                ('total_price', cartridge.shop.fields.MoneyField(decimal_places=2, default=Decimal('0'), max_digits=10, blank=True, null=True, verbose_name='Total price')),
-                ('order', models.ForeignKey(related_name='items', to='shop.Order')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Product',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('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')),
-                ('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', 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')),
-                ('unit_price', cartridge.shop.fields.MoneyField(null=True, verbose_name='Unit price', max_digits=10, decimal_places=2, blank=True)),
-                ('sale_id', models.IntegerField(null=True)),
-                ('sale_price', cartridge.shop.fields.MoneyField(null=True, verbose_name='Sale price', max_digits=10, decimal_places=2, blank=True)),
-                ('sale_from', models.DateTimeField(null=True, verbose_name='Sale start', blank=True)),
-                ('sale_to', models.DateTimeField(null=True, verbose_name='Sale end', blank=True)),
-                ('sku', cartridge.shop.fields.SKUField(max_length=20, unique=True, null=True, verbose_name='SKU', blank=True)),
-                ('num_in_stock', models.IntegerField(null=True, verbose_name='Number in stock', blank=True)),
-                ('available', models.BooleanField(default=False, verbose_name='Available for purchase')),
-                ('image', models.CharField(max_length=100, null=True, verbose_name='Image', blank=True)),
-                ('date_added', models.DateTimeField(auto_now_add=True, verbose_name='Date added', null=True)),
-                ('categories', models.ManyToManyField(to='shop.Category', verbose_name='Product categories', blank=True)),
-                ('related_products', models.ManyToManyField(related_name='related_products_rel_+', verbose_name='Related products', to='shop.Product', blank=True)),
-                ('site', models.ForeignKey(editable=False, to='sites.Site')),
-                ('upsell_products', models.ManyToManyField(related_name='upsell_products_rel_+', verbose_name='Upsell products', to='shop.Product', blank=True)),
-            ],
-            options={
-                'verbose_name': 'Product',
-                'verbose_name_plural': 'Products',
-            },
-            bases=(models.Model, mezzanine.utils.models.AdminThumbMixin),
-        ),
-        migrations.CreateModel(
-            name='ProductAction',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('timestamp', models.IntegerField()),
-                ('total_cart', models.IntegerField(default=0)),
-                ('total_purchase', models.IntegerField(default=0)),
-                ('product', models.ForeignKey(related_name='actions', to='shop.Product')),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='ProductImage',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('_order', models.IntegerField(null=True, verbose_name='Order')),
-                ('file', models.ImageField(upload_to='product', verbose_name='Image')),
-                ('description', models.CharField(max_length=100, verbose_name='Description', blank=True)),
-                ('product', models.ForeignKey(related_name='images', to='shop.Product')),
-            ],
-            options={
-                'ordering': ('_order',),
-                'verbose_name': 'Image',
-                'verbose_name_plural': 'Images',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='ProductOption',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('type', models.IntegerField(verbose_name='Type', choices=[(1, 'Size'), (2, 'Colour')])),
-                ('name', cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Name')),
-            ],
-            options={
-                'verbose_name': 'Product option',
-                'verbose_name_plural': 'Product options',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='ProductVariation',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('unit_price', cartridge.shop.fields.MoneyField(null=True, verbose_name='Unit price', max_digits=10, decimal_places=2, blank=True)),
-                ('sale_id', models.IntegerField(null=True)),
-                ('sale_price', cartridge.shop.fields.MoneyField(null=True, verbose_name='Sale price', max_digits=10, decimal_places=2, blank=True)),
-                ('sale_from', models.DateTimeField(null=True, verbose_name='Sale start', blank=True)),
-                ('sale_to', models.DateTimeField(null=True, verbose_name='Sale end', blank=True)),
-                ('sku', cartridge.shop.fields.SKUField(max_length=20, unique=True, null=True, verbose_name='SKU', blank=True)),
-                ('num_in_stock', models.IntegerField(null=True, verbose_name='Number in stock', blank=True)),
-                ('default', models.BooleanField(default=False, verbose_name='Default')),
-                ('option1', cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Size')),
-                ('option2', cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Colour')),
-                ('image', models.ForeignKey(verbose_name='Image', blank=True, to='shop.ProductImage', null=True)),
-                ('product', models.ForeignKey(related_name='variations', to='shop.Product')),
-            ],
-            options={
-                'ordering': ('-default',),
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Sale',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('title', models.CharField(max_length=100, verbose_name='Title')),
-                ('active', models.BooleanField(default=False, verbose_name='Active')),
-                ('discount_deduct', cartridge.shop.fields.MoneyField(null=True, verbose_name='Reduce by amount', max_digits=10, decimal_places=2, blank=True)),
-                ('discount_percent', cartridge.shop.fields.PercentageField(null=True, verbose_name='Reduce by percent', max_digits=5, decimal_places=2, blank=True)),
-                ('discount_exact', cartridge.shop.fields.MoneyField(null=True, verbose_name='Reduce to amount', max_digits=10, decimal_places=2, blank=True)),
-                ('valid_from', models.DateTimeField(null=True, verbose_name='Valid from', blank=True)),
-                ('valid_to', models.DateTimeField(null=True, verbose_name='Valid to', blank=True)),
-                ('categories', models.ManyToManyField(related_name='sale_related', verbose_name='Categories', to='shop.Category', blank=True)),
-                ('products', models.ManyToManyField(to='shop.Product', verbose_name='Products', blank=True)),
-            ],
-            options={
-                'verbose_name': 'Sale',
-                'verbose_name_plural': 'Sales',
-            },
-            bases=(models.Model,),
-        ),
-        migrations.AlterUniqueTogether(
-            name='productaction',
-            unique_together=set([('product', 'timestamp')]),
-        ),
-        migrations.AddField(
-            model_name='discountcode',
-            name='products',
-            field=models.ManyToManyField(to='shop.Product', verbose_name='Products', blank=True),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='category',
-            name='options',
-            field=models.ManyToManyField(related_name='product_options', verbose_name='Product options', to='shop.ProductOption', blank=True),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='category',
-            name='products',
-            field=models.ManyToManyField(to='shop.Product', verbose_name='Products', blank=True),
-            preserve_default=True,
-        ),
-        migrations.AddField(
-            model_name='category',
-            name='sale',
-            field=models.ForeignKey(verbose_name='Sale', blank=True, to='shop.Sale', null=True),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/shop/0002_auto_20141227_1331.py b/app/migrations/shop/0002_auto_20141227_1331.py
deleted file mode 100644 (file)
index 3e738da..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='productimage',
-            name='_order',
-            field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'),
-            preserve_default=True,
-        ),
-        migrations.AlterField(
-            model_name='productvariation',
-            name='image',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='Image', blank=True, to='shop.ProductImage', null=True),
-            preserve_default=True,
-        ),
-    ]
diff --git a/app/migrations/shop/0003_emailfield.py b/app/migrations/shop/0003_emailfield.py
deleted file mode 100644 (file)
index 61c7c8d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.pages.managers
-import mezzanine.core.managers
-import cartridge.shop.managers
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0002_auto_20141227_1331'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='order',
-            name='billing_detail_email',
-            field=models.EmailField(max_length=254, verbose_name='Email'),
-        ),
-    ]
diff --git a/app/migrations/shop/0004_productimage_file_field.py b/app/migrations/shop/0004_productimage_file_field.py
deleted file mode 100644 (file)
index ce26d93..0000000
+++ /dev/null
@@ -1,20 +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 = [
-        ('shop', '0003_emailfield'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='productimage',
-            name='file',
-            field=mezzanine.core.fields.FileField(verbose_name='Image', max_length=255),
-        ),
-    ]
diff --git a/app/migrations/shop/0005_auto_20150527_1127.py b/app/migrations/shop/0005_auto_20150527_1127.py
deleted file mode 100644 (file)
index ebdf109..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 = [
-        ('shop', '0004_productimage_file_field'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='product',
-            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/shop/0006_auto_20150916_0459.py b/app/migrations/shop/0006_auto_20150916_0459.py
deleted file mode 100644 (file)
index 0b541b5..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 = [
-        ('shop', '0005_auto_20150527_1127'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='order',
-            name='key',
-            field=models.CharField(max_length=40, db_index=True),
-        ),
-    ]
diff --git a/app/migrations/shop/0007_auto_20150921_2323.py b/app/migrations/shop/0007_auto_20150921_2323.py
deleted file mode 100644 (file)
index 7ee6caa..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import cartridge.shop.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0006_auto_20150916_0459'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='product',
-            name='sku',
-            field=cartridge.shop.fields.SKUField(max_length=20, null=True, verbose_name='SKU', blank=True),
-        ),
-        migrations.AlterField(
-            model_name='productvariation',
-            name='sku',
-            field=cartridge.shop.fields.SKUField(max_length=20, null=True, verbose_name='SKU', blank=True),
-        ),
-        migrations.AlterUniqueTogether(
-            name='product',
-            unique_together=set([('sku', 'site')]),
-        ),
-    ]
diff --git a/app/migrations/shop/0008_auto_20160907_1726.py b/app/migrations/shop/0008_auto_20160907_1726.py
deleted file mode 100644 (file)
index 245e180..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.7 on 2016-09-07 15:26
-from __future__ import unicode_literals
-
-import cartridge.shop.fields
-from django.db import migrations, models
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0007_auto_20150921_2323'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='category',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='category',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='_meta_title_en',
-            field=models.CharField(blank=True, 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'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='_meta_title_fr',
-            field=models.CharField(blank=True, 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'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='content_en',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='content_fr',
-            field=mezzanine.core.fields.RichTextField(null=True, verbose_name='Content'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='description_en',
-            field=models.TextField(blank=True, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='description_fr',
-            field=models.TextField(blank=True, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='title_en',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='product',
-            name='title_fr',
-            field=models.CharField(max_length=500, null=True, verbose_name='Title'),
-        ),
-        migrations.AddField(
-            model_name='productimage',
-            name='description_en',
-            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='productimage',
-            name='description_fr',
-            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Description'),
-        ),
-        migrations.AddField(
-            model_name='productoption',
-            name='name_en',
-            field=cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Name'),
-        ),
-        migrations.AddField(
-            model_name='productoption',
-            name='name_fr',
-            field=cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Name'),
-        ),
-        migrations.AddField(
-            model_name='productvariation',
-            name='option1_en',
-            field=cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Size'),
-        ),
-        migrations.AddField(
-            model_name='productvariation',
-            name='option1_fr',
-            field=cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Size'),
-        ),
-        migrations.AddField(
-            model_name='productvariation',
-            name='option2_en',
-            field=cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Colour'),
-        ),
-        migrations.AddField(
-            model_name='productvariation',
-            name='option2_fr',
-            field=cartridge.shop.fields.OptionField(max_length=50, null=True, verbose_name='Colour'),
-        ),
-    ]
diff --git a/app/migrations/shop/0009_product_content_model.py b/app/migrations/shop/0009_product_content_model.py
deleted file mode 100644 (file)
index 38b0521..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2016-11-25 13:37
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0008_auto_20160907_1726'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='product',
-            name='content_model',
-            field=models.CharField(editable=False, max_length=50, null=True),
-        ),
-    ]
diff --git a/app/migrations/shop/0010_remove_product_content_model.py b/app/migrations/shop/0010_remove_product_content_model.py
deleted file mode 100644 (file)
index 54a9ff0..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2016-12-01 10:54
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0009_product_content_model'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='product',
-            name='content_model',
-        ),
-    ]
diff --git a/app/migrations/shop/0011_product_content_model.py b/app/migrations/shop/0011_product_content_model.py
deleted file mode 100644 (file)
index 750e6e6..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2016-12-05 14:36
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0010_remove_product_content_model'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='product',
-            name='content_model',
-            field=models.CharField(editable=False, max_length=50, null=True),
-        ),
-    ]
diff --git a/app/migrations/shop/0012_auto_20180307_1152.py b/app/migrations/shop/0012_auto_20180307_1152.py
deleted file mode 100644 (file)
index 01413ba..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.11 on 2018-03-07 10:52
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0011_product_content_model'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='product',
-            name='slug',
-            field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'),
-            preserve_default=False,
-        ),
-    ]
diff --git a/app/migrations/shop/__init__.py b/app/migrations/shop/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
index 5db06a965b222ff8c3f4ff3b02fd8991b8b68a40..3b7419548f4de7d4aefc884cb7dfcc5c6eb74139 100644 (file)
@@ -308,13 +308,13 @@ BOWER_INSTALLED_APPS = (
 
 # Add Migration Module path see : https://github.com/stephenmcd/mezzanine/blob/master/docs/model-customization.rst#field-injection-caveats
 MIGRATION_MODULES = {
-    "blog": "migrations.blog",
-    "forms": "migrations.forms",
-    "galleries": "migrations.galleries",
-    "pages": "migrations.pages",
-    "conf": "migrations.conf",
-    "shop": "migrations.shop",
-    "generic": "migrations.generic",
+    "blog": "organization.migrations.blog",
+    "forms": "organization.migrations.forms",
+    "galleries": "organization.migrations.galleries",
+    "pages": "organization.migrations.pages",
+    "conf": "organization.migrations.conf",
+    "shop": "organization.migrations.shop",
+    "generic": "organization.migrations.generic",
 }
 
 TEMPLATES = [{
index 08370e7d2360119e99355895cd686f4c3658f7da..b235ccf933dc7b750cd69edc6d177c6bd4621429 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 08370e7d2360119e99355895cd686f4c3658f7da
+Subproject commit b235ccf933dc7b750cd69edc6d177c6bd4621429
index a567596002b1be24c54518b8d36eff2569a48a95..3dc0245c2f80b9713dbd71254b9587b0eb489bc2 160000 (submodule)
@@ -1 +1 @@
-Subproject commit a567596002b1be24c54518b8d36eff2569a48a95
+Subproject commit 3dc0245c2f80b9713dbd71254b9587b0eb489bc2
index 227fddfc76bc58d2e070fb660687a607814296fe..ea5360e7a49f2f31f48b4dd4f2b564f58d0eddc7 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 227fddfc76bc58d2e070fb660687a607814296fe
+Subproject commit ea5360e7a49f2f31f48b4dd4f2b564f58d0eddc7