устранение проблем с мёржем

access/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-22 09:27
+# Generated by Django 1.11.6 on 2018-01-29 16:48
 from __future__ import unicode_literals
 
 import access.models.user
@@ -81,6 +81,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('hidden_lessons', django.contrib.postgres.fields.ArrayField(base_field=models.UUIDField(editable=False, unique=True, verbose_name='Токен урока'), default=[], size=None, verbose_name='Список скрытых уроков')),
                 ('course_token', models.UUIDField(editable=False, verbose_name='Токен курса')),
+                ('active_lesson', models.UUIDField(blank=True, null=True, verbose_name='Токен активного урока')),
                 ('teacher', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teacher_progress', to=settings.AUTH_USER_MODEL, verbose_name='Преподователь по умолчанию')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Студент')),
             ],
@@ -105,6 +106,19 @@ class Migration(migrations.Migration):
                 'verbose_name_plural': 'Прохождение урока',
             },
         ),
+        migrations.CreateModel(
+            name='UserActivity',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ip_list', django.contrib.postgres.fields.ArrayField(base_field=models.GenericIPAddressField(editable=False, verbose_name='Ip адресс'), default=[], size=None)),
+                ('last_request', models.DateTimeField(auto_now=True, verbose_name='Был в сети')),
+                ('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'Пользовательская активность',
+                'verbose_name_plural': 'Пользовательская активность',
+            },
+        ),
         migrations.CreateModel(
             name='ResetPassword',
             fields=[

access/migrations/0003_useractivity.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-23 10:11
-from __future__ import unicode_literals
-
-from django.conf import settings
-import django.contrib.postgres.fields
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('access', '0002_init_group'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='UserActivity',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('ip_list', django.contrib.postgres.fields.ArrayField(base_field=models.GenericIPAddressField(editable=False, verbose_name='Ip адресс'), default=[], size=None)),
-                ('last_request', models.DateTimeField(auto_now=True, verbose_name='Был в сети')),
-                ('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-                'verbose_name': 'Пользовательская активность',
-                'verbose_name_plural': 'Пользовательская активность',
-            },
-        ),
-    ]

access/migrations/0004_auto_20180129_0933.py

@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-29 09:33
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('access', '0003_useractivity'),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name='progress',
-            unique_together=set([]),
-        ),
-        migrations.RemoveField(
-            model_name='progress',
-            name='teacher',
-        ),
-        migrations.RemoveField(
-            model_name='progress',
-            name='user',
-        ),
-        migrations.AlterUniqueTogether(
-            name='progresslesson',
-            unique_together=set([]),
-        ),
-        migrations.RemoveField(
-            model_name='progresslesson',
-            name='progress',
-        ),
-        migrations.RemoveField(
-            model_name='progresslesson',
-            name='teacher',
-        ),
-        migrations.DeleteModel(
-            name='Progress',
-        ),
-        migrations.DeleteModel(
-            name='ProgressLesson',
-        ),
-    ]

achievements/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-22 09:27
+# Generated by Django 1.11.6 on 2018-01-29 16:48
 from __future__ import unicode_literals
 
 from django.conf import settings

courses/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-22 09:27
+# Generated by Django 1.11.6 on 2018-01-29 16:48
 from __future__ import unicode_literals
 
 import django.contrib.postgres.fields

finance/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-22 09:27
+# Generated by Django 1.11.6 on 2018-01-29 16:48
 from __future__ import unicode_literals
 
 from django.conf import settings
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('yandex_money', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('yandex_money', '0002_auto_20171128_1150'),
     ]
 
     operations = [

library/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-22 09:27
+# Generated by Django 1.11.6 on 2018-01-29 16:48
 from __future__ import unicode_literals
 
 import datetime

storage/migrations/0001_initial.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2018-01-22 09:27
+# Generated by Django 1.11.6 on 2018-01-29 16:48
 from __future__ import unicode_literals
 
 from django.db import migrations, models