Merge branch 'hotfix/fix_migration' into 'develop'

fix migration

See merge request !41

access/migrations/0089_auto_20170810_0904.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.3 on 2017-08-10 09:04
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('access', '0088_auto_20170123_1947'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='delay_date',
+            field=models.DateTimeField(blank=True, default=datetime.datetime(2017, 8, 10, 9, 4, 29, 732661), null=True, verbose_name='Задержка до. Не включая этот день.'),
+        ),
+    ]

courses/migrations/0045_auto_20170810_0904.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.3 on 2017-08-10 09:04
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0044_auto_20170621_1548'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='lesson',
+            name='on_comment',
+            field=models.CharField(choices=[('N', 'Включены'), ('F', 'Отключены'), ('T', 'Подчиняется теме')], default='T', help_text='https://go.skillbox.ru/management/faq/37', max_length=1, verbose_name='Блок комментариев'),
+        ),
+    ]

courses/migrations/0046_auto_20170711_1704.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.3 on 2017-07-11 17:04
-from __future__ import unicode_literals
-
-import datetime
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0045_merge'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Flow',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('title', models.CharField(max_length=255, verbose_name='Название')),
-                ('description', models.TextField(blank=True, default='', null=True, verbose_name='Описание')),
-                ('start_flow', models.DateTimeField(default=datetime.datetime.now, verbose_name='Дата начала потока')),
-                ('created', models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='Создан')),
-                ('modified', models.DateTimeField(auto_now=True, verbose_name='Изменен')),
-                ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Course', verbose_name='Курс')),
-            ],
-            options={
-                'ordering': ['-modified'],
-                'verbose_name_plural': 'Потоки',
-                'verbose_name': 'Поток',
-            },
-        ),
-        migrations.RemoveField(
-            model_name='coursetheme',
-            name='empty_old',
-        ),
-    ]

courses/migrations/0047_remove_course_public_old.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.3 on 2017-07-11 17:09
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('courses', '0046_auto_20170711_1704'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='course',
-            name='public_old',
-        ),
-    ]

fabfile.py

@@ -296,8 +296,8 @@ def create():
     with virtualenv():
         #manage('migrate --run-syncdb --noinput')
         #manage('migrate --list')
-        #manage("migrate --noinput")
-        manage("collectstatic -v 0 --noinput")
+        manage("migrate --noinput")
+        manage("collectstatic -l --noinput")
 
     #if exists('%sgunicorn.pid'):
     #    sudo("kill -HUP 'cat %sgunicorn.pid'" % env.project_path)

finance/migrations/0071_bill_flow.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.3 on 2017-08-10 09:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0045_auto_20170810_0904'),
+        ('finance', '0070_auto_20170424_1638'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bill',
+            name='flow',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='courses.Flow', verbose_name='Поток'),
+        ),
+    ]

journals/migrations/0072_auto_20170810_0904.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.3 on 2017-08-10 09:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journals', '0071_auto_20161202_0338'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='homeworkj',
+            name='date',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='Дата предоставления доступа'),
+        ),
+    ]