diff --git a/project/blog/migrations/0001_initial.py b/project/blog/migrations/0001_initial.py index d3dd642..3b67c1f 100644 --- a/project/blog/migrations/0001_initial.py +++ b/project/blog/migrations/0001_initial.py @@ -1,10 +1,16 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2016-11-28 21:53 +# Generated by Django 1.10.4 on 2016-12-15 22:11 from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion +import wagtail.wagtailcore.blocks import wagtail.wagtailcore.fields +import wagtail.wagtaildocs.blocks +import wagtail.wagtailembeds.blocks +import wagtail.wagtailimages.blocks +import wagtailmarkdown.blocks +import wagtailmetadata.models class Migration(migrations.Migration): @@ -25,12 +31,13 @@ class Migration(migrations.Migration): ('modified', models.DateTimeField(auto_now=True)), ('date', models.DateField(verbose_name='Post date')), ('intro', models.CharField(max_length=250)), - ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('body', wagtail.wagtailcore.fields.StreamField((('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(icon='code', template='blocks/gist.html')), ('heading', wagtail.wagtailcore.blocks.StructBlock((('size', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('h1', 'H1'), ('h2', 'H2'), ('h3', 'H3'), ('h4', 'H4'), ('h5', 'H5')])), ('value', wagtail.wagtailcore.blocks.CharBlock())))), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('markdown', wagtailmarkdown.blocks.MarkdownBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ol', label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ul', label='Unordered List')), ('video', wagtail.wagtailcore.blocks.StructBlock((('video', wagtail.wagtailembeds.blocks.EmbedBlock()), ('caption', wagtail.wagtailcore.blocks.CharBlock()))))))), ('main_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), + ('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ 'abstract': False, }, - bases=('wagtailcore.page',), + bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model), ), ] diff --git a/project/blog/migrations/0002_auto_20161208_1112.py b/project/blog/migrations/0002_auto_20161208_1112.py deleted file mode 100644 index 6bb36f4..0000000 --- a/project/blog/migrations/0002_auto_20161208_1112.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2016-12-08 11:12 -from __future__ import unicode_literals - -from django.db import migrations -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtaildocs.blocks -import wagtail.wagtailimages.blocks -import wagtailmarkdown.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('blog', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='blogpage', - name='body', - field=wagtail.wagtailcore.fields.StreamField((('h1', wagtail.wagtailcore.blocks.CharBlock(classname='h1', icon='title', label='H1')), ('h2', wagtail.wagtailcore.blocks.CharBlock(classname='h2', icon='title', label='H2')), ('h3', wagtail.wagtailcore.blocks.CharBlock(classname='h3', icon='title', label='H3')), ('h4', wagtail.wagtailcore.blocks.CharBlock(classname='h4', icon='title', label='H4')), ('h5', wagtail.wagtailcore.blocks.CharBlock(classname='h5', icon='title', label='H5')), ('h6', wagtail.wagtailcore.blocks.CharBlock(classname='h6', icon='title', label='H6')), ('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(icon='code', template='blocks/gist.html')), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('markdown', wagtailmarkdown.blocks.MarkdownBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ol', label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ul', label='Unordered List')))), - ), - ] diff --git a/project/common/migrations/__init__.py b/project/common/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/project/home/migrations/0001_initial.py b/project/home/migrations/0001_initial.py index 3fb2c1e..dd89869 100644 --- a/project/home/migrations/0001_initial.py +++ b/project/home/migrations/0001_initial.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2016-11-28 21:53 +# Generated by Django 1.10.4 on 2016-12-15 22:11 from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import wagtail.wagtailcore.fields +import wagtailmetadata.models class Migration(migrations.Migration): @@ -12,6 +13,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('wagtailimages', '0015_fill_filter_spec_field'), ('wagtailcore', '0030_index_on_pagerevision_created_at'), ] @@ -23,10 +25,11 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('modified', models.DateTimeField(auto_now=True)), ('body', wagtail.wagtailcore.fields.RichTextField(blank=True)), + ('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ 'abstract': False, }, - bases=('wagtailcore.page',), + bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model), ), ] diff --git a/project/home/migrations/__init__.py b/project/home/migrations/__init__.py old mode 100755 new mode 100644 diff --git a/project/pages/migrations/0001_initial.py b/project/pages/migrations/0001_initial.py index cbabb5b..7e5fd33 100644 --- a/project/pages/migrations/0001_initial.py +++ b/project/pages/migrations/0001_initial.py @@ -1,10 +1,16 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2016-11-28 21:53 +# Generated by Django 1.10.4 on 2016-12-15 22:11 from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion +import wagtail.wagtailcore.blocks import wagtail.wagtailcore.fields +import wagtail.wagtaildocs.blocks +import wagtail.wagtailembeds.blocks +import wagtail.wagtailimages.blocks +import wagtailmarkdown.blocks +import wagtailmetadata.models class Migration(migrations.Migration): @@ -13,6 +19,7 @@ class Migration(migrations.Migration): dependencies = [ ('wagtailcore', '0030_index_on_pagerevision_created_at'), + ('wagtailimages', '0015_fill_filter_spec_field'), ] operations = [ @@ -24,11 +31,12 @@ class Migration(migrations.Migration): ('modified', models.DateTimeField(auto_now=True)), ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True)), ('hide_list', models.BooleanField(default=False)), + ('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ 'abstract': False, }, - bases=('wagtailcore.page',), + bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model), ), migrations.CreateModel( name='SimpleContentPage', @@ -36,11 +44,12 @@ 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='wagtailcore.Page')), ('created', models.DateTimeField(auto_now_add=True)), ('modified', models.DateTimeField(auto_now=True)), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.wagtailcore.fields.StreamField((('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(icon='code', template='blocks/gist.html')), ('heading', wagtail.wagtailcore.blocks.StructBlock((('size', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('h1', 'H1'), ('h2', 'H2'), ('h3', 'H3'), ('h4', 'H4'), ('h5', 'H5')])), ('value', wagtail.wagtailcore.blocks.CharBlock())))), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('markdown', wagtailmarkdown.blocks.MarkdownBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ol', label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ul', label='Unordered List')), ('video', wagtail.wagtailcore.blocks.StructBlock((('video', wagtail.wagtailembeds.blocks.EmbedBlock()), ('caption', wagtail.wagtailcore.blocks.CharBlock()))))))), + ('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ 'abstract': False, }, - bases=('wagtailcore.page',), + bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model), ), ] diff --git a/project/pages/migrations/0002_auto_20161208_1112.py b/project/pages/migrations/0002_auto_20161208_1112.py deleted file mode 100644 index 065f849..0000000 --- a/project/pages/migrations/0002_auto_20161208_1112.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2016-12-08 11:12 -from __future__ import unicode_literals - -from django.db import migrations -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtaildocs.blocks -import wagtail.wagtailimages.blocks -import wagtailmarkdown.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('pages', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='simplecontentpage', - name='body', - field=wagtail.wagtailcore.fields.StreamField((('h1', wagtail.wagtailcore.blocks.CharBlock(classname='h1', icon='title', label='H1')), ('h2', wagtail.wagtailcore.blocks.CharBlock(classname='h2', icon='title', label='H2')), ('h3', wagtail.wagtailcore.blocks.CharBlock(classname='h3', icon='title', label='H3')), ('h4', wagtail.wagtailcore.blocks.CharBlock(classname='h4', icon='title', label='H4')), ('h5', wagtail.wagtailcore.blocks.CharBlock(classname='h5', icon='title', label='H5')), ('h6', wagtail.wagtailcore.blocks.CharBlock(classname='h6', icon='title', label='H6')), ('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(icon='code', template='blocks/gist.html')), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('markdown', wagtailmarkdown.blocks.MarkdownBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ol', label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ul', label='Unordered List')))), - ), - ] diff --git a/project/projects/migrations/0001_initial.py b/project/projects/migrations/0001_initial.py index 54376d2..4f5d26b 100644 --- a/project/projects/migrations/0001_initial.py +++ b/project/projects/migrations/0001_initial.py @@ -1,11 +1,17 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10.3 on 2016-11-28 21:53 +# Generated by Django 1.10.4 on 2016-12-15 22:11 from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import project.projects.models +import wagtail.wagtailcore.blocks import wagtail.wagtailcore.fields +import wagtail.wagtaildocs.blocks +import wagtail.wagtailembeds.blocks +import wagtail.wagtailimages.blocks +import wagtailmarkdown.blocks +import wagtailmetadata.models class Migration(migrations.Migration): @@ -26,15 +32,16 @@ class Migration(migrations.Migration): ('created', models.DateTimeField(auto_now_add=True)), ('modified', models.DateTimeField(auto_now=True)), ('summary', models.CharField(max_length=500)), - ('body', wagtail.wagtailcore.fields.RichTextField()), + ('body', wagtail.wagtailcore.fields.StreamField((('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(icon='code', template='blocks/gist.html')), ('heading', wagtail.wagtailcore.blocks.StructBlock((('size', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('h1', 'H1'), ('h2', 'H2'), ('h3', 'H3'), ('h4', 'H4'), ('h5', 'H5')])), ('value', wagtail.wagtailcore.blocks.CharBlock())))), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('markdown', wagtailmarkdown.blocks.MarkdownBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ol', label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ul', label='Unordered List')), ('video', wagtail.wagtailcore.blocks.StructBlock((('video', wagtail.wagtailembeds.blocks.EmbedBlock()), ('caption', wagtail.wagtailcore.blocks.CharBlock()))))))), ('project_url', models.URLField(blank=True, validators=[project.projects.models.validate_url])), ('download_url', models.URLField(blank=True, validators=[project.projects.models.validate_url])), ('asset', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtaildocs.Document')), ('main_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), + ('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ 'abstract': False, }, - bases=('wagtailcore.page',), + bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model), ), ] diff --git a/project/projects/migrations/0002_auto_20161203_2311.py b/project/projects/migrations/0002_auto_20161203_2311.py deleted file mode 100644 index b2361ad..0000000 --- a/project/projects/migrations/0002_auto_20161203_2311.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2016-12-03 23:11 -from __future__ import unicode_literals - -from django.db import migrations -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtaildocs.blocks -import wagtail.wagtailimages.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='projectpage', - name='body', - field=wagtail.wagtailcore.fields.StreamField((('h1', wagtail.wagtailcore.blocks.CharBlock(classname='h1', icon='title', label='H1')), ('h2', wagtail.wagtailcore.blocks.CharBlock(classname='h2', icon='title', label='H2')), ('h3', wagtail.wagtailcore.blocks.CharBlock(classname='h3', icon='title', label='H3')), ('h4', wagtail.wagtailcore.blocks.CharBlock(classname='h4', icon='title', label='H4')), ('h5', wagtail.wagtailcore.blocks.CharBlock(classname='h5', icon='title', label='H5')), ('h6', wagtail.wagtailcore.blocks.CharBlock(classname='h6', icon='title', label='H6')), ('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(template='blocks/gist.html')), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), label='Unordered List')))), - ), - ] diff --git a/project/projects/migrations/0003_auto_20161205_1613.py b/project/projects/migrations/0003_auto_20161205_1613.py deleted file mode 100644 index 0a52a09..0000000 --- a/project/projects/migrations/0003_auto_20161205_1613.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10.4 on 2016-12-05 16:13 -from __future__ import unicode_literals - -from django.db import migrations -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtaildocs.blocks -import wagtail.wagtailimages.blocks -import wagtailmarkdown.blocks - - -class Migration(migrations.Migration): - - dependencies = [ - ('projects', '0002_auto_20161203_2311'), - ] - - operations = [ - migrations.AlterField( - model_name='projectpage', - name='body', - field=wagtail.wagtailcore.fields.StreamField((('h1', wagtail.wagtailcore.blocks.CharBlock(classname='h1', icon='title', label='H1')), ('h2', wagtail.wagtailcore.blocks.CharBlock(classname='h2', icon='title', label='H2')), ('h3', wagtail.wagtailcore.blocks.CharBlock(classname='h3', icon='title', label='H3')), ('h4', wagtail.wagtailcore.blocks.CharBlock(classname='h4', icon='title', label='H4')), ('h5', wagtail.wagtailcore.blocks.CharBlock(classname='h5', icon='title', label='H5')), ('h6', wagtail.wagtailcore.blocks.CharBlock(classname='h6', icon='title', label='H6')), ('ansi', wagtail.wagtailcore.blocks.TextBlock(template='blocks/ansi.html')), ('document', wagtail.wagtaildocs.blocks.DocumentChooserBlock()), ('gist', wagtail.wagtailcore.blocks.CharBlock(icon='code', template='blocks/gist.html')), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('markdown', wagtailmarkdown.blocks.MarkdownBlock()), ('ol', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ol', label='Ordered List', template='blocks/ordered-list.html')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('raw_html', wagtail.wagtailcore.blocks.RawHTMLBlock(label='Raw HTML')), ('secret', wagtail.wagtailcore.blocks.RichTextBlock(icon='password', template='blocks/secret.html')), ('ul', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.CharBlock(label='List Item'), icon='list-ul', label='Unordered List')))), - ), - ]