Fix south migration after merge from master

1 files changed, 28 insertions, 0 deletions

diff --git a/chimere/migrations/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py b/chimere/migrations/0035_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
index 72d718c..568d369 100644
--- a/chimere/migrations/0029_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
+++ b/chimere/migrations/0035_auto__add_field_marker_modified_since_import__add_field_marker_not_for.py
@@ -125,6 +125,7 @@ class Migration(SchemaMigration):
             'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'is_front_page': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
             'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
             'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
@@ -138,6 +139,12 @@ class Migration(SchemaMigration):
             'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
             'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
         },
+        'chimere.multimediaextension': {
+            'Meta': {'object_name': 'MultimediaExtension'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'extensions'", 'to': "orm['chimere.MultimediaType']"}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+        },
         'chimere.multimediafile': {
             'Meta': {'object_name': 'MultimediaFile'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
@@ -163,6 +170,18 @@ class Migration(SchemaMigration):
             'content': ('django.db.models.fields.TextField', [], {}),
             'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_front_page': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'chimere.page': {
+            'Meta': {'object_name': 'Page'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mnemonic': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '10', 'null': 'True', 'blank': 'True'}),
+            'template_path': ('django.db.models.fields.CharField', [], {'max_length': '150', 'null': 'True', 'blank': 'True'}),
             'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
         },
         'chimere.picturefile': {
@@ -196,6 +215,13 @@ class Migration(SchemaMigration):
             'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'properties'", 'blank': 'True', 'to': "orm['chimere.SubCategory']"}),
             'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
         },
+        'chimere.propertymodelchoice': {
+            'Meta': {'object_name': 'PropertyModelChoice'},
+            'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'choices'", 'to': "orm['chimere.PropertyModel']"}),
+            'value': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+        },
         'chimere.route': {
             'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'},
             'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}),
@@ -233,6 +259,8 @@ class Migration(SchemaMigration):
             'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'category': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Category']"}),
             'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
+            'dated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
             'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),