Clean up and linearize migration history.

contentcuration/contentcuration/migrations/0115_index_contentnode_node_id_field.py

@@ -2,15 +2,17 @@
 # Generated by Django 1.11.29 on 2020-08-06 20:20
 from __future__ import unicode_literals
 
+from django.db import migrations
+from django.db import models
+
 import contentcuration.models
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ("contentcuration", "0114_merge_20200806_1746"),
+        ("contentcuration", "0114_assessment_item_unique_keypair"),
     ]
 
     operations = [

contentcuration/contentcuration/migrations/0119_auto_20200915_1839.py → contentcuration/contentcuration/migrations/0116_index_channel_contentnode_file.py

@@ -11,7 +11,7 @@
 class Migration(migrations.Migration):
     atomic = False
     dependencies = [
-        ('contentcuration', '0118_auto_20200904_1737'),
+        ('contentcuration', '0115_index_contentnode_node_id_field'),
     ]
 
     operations = [

contentcuration/contentcuration/migrations/0122_assessment_id_index.py → contentcuration/contentcuration/migrations/0117_assessment_id_index.py

@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     atomic = False
 
     dependencies = [
-        ("contentcuration", "0121_auto_20200917_1912"),
+        ("contentcuration", "0116_index_channel_contentnode_file"),
     ]
 
     operations = [

contentcuration/contentcuration/migrations/0118_relaunch_migrations.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.29 on 2021-01-14 15:50
+from __future__ import unicode_literals
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contentcuration', '0117_assessment_id_index'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='contentnode',
+            name='complete',
+            field=models.NullBooleanField(),
+        ),
+        migrations.AddField(
+            model_name='invitation',
+            name='accepted',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='invitation',
+            name='declined',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='invitation',
+            name='revoked',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='disk_space_used',
+            field=models.FloatField(default=0, help_text='How many bytes a user has uploaded'),
+        ),
+        migrations.AlterField(
+            model_name='channel',
+            name='preferences',
+            field=models.TextField(default='{"license": null, "language": null, "author": null, "aggregator": null, "provider": null, "copyright_holder": null, "license_description": null, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "n_value": 5, "auto_derive_video_thumbnail": true, "auto_derive_audio_thumbnail": true, "auto_derive_document_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_exercise_thumbnail": true, "auto_randomize_questions": true}'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='created',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='created'),
+        ),
+        migrations.AlterField(
+            model_name='contentnode',
+            name='title',
+            field=models.CharField(blank=True, max_length=200),
+        ),
+        migrations.AlterField(
+            model_name='contenttag',
+            name='channel',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='tags', to='contentcuration.Channel'),
+        ),
+        migrations.AlterField(
+            model_name='file',
+            name='uploaded_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='files', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='invitation',
+            name='channel',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pending_editors', to='contentcuration.Channel'),
+        ),
+        migrations.AlterField(
+            model_name='invitation',
+            name='first_name',
+            field=models.CharField(blank=True, max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='invitation',
+            name='sender',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='sent_by', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='preferences',
+            field=models.TextField(default='{"license": null, "language": null, "author": null, "aggregator": null, "provider": null, "copyright_holder": null, "license_description": null, "mastery_model": "num_correct_in_a_row_5", "m_value": 5, "n_value": 5, "auto_derive_video_thumbnail": true, "auto_derive_audio_thumbnail": true, "auto_derive_document_thumbnail": true, "auto_derive_html5_thumbnail": true, "auto_derive_exercise_thumbnail": true, "auto_randomize_questions": true}'),
+        ),
+    ]