Merge migratrions

1 files changed, 32 insertions, 2 deletions

diff --git a/chimere/migrations/0017_auto__add_unique_tinyurl_parameters.py b/chimere/migrations/0020_auto__add_unique_tinyurl_parameters.py
index 502628a..3c2d65a 100644
--- a/chimere/migrations/0017_auto__add_unique_tinyurl_parameters.py
+++ b/chimere/migrations/0020_auto__add_unique_tinyurl_parameters.py
@@ -106,6 +106,10 @@ class Migration(SchemaMigration):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+            'offset_x': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'offset_y': ('django.db.models.fields.IntegerField', [], {'default': '20'}),
+            'popup_offset_x': ('django.db.models.fields.IntegerField', [], {'default': '5'}),
+            'popup_offset_y': ('django.db.models.fields.IntegerField', [], {'default': '20'}),
             'width': ('django.db.models.fields.IntegerField', [], {})
         },
         'chimere.importer': {
@@ -197,7 +201,7 @@ class Migration(SchemaMigration):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
         },
         'chimere.news': {
-            'Meta': {'object_name': 'News'},
+            'Meta': {'ordering': "['-date']", 'object_name': 'News'},
             'areas': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'to': "orm['chimere.Area']", 'null': 'True', 'blank': 'True'}),
             'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'content': ('django.db.models.fields.TextField', [], {}),
@@ -208,7 +212,7 @@ class Migration(SchemaMigration):
             'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
         },
         'chimere.page': {
-            'Meta': {'object_name': 'Page'},
+            'Meta': {'ordering': "['order']", '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'}),
@@ -231,6 +235,32 @@ class Migration(SchemaMigration):
             'thumbnailfile_width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
             'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
         },
+        'chimere.polygon': {
+            'Meta': {'ordering': "('status', 'name')", 'object_name': 'Polygon'},
+            'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+            'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            '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'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'license': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {}),
+            'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'origin': ('django.db.models.fields.CharField', [], {'max_length': '1000', 'null': 'True', 'blank': 'True'}),
+            'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+            'polygon': ('chimere.widgets.PolygonField', [], {}),
+            'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_polygon'", 'null': 'True', 'to': "orm['chimere.Polygon']"}),
+            'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+            'submiter_comment': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            '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'}),
+            'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
         'chimere.property': {
             'Meta': {'object_name': 'Property'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),