From af0a3df73953f773d6ee32ea1de70e31062d6f88 Mon Sep 17 00:00:00 2001 From: Alexander Zolotarev Date: Fri, 10 Feb 2017 16:13:40 +0300 Subject: [PATCH] merge migration --- access/migrations/0001_initial.py | 180 ++++----- access/migrations/0002_auto_20160405_2045.py | 40 +- access/migrations/0003_user_delay.py | 40 +- access/migrations/0004_auto_20160412_2152.py | 52 +-- access/migrations/0005_auto_20160414_1527.py | 40 +- access/migrations/0006_user_delay_date.py | 42 +- access/migrations/0007_auto_20160414_1543.py | 42 +- access/migrations/0008_auto_20160414_1547.py | 42 +- access/migrations/0009_auto_20160414_1941.py | 42 +- access/migrations/0010_auto_20160414_1944.py | 42 +- access/migrations/0011_auto_20160420_1749.py | 42 +- access/migrations/0012_auto_20160420_1819.py | 42 +- access/migrations/0013_auto_20160421_1808.py | 52 +-- access/migrations/0014_auto_20160421_1824.py | 42 +- access/migrations/0015_auto_20160421_1829.py | 42 +- access/migrations/0016_auto_20160421_2009.py | 52 +-- access/migrations/0017_auto_20160421_2135.py | 52 +-- access/migrations/0018_auto_20160422_1555.py | 52 +-- access/migrations/0019_auto_20160424_1646.py | 52 +-- access/migrations/0020_auto_20160506_1303.py | 42 +- access/migrations/0021_auto_20160509_1331.py | 62 +-- access/migrations/0022_auto_20160509_1401.py | 82 ++-- access/migrations/0023_auto_20160509_1408.py | 76 ++-- access/migrations/0024_auto_20160509_1537.py | 122 +++--- access/migrations/0025_auto_20160509_1539.py | 52 +-- access/migrations/0026_auto_20160509_1803.py | 52 +-- access/migrations/0027_auto_20160510_1823.py | 92 ++--- access/migrations/0028_auto_20160526_1427.py | 122 +++--- access/migrations/0029_auto_20160526_1435.py | 76 ++-- access/migrations/0030_auto_20160526_1727.py | 52 +-- access/migrations/0031_auto_20160531_1240.py | 52 +-- access/migrations/0032_auto_20160601_1256.py | 42 +- access/migrations/0033_auto_20160607_1614.py | 42 +- access/migrations/0034_auto_20160607_2002.py | 42 +- access/migrations/0035_auto_20160607_2034.py | 42 +- access/migrations/0036_auto_20160607_2051.py | 42 +- access/migrations/0037_auto_20160608_1700.py | 42 +- access/migrations/0038_auto_20160608_1705.py | 42 +- access/migrations/0039_auto_20160608_1804.py | 42 +- access/migrations/0040_auto_20160608_1841.py | 42 +- access/migrations/0041_auto_20160609_1429.py | 42 +- access/migrations/0042_auto_20160609_1442.py | 42 +- access/migrations/0043_auto_20160609_1534.py | 42 +- access/migrations/0044_auto_20160609_1536.py | 42 +- access/migrations/0045_auto_20160609_1536.py | 42 +- access/migrations/0046_auto_20160609_1546.py | 42 +- access/migrations/0047_auto_20160609_1627.py | 42 +- access/migrations/0048_auto_20160609_2224.py | 42 +- access/migrations/0049_auto_20160628_1731.py | 42 +- access/migrations/0050_auto_20160711_1518.py | 42 +- access/migrations/0051_auto_20160713_2038.py | 42 +- access/migrations/0052_auto_20160718_1714.py | 42 +- access/migrations/0053_auto_20160718_1714.py | 42 +- access/migrations/0054_auto_20160725_1551.py | 62 +-- access/migrations/0055_auto_20160809_1653.py | 72 ++-- access/migrations/0056_auto_20160809_1659.py | 52 +-- access/migrations/0057_auto_20160810_1234.py | 42 +- access/migrations/0058_auto_20160814_1736.py | 42 +- access/migrations/0059_auto_20160815_1853.py | 396 +++++++++---------- access/migrations/0060_auto_20160815_1855.py | 52 +-- access/migrations/0081_auto_20161008_0222.py | 26 -- access/migrations/__init__.py | 0 62 files changed, 1757 insertions(+), 1783 deletions(-) mode change 100644 => 100755 access/migrations/0001_initial.py mode change 100644 => 100755 access/migrations/0002_auto_20160405_2045.py mode change 100644 => 100755 access/migrations/0003_user_delay.py mode change 100644 => 100755 access/migrations/0004_auto_20160412_2152.py mode change 100644 => 100755 access/migrations/0005_auto_20160414_1527.py mode change 100644 => 100755 access/migrations/0006_user_delay_date.py mode change 100644 => 100755 access/migrations/0007_auto_20160414_1543.py mode change 100644 => 100755 access/migrations/0008_auto_20160414_1547.py mode change 100644 => 100755 access/migrations/0009_auto_20160414_1941.py mode change 100644 => 100755 access/migrations/0010_auto_20160414_1944.py mode change 100644 => 100755 access/migrations/0011_auto_20160420_1749.py mode change 100644 => 100755 access/migrations/0012_auto_20160420_1819.py mode change 100644 => 100755 access/migrations/0013_auto_20160421_1808.py mode change 100644 => 100755 access/migrations/0014_auto_20160421_1824.py mode change 100644 => 100755 access/migrations/0015_auto_20160421_1829.py mode change 100644 => 100755 access/migrations/0016_auto_20160421_2009.py mode change 100644 => 100755 access/migrations/0017_auto_20160421_2135.py mode change 100644 => 100755 access/migrations/0018_auto_20160422_1555.py mode change 100644 => 100755 access/migrations/0019_auto_20160424_1646.py mode change 100644 => 100755 access/migrations/0020_auto_20160506_1303.py mode change 100644 => 100755 access/migrations/0021_auto_20160509_1331.py mode change 100644 => 100755 access/migrations/0022_auto_20160509_1401.py mode change 100644 => 100755 access/migrations/0023_auto_20160509_1408.py mode change 100644 => 100755 access/migrations/0024_auto_20160509_1537.py mode change 100644 => 100755 access/migrations/0025_auto_20160509_1539.py mode change 100644 => 100755 access/migrations/0026_auto_20160509_1803.py mode change 100644 => 100755 access/migrations/0027_auto_20160510_1823.py mode change 100644 => 100755 access/migrations/0028_auto_20160526_1427.py mode change 100644 => 100755 access/migrations/0029_auto_20160526_1435.py mode change 100644 => 100755 access/migrations/0030_auto_20160526_1727.py mode change 100644 => 100755 access/migrations/0031_auto_20160531_1240.py mode change 100644 => 100755 access/migrations/0032_auto_20160601_1256.py mode change 100644 => 100755 access/migrations/0033_auto_20160607_1614.py mode change 100644 => 100755 access/migrations/0034_auto_20160607_2002.py mode change 100644 => 100755 access/migrations/0035_auto_20160607_2034.py mode change 100644 => 100755 access/migrations/0036_auto_20160607_2051.py mode change 100644 => 100755 access/migrations/0037_auto_20160608_1700.py mode change 100644 => 100755 access/migrations/0038_auto_20160608_1705.py mode change 100644 => 100755 access/migrations/0039_auto_20160608_1804.py mode change 100644 => 100755 access/migrations/0040_auto_20160608_1841.py mode change 100644 => 100755 access/migrations/0041_auto_20160609_1429.py mode change 100644 => 100755 access/migrations/0042_auto_20160609_1442.py mode change 100644 => 100755 access/migrations/0043_auto_20160609_1534.py mode change 100644 => 100755 access/migrations/0044_auto_20160609_1536.py mode change 100644 => 100755 access/migrations/0045_auto_20160609_1536.py mode change 100644 => 100755 access/migrations/0046_auto_20160609_1546.py mode change 100644 => 100755 access/migrations/0047_auto_20160609_1627.py mode change 100644 => 100755 access/migrations/0048_auto_20160609_2224.py mode change 100644 => 100755 access/migrations/0049_auto_20160628_1731.py mode change 100644 => 100755 access/migrations/0050_auto_20160711_1518.py mode change 100644 => 100755 access/migrations/0051_auto_20160713_2038.py mode change 100644 => 100755 access/migrations/0052_auto_20160718_1714.py mode change 100644 => 100755 access/migrations/0053_auto_20160718_1714.py mode change 100644 => 100755 access/migrations/0054_auto_20160725_1551.py mode change 100644 => 100755 access/migrations/0055_auto_20160809_1653.py mode change 100644 => 100755 access/migrations/0056_auto_20160809_1659.py mode change 100644 => 100755 access/migrations/0057_auto_20160810_1234.py mode change 100644 => 100755 access/migrations/0058_auto_20160814_1736.py mode change 100644 => 100755 access/migrations/0059_auto_20160815_1853.py mode change 100644 => 100755 access/migrations/0060_auto_20160815_1855.py delete mode 100644 access/migrations/0081_auto_20161008_0222.py mode change 100644 => 100755 access/migrations/__init__.py diff --git a/access/migrations/0001_initial.py b/access/migrations/0001_initial.py old mode 100644 new mode 100755 index 7016df0..d8faae9 --- a/access/migrations/0001_initial.py +++ b/access/migrations/0001_initial.py @@ -1,90 +1,90 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-03-18 16:46 -from __future__ import unicode_literals - -import access.models -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='User', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('password', models.CharField(max_length=128, verbose_name='password')), - ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), - ('deactivate', models.BooleanField(default=False, verbose_name='\u0423\u0432\u043e\u043b\u0438\u0442\u044c')), - ('email', models.EmailField(blank=True, db_index=True, editable=False, max_length=255, unique=True, verbose_name=b'email')), - ('changed_email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='\u042f\u0449\u0438\u043a \u043d\u0430 \u0437\u0430\u043c\u0435\u043d\u0443')), - ('phone', models.CharField(default=b'', max_length=255, verbose_name='\u0422\u0435\u043b\u0435\u0444\u043e\u043d')), - ('back_phone', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u041f\u0440\u0435\u0434\u0438\u0434\u0443\u0449\u0438\u0439 \u0442\u0435\u043b\u0435\u0444\u043e\u043d')), - ('status', models.CharField(choices=[(b'ON', b'on-line'), (b'OFF', b'off-line')], default=b'ON', max_length=9)), - ('in_role', models.CharField(choices=[(b'U', '\u0421\u0442\u0443\u0434\u0435\u043d\u0442 \u0448\u043a\u043e\u043b\u044b'), (b'T', '\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c'), (b'M', '\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440'), (b'S', '\u0420\u0443\u043a\u043e\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c'), (b'S2', '\u041e\u043a\u043e \u0441\u0430\u0443\u0440\u043e\u043d\u0430'), (b'A', '\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440')], default=b'U', max_length=2, verbose_name='\u0420\u043e\u043b\u044c')), - ('city', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0413\u043e\u0440\u043e\u0434')), - ('b_day', models.DateField(blank=True, null=True, verbose_name='\u0414\u0435\u043d\u044c \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f')), - ('token', models.CharField(blank=True, default=b'', max_length=255)), - ('activate_time', models.DateTimeField(default=access.models.get_activate_time, verbose_name='\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e')), - ('reg_status', models.CharField(choices=[(b'1', b'\xd0\x9f\xd0\xb0\xd1\x80\xd0\xbe\xd0\xbb\xd1\x8c'), (b'2', b'\xd0\x9e \xd1\x81\xd0\xb5\xd0\xb1\xd0\xb5'), (b'3', b'\xd0\xa4\xd0\xbe\xd1\x82\xd0\xbe'), (b'4', b'\xd0\x97\xd0\xb0\xd0\xba\xd0\xbe\xd0\xbd\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb0')], default=b'1', max_length=1, verbose_name='\u0421\u0442\u0430\u0442\u0443\u0441 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438')), - ('is_active', models.BooleanField(default=False)), - ('is_admin', models.BooleanField(default=False)), - ('is_staff', models.BooleanField(default=False)), - ('avatar', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u041a\u043b\u044e\u0447 \u0430\u0432\u0430\u0442\u0430\u0440\u0430')), - ('in_avatar', models.ImageField(blank=True, editable=False, null=True, upload_to=b'', verbose_name='\u041d\u0430\u0448 \u0430\u0432\u0430\u0442\u0430\u0440')), - ('fname', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0424\u0430\u043c\u0438\u043b\u0438\u044f')), - ('name', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0418\u043c\u044f')), - ('oname', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u041e\u0442\u0447\u0435\u0441\u0442\u0432\u043e')), - ('skype', models.CharField(blank=True, default=b'', max_length=300)), - ('facebook', models.CharField(blank=True, default=b'', max_length=255)), - ('vk', models.CharField(blank=True, default=b'', max_length=255)), - ('linkedin', models.CharField(blank=True, default=b'', max_length=255)), - ('odnoklassniki', models.CharField(blank=True, default=b'', max_length=255)), - ('date_joined', models.DateTimeField(default=datetime.datetime.now)), - ], - options={ - 'verbose_name': '\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f', - 'verbose_name_plural': '\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438', - }, - ), - migrations.CreateModel( - name='ActionJ', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('a_type', models.CharField(choices=[(b'B', b'b-default'), (b'P', b'b-primary'), (b'S', b'b-success'), (b'I', b'b-info'), (b'W', b'b-warning'), (b'D', b'b-danger')], default=b'B', max_length=1, verbose_name='\u0422\u0438\u043f \u0441\u043e\u0431\u044b\u0442\u0438\u044f')), - ('place', models.CharField(max_length=100, verbose_name='\u041c\u0435\u0441\u0442\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0441\u043e\u0431\u044b\u0442\u0438\u044f')), - ('date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f')), - ('text', models.TextField(verbose_name='\u0422\u0435\u043a\u0441\u0442 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='\u0421\u0442\u0443\u0434\u0435\u043d\u0442')), - ], - options={ - 'verbose_name': '\u0416\u0443\u0440\u043d\u0430\u043b \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0438', - 'verbose_name_plural': '\u0416\u0443\u0440\u043d\u0430\u043b\u044b \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0435\u0439', - }, - ), - migrations.CreateModel( - name='Subscription', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('news', models.BooleanField(default=True, verbose_name='\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0430 \u043d\u043e\u0432\u043e\u0441\u0442\u0438')), - ('teacher', models.BooleanField(default=True, verbose_name='\u041e\u0442\u0432\u0435\u0442\u044b \u043f\u0440\u0435\u043f\u043e\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044f')), - ('new_comments', models.BooleanField(default=True, verbose_name='\u041e\u0442\u0432\u0435\u0442\u044b \u043d\u0430 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438')), - ('send_sms', models.BooleanField(default=False, verbose_name='\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c sms')), - ('courses', models.BooleanField(default=True, verbose_name='\u041d\u043e\u0432\u044b\u0435 \u043a\u0443\u0440\u0441\u044b')), - ('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='rights_owner', to=settings.AUTH_USER_MODEL, verbose_name='\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446')), - ], - options={ - 'verbose_name': '\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430', - 'verbose_name_plural': '\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0438', - }, - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-03-18 16:46 +from __future__ import unicode_literals + +import access.models +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='User', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('deactivate', models.BooleanField(default=False, verbose_name='\u0423\u0432\u043e\u043b\u0438\u0442\u044c')), + ('email', models.EmailField(blank=True, db_index=True, editable=False, max_length=255, unique=True, verbose_name=b'email')), + ('changed_email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='\u042f\u0449\u0438\u043a \u043d\u0430 \u0437\u0430\u043c\u0435\u043d\u0443')), + ('phone', models.CharField(default=b'', max_length=255, verbose_name='\u0422\u0435\u043b\u0435\u0444\u043e\u043d')), + ('back_phone', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u041f\u0440\u0435\u0434\u0438\u0434\u0443\u0449\u0438\u0439 \u0442\u0435\u043b\u0435\u0444\u043e\u043d')), + ('status', models.CharField(choices=[(b'ON', b'on-line'), (b'OFF', b'off-line')], default=b'ON', max_length=9)), + ('in_role', models.CharField(choices=[(b'U', '\u0421\u0442\u0443\u0434\u0435\u043d\u0442 \u0448\u043a\u043e\u043b\u044b'), (b'T', '\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c'), (b'M', '\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440'), (b'S', '\u0420\u0443\u043a\u043e\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c'), (b'S2', '\u041e\u043a\u043e \u0441\u0430\u0443\u0440\u043e\u043d\u0430'), (b'A', '\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440')], default=b'U', max_length=2, verbose_name='\u0420\u043e\u043b\u044c')), + ('city', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0413\u043e\u0440\u043e\u0434')), + ('b_day', models.DateField(blank=True, null=True, verbose_name='\u0414\u0435\u043d\u044c \u0440\u043e\u0436\u0434\u0435\u043d\u0438\u044f')), + ('token', models.CharField(blank=True, default=b'', max_length=255)), + ('activate_time', models.DateTimeField(default=access.models.get_activate_time, verbose_name='\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e')), + ('reg_status', models.CharField(choices=[(b'1', b'\xd0\x9f\xd0\xb0\xd1\x80\xd0\xbe\xd0\xbb\xd1\x8c'), (b'2', b'\xd0\x9e \xd1\x81\xd0\xb5\xd0\xb1\xd0\xb5'), (b'3', b'\xd0\xa4\xd0\xbe\xd1\x82\xd0\xbe'), (b'4', b'\xd0\x97\xd0\xb0\xd0\xba\xd0\xbe\xd0\xbd\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb0')], default=b'1', max_length=1, verbose_name='\u0421\u0442\u0430\u0442\u0443\u0441 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0438')), + ('is_active', models.BooleanField(default=False)), + ('is_admin', models.BooleanField(default=False)), + ('is_staff', models.BooleanField(default=False)), + ('avatar', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u041a\u043b\u044e\u0447 \u0430\u0432\u0430\u0442\u0430\u0440\u0430')), + ('in_avatar', models.ImageField(blank=True, editable=False, null=True, upload_to=b'', verbose_name='\u041d\u0430\u0448 \u0430\u0432\u0430\u0442\u0430\u0440')), + ('fname', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0424\u0430\u043c\u0438\u043b\u0438\u044f')), + ('name', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0418\u043c\u044f')), + ('oname', models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u041e\u0442\u0447\u0435\u0441\u0442\u0432\u043e')), + ('skype', models.CharField(blank=True, default=b'', max_length=300)), + ('facebook', models.CharField(blank=True, default=b'', max_length=255)), + ('vk', models.CharField(blank=True, default=b'', max_length=255)), + ('linkedin', models.CharField(blank=True, default=b'', max_length=255)), + ('odnoklassniki', models.CharField(blank=True, default=b'', max_length=255)), + ('date_joined', models.DateTimeField(default=datetime.datetime.now)), + ], + options={ + 'verbose_name': '\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f', + 'verbose_name_plural': '\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438', + }, + ), + migrations.CreateModel( + name='ActionJ', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('a_type', models.CharField(choices=[(b'B', b'b-default'), (b'P', b'b-primary'), (b'S', b'b-success'), (b'I', b'b-info'), (b'W', b'b-warning'), (b'D', b'b-danger')], default=b'B', max_length=1, verbose_name='\u0422\u0438\u043f \u0441\u043e\u0431\u044b\u0442\u0438\u044f')), + ('place', models.CharField(max_length=100, verbose_name='\u041c\u0435\u0441\u0442\u043e \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0441\u043e\u0431\u044b\u0442\u0438\u044f')), + ('date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f')), + ('text', models.TextField(verbose_name='\u0422\u0435\u043a\u0441\u0442 \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f')), + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='\u0421\u0442\u0443\u0434\u0435\u043d\u0442')), + ], + options={ + 'verbose_name': '\u0416\u0443\u0440\u043d\u0430\u043b \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0438', + 'verbose_name_plural': '\u0416\u0443\u0440\u043d\u0430\u043b\u044b \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u0435\u0439', + }, + ), + migrations.CreateModel( + name='Subscription', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('news', models.BooleanField(default=True, verbose_name='\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430 \u043d\u0430 \u043d\u043e\u0432\u043e\u0441\u0442\u0438')), + ('teacher', models.BooleanField(default=True, verbose_name='\u041e\u0442\u0432\u0435\u0442\u044b \u043f\u0440\u0435\u043f\u043e\u0434\u043e\u0432\u0430\u0442\u0435\u043b\u044f')), + ('new_comments', models.BooleanField(default=True, verbose_name='\u041e\u0442\u0432\u0435\u0442\u044b \u043d\u0430 \u043a\u043e\u043c\u043c\u0435\u043d\u0442\u0430\u0440\u0438\u0438')), + ('send_sms', models.BooleanField(default=False, verbose_name='\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c sms')), + ('courses', models.BooleanField(default=True, verbose_name='\u041d\u043e\u0432\u044b\u0435 \u043a\u0443\u0440\u0441\u044b')), + ('owner', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='rights_owner', to=settings.AUTH_USER_MODEL, verbose_name='\u0412\u043b\u0430\u0434\u0435\u043b\u0435\u0446')), + ], + options={ + 'verbose_name': '\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0430', + 'verbose_name_plural': '\u041f\u043e\u0434\u043f\u0438\u0441\u043a\u0438', + }, + ), + ] diff --git a/access/migrations/0002_auto_20160405_2045.py b/access/migrations/0002_auto_20160405_2045.py old mode 100644 new mode 100755 index 30cfe57..c7c1f13 --- a/access/migrations/0002_auto_20160405_2045.py +++ b/access/migrations/0002_auto_20160405_2045.py @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-05 20:45 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='in_role', - field=models.CharField(choices=[(b'U', '\u0421\u0442\u0443\u0434\u0435\u043d\u0442 \u0448\u043a\u043e\u043b\u044b'), (b'T', '\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c'), (b'M', '\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440'), (b'S', '\u0420\u0443\u043a\u043e\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c'), (b'S2', '\u041e\u043a\u043e \u0441\u0430\u0443\u0440\u043e\u043d\u0430'), (b'A', '\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440'), (b'Ts', '\u0422\u0435\u0441\u0442\u043e\u0432\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c')], default=b'U', max_length=2, verbose_name='\u0420\u043e\u043b\u044c'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-05 20:45 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='in_role', + field=models.CharField(choices=[(b'U', '\u0421\u0442\u0443\u0434\u0435\u043d\u0442 \u0448\u043a\u043e\u043b\u044b'), (b'T', '\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c'), (b'M', '\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440'), (b'S', '\u0420\u0443\u043a\u043e\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c'), (b'S2', '\u041e\u043a\u043e \u0441\u0430\u0443\u0440\u043e\u043d\u0430'), (b'A', '\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440'), (b'Ts', '\u0422\u0435\u0441\u0442\u043e\u0432\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c')], default=b'U', max_length=2, verbose_name='\u0420\u043e\u043b\u044c'), + ), + ] diff --git a/access/migrations/0003_user_delay.py b/access/migrations/0003_user_delay.py old mode 100644 new mode 100755 index 2f6acc2..8d7e759 --- a/access/migrations/0003_user_delay.py +++ b/access/migrations/0003_user_delay.py @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-12 21:45 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0002_auto_20160405_2045'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='delay', - field=models.BooleanField(default=False, verbose_name='\u041c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-12 21:45 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0002_auto_20160405_2045'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='delay', + field=models.BooleanField(default=False, verbose_name='\u041c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438'), + ), + ] diff --git a/access/migrations/0004_auto_20160412_2152.py b/access/migrations/0004_auto_20160412_2152.py old mode 100644 new mode 100755 index f0dd1a5..bb0ce33 --- a/access/migrations/0004_auto_20160412_2152.py +++ b/access/migrations/0004_auto_20160412_2152.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-12 21:52 -from __future__ import unicode_literals - -from django.db import migrations, models -import redactor.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0003_user_delay'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='delay_description', - field=redactor.fields.RedactorField(blank=True, verbose_name='\u041f\u043e\u0432\u043e\u0434 \u043f\u0440\u043e\u0441\u0440\u043e\u0447\u043a\u0438'), - ), - migrations.AlterField( - model_name='user', - name='delay', - field=models.BooleanField(default=False, help_text='\u0415\u0441\u043b\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u044b \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438 \u0441 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430\u043c\u0438', verbose_name='\u041c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-12 21:52 +from __future__ import unicode_literals + +from django.db import migrations, models +import redactor.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0003_user_delay'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='delay_description', + field=redactor.fields.RedactorField(blank=True, verbose_name='\u041f\u043e\u0432\u043e\u0434 \u043f\u0440\u043e\u0441\u0440\u043e\u0447\u043a\u0438'), + ), + migrations.AlterField( + model_name='user', + name='delay', + field=models.BooleanField(default=False, help_text='\u0415\u0441\u043b\u0438 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u044b \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438 \u0441 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0430\u043c\u0438', verbose_name='\u041c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0437\u0430\u0434\u0435\u0440\u0436\u043a\u0438'), + ), + ] diff --git a/access/migrations/0005_auto_20160414_1527.py b/access/migrations/0005_auto_20160414_1527.py old mode 100644 new mode 100755 index 22e260c..84149ec --- a/access/migrations/0005_auto_20160414_1527.py +++ b/access/migrations/0005_auto_20160414_1527.py @@ -1,20 +1,20 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-14 15:27 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0004_auto_20160412_2152'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_description', - field=models.TextField(blank=True, verbose_name='\u041f\u043e\u0432\u043e\u0434 \u043f\u0440\u043e\u0441\u0440\u043e\u0447\u043a\u0438'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-14 15:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0004_auto_20160412_2152'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_description', + field=models.TextField(blank=True, verbose_name='\u041f\u043e\u0432\u043e\u0434 \u043f\u0440\u043e\u0441\u0440\u043e\u0447\u043a\u0438'), + ), + ] diff --git a/access/migrations/0006_user_delay_date.py b/access/migrations/0006_user_delay_date.py old mode 100644 new mode 100755 index 7443446..a5f18be --- a/access/migrations/0006_user_delay_date.py +++ b/access/migrations/0006_user_delay_date.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-14 15:42 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0005_auto_20160414_1527'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='delay_date', - field=models.TextField(blank=True, default=datetime.datetime(2016, 4, 14, 15, 42, 6, 457603), verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-14 15:42 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0005_auto_20160414_1527'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='delay_date', + field=models.TextField(blank=True, default=datetime.datetime(2016, 4, 14, 15, 42, 6, 457603), verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0007_auto_20160414_1543.py b/access/migrations/0007_auto_20160414_1543.py old mode 100644 new mode 100755 index 9957784..f828383 --- a/access/migrations/0007_auto_20160414_1543.py +++ b/access/migrations/0007_auto_20160414_1543.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-14 15:43 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0006_user_delay_date'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.TextField(blank=True, default=datetime.datetime(2016, 4, 14, 15, 43, 33, 80232), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-14 15:43 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0006_user_delay_date'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.TextField(blank=True, default=datetime.datetime(2016, 4, 14, 15, 43, 33, 80232), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0008_auto_20160414_1547.py b/access/migrations/0008_auto_20160414_1547.py old mode 100644 new mode 100755 index eea46b9..dc1ad3b --- a/access/migrations/0008_auto_20160414_1547.py +++ b/access/migrations/0008_auto_20160414_1547.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-14 15:47 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0007_auto_20160414_1543'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 14, 15, 47, 18, 142514), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-14 15:47 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0007_auto_20160414_1543'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 14, 15, 47, 18, 142514), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0009_auto_20160414_1941.py b/access/migrations/0009_auto_20160414_1941.py old mode 100644 new mode 100755 index d0ae92c..caaba9d --- a/access/migrations/0009_auto_20160414_1941.py +++ b/access/migrations/0009_auto_20160414_1941.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-14 19:41 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0008_auto_20160414_1547'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 14, 19, 41, 21, 863845), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-14 19:41 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0008_auto_20160414_1547'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 14, 19, 41, 21, 863845), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0010_auto_20160414_1944.py b/access/migrations/0010_auto_20160414_1944.py old mode 100644 new mode 100755 index 8885049..0f1fab0 --- a/access/migrations/0010_auto_20160414_1944.py +++ b/access/migrations/0010_auto_20160414_1944.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-14 19:44 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0009_auto_20160414_1941'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 14, 19, 44, 42, 129160), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-14 19:44 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0009_auto_20160414_1941'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 14, 19, 44, 42, 129160), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0011_auto_20160420_1749.py b/access/migrations/0011_auto_20160420_1749.py old mode 100644 new mode 100755 index ccdbef3..873ea53 --- a/access/migrations/0011_auto_20160420_1749.py +++ b/access/migrations/0011_auto_20160420_1749.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-20 17:49 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0010_auto_20160414_1944'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 20, 17, 49, 55, 401859), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-20 17:49 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0010_auto_20160414_1944'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 20, 17, 49, 55, 401859), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0012_auto_20160420_1819.py b/access/migrations/0012_auto_20160420_1819.py old mode 100644 new mode 100755 index 352d048..3d9bdec --- a/access/migrations/0012_auto_20160420_1819.py +++ b/access/migrations/0012_auto_20160420_1819.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-20 18:19 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0011_auto_20160420_1749'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 20, 18, 19, 6, 238659), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-20 18:19 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0011_auto_20160420_1749'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 20, 18, 19, 6, 238659), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0013_auto_20160421_1808.py b/access/migrations/0013_auto_20160421_1808.py old mode 100644 new mode 100755 index c760952..720be78 --- a/access/migrations/0013_auto_20160421_1808.py +++ b/access/migrations/0013_auto_20160421_1808.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-21 18:08 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0012_auto_20160420_1819'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='interactive_key', - field=models.CharField(blank=True, max_length=255, verbose_name='\u0418\u043d\u0442\u0435\u0440\u0430\u043a\u0442\u0438\u0432\u044b\u0439 \u043a\u043b\u044e\u0447'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 18, 8, 50, 535390), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-21 18:08 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0012_auto_20160420_1819'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='interactive_key', + field=models.CharField(blank=True, max_length=255, verbose_name='\u0418\u043d\u0442\u0435\u0440\u0430\u043a\u0442\u0438\u0432\u044b\u0439 \u043a\u043b\u044e\u0447'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 18, 8, 50, 535390), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0014_auto_20160421_1824.py b/access/migrations/0014_auto_20160421_1824.py old mode 100644 new mode 100755 index 7593097..72cd100 --- a/access/migrations/0014_auto_20160421_1824.py +++ b/access/migrations/0014_auto_20160421_1824.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-21 18:24 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0013_auto_20160421_1808'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 18, 24, 46, 904871), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-21 18:24 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0013_auto_20160421_1808'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 18, 24, 46, 904871), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0015_auto_20160421_1829.py b/access/migrations/0015_auto_20160421_1829.py old mode 100644 new mode 100755 index f180b4c..cbf25b4 --- a/access/migrations/0015_auto_20160421_1829.py +++ b/access/migrations/0015_auto_20160421_1829.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-21 18:29 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0014_auto_20160421_1824'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 18, 29, 23, 185173), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-21 18:29 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0014_auto_20160421_1824'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 18, 29, 23, 185173), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0016_auto_20160421_2009.py b/access/migrations/0016_auto_20160421_2009.py old mode 100644 new mode 100755 index bdf8150..eb13ff7 --- a/access/migrations/0016_auto_20160421_2009.py +++ b/access/migrations/0016_auto_20160421_2009.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-21 20:09 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0015_auto_20160421_1829'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='private', - field=models.CharField(choices=[(b'A', b'\xd0\x92\xd1\x81\xd0\xb5\xd0\xbc\xd1\x83 \xd0\xb8\xd0\xbd\xd1\x82\xd0\xb5\xd1\x80\xd0\xbd\xd0\xb5\xd1\x82\xd1\x83'), (b'U', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f\xd0\xbc lms'), (b'L', b'\xd0\x9f\xd0\xbe \xd0\xbf\xd1\x80\xd1\x8f\xd0\xbc\xd0\xbe\xd0\xb9 \xd1\x81\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb5'), (b'B', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbc\xd0\xbd\xd0\xb5')], default=b'A', max_length=1, verbose_name='\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0441\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044f'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 20, 9, 41, 221779), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-21 20:09 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0015_auto_20160421_1829'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='private', + field=models.CharField(choices=[(b'A', b'\xd0\x92\xd1\x81\xd0\xb5\xd0\xbc\xd1\x83 \xd0\xb8\xd0\xbd\xd1\x82\xd0\xb5\xd1\x80\xd0\xbd\xd0\xb5\xd1\x82\xd1\x83'), (b'U', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f\xd0\xbc lms'), (b'L', b'\xd0\x9f\xd0\xbe \xd0\xbf\xd1\x80\xd1\x8f\xd0\xbc\xd0\xbe\xd0\xb9 \xd1\x81\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb5'), (b'B', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbc\xd0\xbd\xd0\xb5')], default=b'A', max_length=1, verbose_name='\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0441\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044f'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 20, 9, 41, 221779), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0017_auto_20160421_2135.py b/access/migrations/0017_auto_20160421_2135.py old mode 100644 new mode 100755 index f540a46..9c57c09 --- a/access/migrations/0017_auto_20160421_2135.py +++ b/access/migrations/0017_auto_20160421_2135.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-21 21:35 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0016_auto_20160421_2009'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='last_time', - field=models.DateTimeField(default=datetime.datetime.now, verbose_name='\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 21, 35, 2, 761309), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-21 21:35 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0016_auto_20160421_2009'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='last_time', + field=models.DateTimeField(default=datetime.datetime.now, verbose_name='\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u044f\u044f \u0430\u043a\u0442\u0438\u0432\u043d\u043e\u0441\u0442\u044c'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 21, 21, 35, 2, 761309), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0018_auto_20160422_1555.py b/access/migrations/0018_auto_20160422_1555.py old mode 100644 new mode 100755 index 49093e5..9269c37 --- a/access/migrations/0018_auto_20160422_1555.py +++ b/access/migrations/0018_auto_20160422_1555.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-04-22 15:55 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0017_auto_20160421_2135'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='unique_role', - field=models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0423\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u0430\u044f \u0440\u043e\u043b\u044c'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 22, 15, 55, 55, 944230), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-04-22 15:55 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0017_auto_20160421_2135'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='unique_role', + field=models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0423\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u0430\u044f \u0440\u043e\u043b\u044c'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 22, 15, 55, 55, 944230), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0019_auto_20160424_1646.py b/access/migrations/0019_auto_20160424_1646.py old mode 100644 new mode 100755 index 1f4a417..dada5e7 --- a/access/migrations/0019_auto_20160424_1646.py +++ b/access/migrations/0019_auto_20160424_1646.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-04-24 16:46 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0018_auto_20160422_1555'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='customer', - field=models.BooleanField(default=False, verbose_name='\u041f\u043e\u043a\u0443\u043f\u0430\u0442\u0435\u043b\u044c'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 24, 16, 46, 31, 25686), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-04-24 16:46 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0018_auto_20160422_1555'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='customer', + field=models.BooleanField(default=False, verbose_name='\u041f\u043e\u043a\u0443\u043f\u0430\u0442\u0435\u043b\u044c'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 4, 24, 16, 46, 31, 25686), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0020_auto_20160506_1303.py b/access/migrations/0020_auto_20160506_1303.py old mode 100644 new mode 100755 index d712a74..188b3f3 --- a/access/migrations/0020_auto_20160506_1303.py +++ b/access/migrations/0020_auto_20160506_1303.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-06 13:03 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0019_auto_20160424_1646'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 6, 13, 3, 19, 582728), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-06 13:03 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0019_auto_20160424_1646'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 6, 13, 3, 19, 582728), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0021_auto_20160509_1331.py b/access/migrations/0021_auto_20160509_1331.py old mode 100644 new mode 100755 index 1fdc5b9..a86c891 --- a/access/migrations/0021_auto_20160509_1331.py +++ b/access/migrations/0021_auto_20160509_1331.py @@ -1,31 +1,31 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-09 13:31 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0020_auto_20160506_1303'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='refer', - field=models.CharField(choices=[(b'S', b'\xd0\xa1\xd0\xb0\xd0\xbc \xd0\xb7\xd0\xb0\xd1\x80\xd0\xb5\xd0\xb3\xd0\xb8\xd1\x81\xd1\x82\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbb\xd1\x81\xd1\x8f'), (b'B', b'\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xbb\xd0\xb5\xd1\x87\xd0\xb5\xd0\xbd')], default=b'S', max_length=1, null=True, verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a'), - ), - migrations.AddField( - model_name='user', - name='refer_source', - field=models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 13, 31, 31, 19346), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-09 13:31 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0020_auto_20160506_1303'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='refer', + field=models.CharField(choices=[(b'S', b'\xd0\xa1\xd0\xb0\xd0\xbc \xd0\xb7\xd0\xb0\xd1\x80\xd0\xb5\xd0\xb3\xd0\xb8\xd1\x81\xd1\x82\xd0\xb8\xd1\x80\xd0\xbe\xd0\xb2\xd0\xb0\xd0\xbb\xd1\x81\xd1\x8f'), (b'B', b'\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xbb\xd0\xb5\xd1\x87\xd0\xb5\xd0\xbd')], default=b'S', max_length=1, null=True, verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a'), + ), + migrations.AddField( + model_name='user', + name='refer_source', + field=models.CharField(blank=True, default=b'', max_length=255, verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 13, 31, 31, 19346), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0022_auto_20160509_1401.py b/access/migrations/0022_auto_20160509_1401.py old mode 100644 new mode 100755 index c86280b..549c467 --- a/access/migrations/0022_auto_20160509_1401.py +++ b/access/migrations/0022_auto_20160509_1401.py @@ -1,41 +1,41 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-09 14:01 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0021_auto_20160509_1331'), - ] - - operations = [ - migrations.CreateModel( - name='TrafSource', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('on', models.BooleanField(default=True, verbose_name='\u0410\u0442\u0438\u0432\u0435\u043d')), - ('url', models.URLField(verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0442\u0440\u0430\u0444\u0438\u043a\u0430')), - ('token', models.CharField(max_length=255, verbose_name='\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430')), - ('live_time', models.IntegerField(blank=True, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430')), - ('date_start', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430')), - ], - options={ - 'verbose_name': '\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0442\u0440\u0430\u0444\u0438\u043a\u0430', - 'verbose_name_plural': '\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0438 \u0442\u0440\u0430\u0444\u0438\u043a\u0430', - }, - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 14, 1, 37, 826573), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AlterField( - model_name='user', - name='refer', - field=models.CharField(choices=[(b'S', b'\xd0\x9e\xd1\x80\xd0\xb3\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x87\xd0\xbd\xd0\xbe'), (b'B', b'\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xbb\xd0\xb5\xd1\x87\xd0\xb5\xd0\xbd')], default=b'S', max_length=1, null=True, verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-09 14:01 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0021_auto_20160509_1331'), + ] + + operations = [ + migrations.CreateModel( + name='TrafSource', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('on', models.BooleanField(default=True, verbose_name='\u0410\u0442\u0438\u0432\u0435\u043d')), + ('url', models.URLField(verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0442\u0440\u0430\u0444\u0438\u043a\u0430')), + ('token', models.CharField(max_length=255, verbose_name='\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430')), + ('live_time', models.IntegerField(blank=True, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430')), + ('date_start', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430')), + ], + options={ + 'verbose_name': '\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0442\u0440\u0430\u0444\u0438\u043a\u0430', + 'verbose_name_plural': '\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0438 \u0442\u0440\u0430\u0444\u0438\u043a\u0430', + }, + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 14, 1, 37, 826573), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AlterField( + model_name='user', + name='refer', + field=models.CharField(choices=[(b'S', b'\xd0\x9e\xd1\x80\xd0\xb3\xd0\xb0\xd0\xbd\xd0\xb8\xd1\x87\xd0\xbd\xd0\xbe'), (b'B', b'\xd0\x9f\xd1\x80\xd0\xb8\xd0\xb2\xd0\xbb\xd0\xb5\xd1\x87\xd0\xb5\xd0\xbd')], default=b'S', max_length=1, null=True, verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a'), + ), + ] diff --git a/access/migrations/0023_auto_20160509_1408.py b/access/migrations/0023_auto_20160509_1408.py old mode 100644 new mode 100755 index 3a0064a..551c3cb --- a/access/migrations/0023_auto_20160509_1408.py +++ b/access/migrations/0023_auto_20160509_1408.py @@ -1,38 +1,38 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-09 14:08 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0022_auto_20160509_1401'), - ] - - operations = [ - migrations.CreateModel( - name='TrafHistory', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('action', models.CharField(choices=[(b'G', b'\xd0\x9f\xd0\xbe\xd0\xbb\xd1\x83\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xb4\xd0\xb0\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85'), (b'C', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f'), (b'O', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x81\xd1\x87\xd0\xb5\xd1\x82\xd0\xb0')], max_length=1, verbose_name='\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435')), - ('data', models.TextField(verbose_name='\u0414\u0430\u043d\u043d\u044b\u0435 \u0432 \u0437\u0430\u043f\u0440\u043e\u0441\u0435')), - ('result', models.BooleanField(default=False, verbose_name='\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0437\u0430\u043f\u0440\u043e\u0441\u0430')), - ('result_description', models.CharField(blank=True, max_length=255, verbose_name='\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430')), - ('date', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u043e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u044f')), - ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='access.TrafSource', verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0437\u0430\u043f\u0440\u043e\u0441\u0430')), - ], - options={ - 'verbose_name': '\u041e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430', - 'verbose_name_plural': '\u041e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u044f \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u043e\u0432', - }, - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 14, 8, 4, 599702), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-09 14:08 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0022_auto_20160509_1401'), + ] + + operations = [ + migrations.CreateModel( + name='TrafHistory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('action', models.CharField(choices=[(b'G', b'\xd0\x9f\xd0\xbe\xd0\xbb\xd1\x83\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xb4\xd0\xb0\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85'), (b'C', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f'), (b'O', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x81\xd1\x87\xd0\xb5\xd1\x82\xd0\xb0')], max_length=1, verbose_name='\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435')), + ('data', models.TextField(verbose_name='\u0414\u0430\u043d\u043d\u044b\u0435 \u0432 \u0437\u0430\u043f\u0440\u043e\u0441\u0435')), + ('result', models.BooleanField(default=False, verbose_name='\u0420\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0437\u0430\u043f\u0440\u043e\u0441\u0430')), + ('result_description', models.CharField(blank=True, max_length=255, verbose_name='\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442\u0430')), + ('date', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u043e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u044f')), + ('source', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='access.TrafSource', verbose_name='\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u0437\u0430\u043f\u0440\u043e\u0441\u0430')), + ], + options={ + 'verbose_name': '\u041e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u0435 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430', + 'verbose_name_plural': '\u041e\u0431\u0440\u0430\u0449\u0435\u043d\u0438\u044f \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u043e\u0432', + }, + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 14, 8, 4, 599702), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0024_auto_20160509_1537.py b/access/migrations/0024_auto_20160509_1537.py old mode 100644 new mode 100755 index 093d7ce..b3b76fa --- a/access/migrations/0024_auto_20160509_1537.py +++ b/access/migrations/0024_auto_20160509_1537.py @@ -1,61 +1,61 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-09 15:37 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0023_auto_20160509_1408'), - ] - - operations = [ - migrations.CreateModel( - name='TrafTokenHistory', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('token', models.CharField(editable=False, max_length=255, verbose_name='\u0422\u043e\u043a\u0435\u043d')), - ('live_time', models.IntegerField(editable=False, help_text='\u0412 \u0447\u0430\u0441\u0430\u0445', verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438')), - ('date_start', models.DateTimeField(editable=False, verbose_name='\u0414\u0430\u0442\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0442\u043e\u043a\u0435\u043d\u0430')), - ('date_end', models.DateTimeField(editable=False, verbose_name='\u0414\u0430\u0442\u0430 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f')), - ], - options={ - 'verbose_name': '\u0418\u0441\u0442\u043e\u0440\u0438\u044f \u0441\u043c\u0435\u043d\u044b \u0442\u043e\u043a\u0435\u043d\u0430', - 'verbose_name_plural': '\u0418\u0441\u0442\u043e\u0440\u0438\u0438 \u0441\u043c\u0435\u043d\u044b \u0442\u043e\u043a\u0435\u043d\u043e\u0432', - }, - ), - migrations.AddField( - model_name='trafhistory', - name='token', - field=models.CharField(max_length=255, null=True, verbose_name='\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0439 \u0442\u043e\u043a\u0435\u043d'), - ), - migrations.AddField( - model_name='trafsource', - name='token_start', - field=models.DateTimeField(editable=False, null=True, verbose_name='\u0422\u043e\u0447\u043a\u0430 \u043e\u0442\u0441\u0447\u0435\u0442\u0430 \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430'), - ), - migrations.AlterField( - model_name='trafsource', - name='live_time', - field=models.IntegerField(blank=True, help_text='\u0423\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u0447\u0430\u0441\u0430\u0445. \u043f\u0443\u0441\u0442\u043e\u0435 \u043f\u043e\u043b\u0435 - \u043f\u043e\u0436\u0438\u0437\u043d\u0435\u043d\u043d\u043e', verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430'), - ), - migrations.AlterField( - model_name='trafsource', - name='token', - field=models.CharField(editable=False, max_length=255, verbose_name='\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 15, 37, 34, 495507), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AddField( - model_name='traftokenhistory', - name='sources', - field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='access.TrafSource', verbose_name='\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0449\u0438\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-09 15:37 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0023_auto_20160509_1408'), + ] + + operations = [ + migrations.CreateModel( + name='TrafTokenHistory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('token', models.CharField(editable=False, max_length=255, verbose_name='\u0422\u043e\u043a\u0435\u043d')), + ('live_time', models.IntegerField(editable=False, help_text='\u0412 \u0447\u0430\u0441\u0430\u0445', verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438')), + ('date_start', models.DateTimeField(editable=False, verbose_name='\u0414\u0430\u0442\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0442\u043e\u043a\u0435\u043d\u0430')), + ('date_end', models.DateTimeField(editable=False, verbose_name='\u0414\u0430\u0442\u0430 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f')), + ], + options={ + 'verbose_name': '\u0418\u0441\u0442\u043e\u0440\u0438\u044f \u0441\u043c\u0435\u043d\u044b \u0442\u043e\u043a\u0435\u043d\u0430', + 'verbose_name_plural': '\u0418\u0441\u0442\u043e\u0440\u0438\u0438 \u0441\u043c\u0435\u043d\u044b \u0442\u043e\u043a\u0435\u043d\u043e\u0432', + }, + ), + migrations.AddField( + model_name='trafhistory', + name='token', + field=models.CharField(max_length=255, null=True, verbose_name='\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0439 \u0442\u043e\u043a\u0435\u043d'), + ), + migrations.AddField( + model_name='trafsource', + name='token_start', + field=models.DateTimeField(editable=False, null=True, verbose_name='\u0422\u043e\u0447\u043a\u0430 \u043e\u0442\u0441\u0447\u0435\u0442\u0430 \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430'), + ), + migrations.AlterField( + model_name='trafsource', + name='live_time', + field=models.IntegerField(blank=True, help_text='\u0423\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u0447\u0430\u0441\u0430\u0445. \u043f\u0443\u0441\u0442\u043e\u0435 \u043f\u043e\u043b\u0435 - \u043f\u043e\u0436\u0438\u0437\u043d\u0435\u043d\u043d\u043e', verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430'), + ), + migrations.AlterField( + model_name='trafsource', + name='token', + field=models.CharField(editable=False, max_length=255, verbose_name='\u0422\u043e\u043a\u0435\u043d \u0434\u043e\u0441\u0442\u0443\u043f\u0430'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 15, 37, 34, 495507), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AddField( + model_name='traftokenhistory', + name='sources', + field=models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='access.TrafSource', verbose_name='\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0449\u0438\u0439 \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a'), + ), + ] diff --git a/access/migrations/0025_auto_20160509_1539.py b/access/migrations/0025_auto_20160509_1539.py old mode 100644 new mode 100755 index 4acd5c5..51cd29a --- a/access/migrations/0025_auto_20160509_1539.py +++ b/access/migrations/0025_auto_20160509_1539.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-09 15:39 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0024_auto_20160509_1537'), - ] - - operations = [ - migrations.RenameField( - model_name='traftokenhistory', - old_name='sources', - new_name='source', - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 15, 39, 30, 69095), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-09 15:39 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0024_auto_20160509_1537'), + ] + + operations = [ + migrations.RenameField( + model_name='traftokenhistory', + old_name='sources', + new_name='source', + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 15, 39, 30, 69095), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0026_auto_20160509_1803.py b/access/migrations/0026_auto_20160509_1803.py old mode 100644 new mode 100755 index f08ea38..2e0848a --- a/access/migrations/0026_auto_20160509_1803.py +++ b/access/migrations/0026_auto_20160509_1803.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-09 18:03 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0025_auto_20160509_1539'), - ] - - operations = [ - migrations.AlterField( - model_name='trafsource', - name='live_time', - field=models.IntegerField(blank=True, help_text='\u0423\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u0447\u0430\u0441\u0430\u0445. \u043f\u0443\u0441\u0442\u043e\u0435 \u043f\u043e\u043b\u0435 - \u043f\u043e\u0436\u0438\u0437\u043d\u0435\u043d\u043d\u043e', null=True, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 18, 3, 57, 586863), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-09 18:03 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0025_auto_20160509_1539'), + ] + + operations = [ + migrations.AlterField( + model_name='trafsource', + name='live_time', + field=models.IntegerField(blank=True, help_text='\u0423\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u0447\u0430\u0441\u0430\u0445. \u043f\u0443\u0441\u0442\u043e\u0435 \u043f\u043e\u043b\u0435 - \u043f\u043e\u0436\u0438\u0437\u043d\u0435\u043d\u043d\u043e', null=True, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0436\u0438\u0437\u043d\u0438 \u0442\u043e\u043a\u0435\u043d\u0430'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 9, 18, 3, 57, 586863), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0027_auto_20160510_1823.py b/access/migrations/0027_auto_20160510_1823.py old mode 100644 new mode 100755 index 5c48624..4b10ad4 --- a/access/migrations/0027_auto_20160510_1823.py +++ b/access/migrations/0027_auto_20160510_1823.py @@ -1,46 +1,46 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.5 on 2016-05-10 18:23 -from __future__ import unicode_literals - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0026_auto_20160509_1803'), - ] - - operations = [ - migrations.CreateModel( - name='Questionnaire', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('fully', models.CharField(choices=[(b'1', b'\xd0\xa4\xd0\xbb\xd0\xb0\xd0\xb3\xd0\xb8'), (b'2', b'\xd0\xa1\xd0\xb2\xd0\xbe\xd0\xb1\xd0\xbe\xd0\xb4\xd0\xbd\xd1\x8b\xd0\xb9 \xd0\xbe\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82'), (b'3', b'\xd0\x97\xd0\xb0\xd0\xb2\xd0\xb5\xd1\x80\xd1\x88\xd0\xb5\xd0\xbd\xd0\xbe')], default=1, max_length=1, verbose_name='\u0421\u0442\u0430\u0434\u0438\u044f')), - ('steps', models.IntegerField(default=0, help_text='\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043a\u0430\u0437\u043e\u0432 \u0434\u043b\u044f \u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f', verbose_name='\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043a\u0430\u0437\u043e\u0432')), - ('male', models.CharField(blank=True, choices=[(b'M', b'\xd0\x9c\xd1\x83\xd0\xb6\xd1\x87\xd0\xb8\xd0\xbd\xd0\xb0'), (b'W', b'\xd0\x96\xd0\xb5\xd0\xbd\xd1\x89\xd0\xb8\xd0\xbd\xd0\xb0')], max_length=1, null=True, verbose_name='\u041f\u043e\u043b')), - ('city', models.CharField(blank=True, max_length=255, null=True, verbose_name='\u0413\u043e\u0440\u043e\u0434')), - ('experience', models.CharField(blank=True, choices=[(b'1', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbd\xd0\xb0\xd1\x87\xd0\xb8\xd0\xbd\xd0\xb0\xd1\x8e'), (b'2', b'\xd0\x94\xd0\xb0, \xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb5\xd0\xb5 \xd0\xb3\xd0\xbe\xd0\xb4\xd0\xb0'), (b'3', b'\xd0\x94\xd0\xb0, 1-2 \xd0\xb3\xd0\xbe\xd0\xb4\xd0\xb0'), (b'4', b'\xd0\x94\xd0\xb0, \xd0\xb1\xd0\xbe\xd0\xbb\xd0\xb5\xd0\xb5 2 \xd0\xbb\xd0\xb5\xd1\x82')], max_length=1, null=True, verbose_name='\u041e\u043f\u044b\u0442')), - ('aim', models.CharField(blank=True, choices=[(b'1', b'\xd0\x94\xd0\xb0, \xd0\xb2 \xd0\xbe\xd1\x84\xd0\xb8\xd1\x81\xd0\xb5'), (b'2', b'\xd0\x94\xd0\xb0, \xd1\x81\xd0\xb2\xd0\xbe\xd0\xb9 \xd0\xbf\xd1\x80\xd0\xbe\xd0\xb5\xd0\xba\xd1\x82'), (b'3', b'\xd0\x94\xd0\xb0, \xd0\xbd\xd0\xb0 \xd1\x84\xd1\x80\xd0\xb8\xd0\xbb\xd0\xb0\xd0\xbd\xd1\x81\xd0\xb5'), (b'4', b'\xd0\x9d\xd0\xb5\xd1\x82, \xd0\xb8\xd0\xb7\xd1\x83\xd1\x87\xd0\xb0\xd1\x8e \xd0\xb4\xd0\xbb\xd1\x8f \xd1\x81\xd0\xb5\xd0\xb1\xd1\x8f')], max_length=1, null=True, verbose_name='\u0426\u0435\u043b\u044c \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f')), - ('age', models.CharField(blank=True, choices=[(b'1', b'\xd0\xb4\xd0\xbe 18'), (b'2', b'18-25'), (b'3', b'25-30'), (b'4', b'30-40'), (b'5', b'\xd0\xb1\xd0\xbe\xd0\xbb\xd1\x8c\xd1\x88\xd0\xb5 40')], max_length=1, null=True, verbose_name='\u0412\u043e\u0437\u0440\u0430\u0441\u0442')), - ('description', models.TextField(blank=True, verbose_name='\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u044b \u043e\u0442\u0432\u0435\u0442')), - ], - options={ - 'verbose_name': '\u0410\u043a\u0435\u0442\u0430', - 'verbose_name_plural': '\u0410\u043d\u043a\u0435\u0442\u044b', - }, - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 10, 18, 23, 39, 577802), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AddField( - model_name='questionnaire', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-05-10 18:23 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0026_auto_20160509_1803'), + ] + + operations = [ + migrations.CreateModel( + name='Questionnaire', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('fully', models.CharField(choices=[(b'1', b'\xd0\xa4\xd0\xbb\xd0\xb0\xd0\xb3\xd0\xb8'), (b'2', b'\xd0\xa1\xd0\xb2\xd0\xbe\xd0\xb1\xd0\xbe\xd0\xb4\xd0\xbd\xd1\x8b\xd0\xb9 \xd0\xbe\xd1\x82\xd0\xb2\xd0\xb5\xd1\x82'), (b'3', b'\xd0\x97\xd0\xb0\xd0\xb2\xd0\xb5\xd1\x80\xd1\x88\xd0\xb5\xd0\xbd\xd0\xbe')], default=1, max_length=1, verbose_name='\u0421\u0442\u0430\u0434\u0438\u044f')), + ('steps', models.IntegerField(default=0, help_text='\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043a\u0430\u0437\u043e\u0432 \u0434\u043b\u044f \u0437\u0430\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f', verbose_name='\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043a\u0430\u0437\u043e\u0432')), + ('male', models.CharField(blank=True, choices=[(b'M', b'\xd0\x9c\xd1\x83\xd0\xb6\xd1\x87\xd0\xb8\xd0\xbd\xd0\xb0'), (b'W', b'\xd0\x96\xd0\xb5\xd0\xbd\xd1\x89\xd0\xb8\xd0\xbd\xd0\xb0')], max_length=1, null=True, verbose_name='\u041f\u043e\u043b')), + ('city', models.CharField(blank=True, max_length=255, null=True, verbose_name='\u0413\u043e\u0440\u043e\u0434')), + ('experience', models.CharField(blank=True, choices=[(b'1', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbd\xd0\xb0\xd1\x87\xd0\xb8\xd0\xbd\xd0\xb0\xd1\x8e'), (b'2', b'\xd0\x94\xd0\xb0, \xd0\xbc\xd0\xb5\xd0\xbd\xd0\xb5\xd0\xb5 \xd0\xb3\xd0\xbe\xd0\xb4\xd0\xb0'), (b'3', b'\xd0\x94\xd0\xb0, 1-2 \xd0\xb3\xd0\xbe\xd0\xb4\xd0\xb0'), (b'4', b'\xd0\x94\xd0\xb0, \xd0\xb1\xd0\xbe\xd0\xbb\xd0\xb5\xd0\xb5 2 \xd0\xbb\xd0\xb5\xd1\x82')], max_length=1, null=True, verbose_name='\u041e\u043f\u044b\u0442')), + ('aim', models.CharField(blank=True, choices=[(b'1', b'\xd0\x94\xd0\xb0, \xd0\xb2 \xd0\xbe\xd1\x84\xd0\xb8\xd1\x81\xd0\xb5'), (b'2', b'\xd0\x94\xd0\xb0, \xd1\x81\xd0\xb2\xd0\xbe\xd0\xb9 \xd0\xbf\xd1\x80\xd0\xbe\xd0\xb5\xd0\xba\xd1\x82'), (b'3', b'\xd0\x94\xd0\xb0, \xd0\xbd\xd0\xb0 \xd1\x84\xd1\x80\xd0\xb8\xd0\xbb\xd0\xb0\xd0\xbd\xd1\x81\xd0\xb5'), (b'4', b'\xd0\x9d\xd0\xb5\xd1\x82, \xd0\xb8\xd0\xb7\xd1\x83\xd1\x87\xd0\xb0\xd1\x8e \xd0\xb4\xd0\xbb\xd1\x8f \xd1\x81\xd0\xb5\xd0\xb1\xd1\x8f')], max_length=1, null=True, verbose_name='\u0426\u0435\u043b\u044c \u043e\u0431\u0443\u0447\u0435\u043d\u0438\u044f')), + ('age', models.CharField(blank=True, choices=[(b'1', b'\xd0\xb4\xd0\xbe 18'), (b'2', b'18-25'), (b'3', b'25-30'), (b'4', b'30-40'), (b'5', b'\xd0\xb1\xd0\xbe\xd0\xbb\xd1\x8c\xd1\x88\xd0\xb5 40')], max_length=1, null=True, verbose_name='\u0412\u043e\u0437\u0440\u0430\u0441\u0442')), + ('description', models.TextField(blank=True, verbose_name='\u0421\u0432\u043e\u0431\u043e\u0434\u043d\u044b \u043e\u0442\u0432\u0435\u0442')), + ], + options={ + 'verbose_name': '\u0410\u043a\u0435\u0442\u0430', + 'verbose_name_plural': '\u0410\u043d\u043a\u0435\u0442\u044b', + }, + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 10, 18, 23, 39, 577802), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AddField( + model_name='questionnaire', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c'), + ), + ] diff --git a/access/migrations/0028_auto_20160526_1427.py b/access/migrations/0028_auto_20160526_1427.py old mode 100644 new mode 100755 index d2555d9..c29a72f --- a/access/migrations/0028_auto_20160526_1427.py +++ b/access/migrations/0028_auto_20160526_1427.py @@ -1,61 +1,61 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-05-26 14:27 -from __future__ import unicode_literals - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0027_auto_20160510_1823'), - ] - - operations = [ - migrations.CreateModel( - name='Document', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=255, verbose_name='\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a')), - ('status', models.CharField(choices=[(b'W', '\u041d\u0430 \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0438'), (b'F', '\u041e\u0444\u043e\u0440\u043c\u043b\u0435\u043d')], default=b'W', editable=False, max_length=1, verbose_name='\u0421\u0442\u0430\u0442\u0443\u0441')), - ('date', models.DateField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u0437\u0430\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f')), - ('in_date', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f')), - ], - options={ - 'verbose_name': '\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442', - 'verbose_name_plural': '\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u044b', - }, - ), - migrations.CreateModel( - name='DocumentScan', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('page', models.CharField(max_length=255, verbose_name='\u2116 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b')), - ('file', models.ImageField(upload_to=b'documents', verbose_name='\u0421\u043a\u0430\u043d')), - ('date', models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f')), - ], - options={ - 'ordering': ['page'], - 'verbose_name': '\u0421\u043a\u0430\u043d \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430', - 'verbose_name_plural': '\u0421\u043a\u0430\u043d\u044b \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0432', - }, - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 26, 14, 27, 8, 278824), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AddField( - model_name='document', - name='scans', - field=models.ManyToManyField(blank=True, to='access.DocumentScan', verbose_name='\u0421\u043a\u0430\u043d\u044b'), - ), - migrations.AddField( - model_name='document', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-26 14:27 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0027_auto_20160510_1823'), + ] + + operations = [ + migrations.CreateModel( + name='Document', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=255, verbose_name='\u0417\u0430\u0433\u043e\u043b\u043e\u0432\u043e\u043a')), + ('status', models.CharField(choices=[(b'W', '\u041d\u0430 \u043e\u0444\u043e\u0440\u043c\u043b\u0435\u043d\u0438\u0438'), (b'F', '\u041e\u0444\u043e\u0440\u043c\u043b\u0435\u043d')], default=b'W', editable=False, max_length=1, verbose_name='\u0421\u0442\u0430\u0442\u0443\u0441')), + ('date', models.DateField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u0437\u0430\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f')), + ('in_date', models.DateTimeField(default=datetime.datetime.now, verbose_name='\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f')), + ], + options={ + 'verbose_name': '\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442', + 'verbose_name_plural': '\u0414\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u044b', + }, + ), + migrations.CreateModel( + name='DocumentScan', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('page', models.CharField(max_length=255, verbose_name='\u2116 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b')), + ('file', models.ImageField(upload_to=b'documents', verbose_name='\u0421\u043a\u0430\u043d')), + ('date', models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='\u0412\u0440\u0435\u043c\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f')), + ], + options={ + 'ordering': ['page'], + 'verbose_name': '\u0421\u043a\u0430\u043d \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430', + 'verbose_name_plural': '\u0421\u043a\u0430\u043d\u044b \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u043e\u0432', + }, + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 26, 14, 27, 8, 278824), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AddField( + model_name='document', + name='scans', + field=models.ManyToManyField(blank=True, to='access.DocumentScan', verbose_name='\u0421\u043a\u0430\u043d\u044b'), + ), + migrations.AddField( + model_name='document', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c'), + ), + ] diff --git a/access/migrations/0029_auto_20160526_1435.py b/access/migrations/0029_auto_20160526_1435.py old mode 100644 new mode 100755 index 7d9db55..72a2bb7 --- a/access/migrations/0029_auto_20160526_1435.py +++ b/access/migrations/0029_auto_20160526_1435.py @@ -1,38 +1,38 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-05-26 14:35 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0028_auto_20160526_1427'), - ] - - operations = [ - migrations.RemoveField( - model_name='document', - name='scans', - ), - migrations.AddField( - model_name='document', - name='file', - field=models.ImageField(null=True, upload_to=b'documents', verbose_name='\u0421\u043a\u0430\u043d'), - ), - migrations.AlterField( - model_name='document', - name='in_date', - field=models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 26, 14, 35, 38, 532166), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.DeleteModel( - name='DocumentScan', - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-26 14:35 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0028_auto_20160526_1427'), + ] + + operations = [ + migrations.RemoveField( + model_name='document', + name='scans', + ), + migrations.AddField( + model_name='document', + name='file', + field=models.ImageField(null=True, upload_to=b'documents', verbose_name='\u0421\u043a\u0430\u043d'), + ), + migrations.AlterField( + model_name='document', + name='in_date', + field=models.DateTimeField(default=datetime.datetime.now, editable=False, verbose_name='\u0414\u0430\u0442\u0430 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 26, 14, 35, 38, 532166), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.DeleteModel( + name='DocumentScan', + ), + ] diff --git a/access/migrations/0030_auto_20160526_1727.py b/access/migrations/0030_auto_20160526_1727.py old mode 100644 new mode 100755 index 0dba96b..a311d2b --- a/access/migrations/0030_auto_20160526_1727.py +++ b/access/migrations/0030_auto_20160526_1727.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-05-26 17:27 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0029_auto_20160526_1435'), - ] - - operations = [ - migrations.AlterField( - model_name='document', - name='file', - field=models.FileField(blank=True, null=True, upload_to=b'documents', verbose_name='\u0421\u043a\u0430\u043d'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 26, 17, 27, 27, 217966), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-26 17:27 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0029_auto_20160526_1435'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='file', + field=models.FileField(blank=True, null=True, upload_to=b'documents', verbose_name='\u0421\u043a\u0430\u043d'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 26, 17, 27, 27, 217966), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0031_auto_20160531_1240.py b/access/migrations/0031_auto_20160531_1240.py old mode 100644 new mode 100755 index 3dcb790..7587774 --- a/access/migrations/0031_auto_20160531_1240.py +++ b/access/migrations/0031_auto_20160531_1240.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-05-31 12:40 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0030_auto_20160526_1727'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 31, 12, 40, 17, 702246), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AlterField( - model_name='user', - name='in_role', - field=models.CharField(choices=[(b'U', '\u0421\u0442\u0443\u0434\u0435\u043d\u0442 \u0448\u043a\u043e\u043b\u044b'), (b'T', '\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c'), (b'M', '\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440'), (b'S', '\u0420\u0443\u043a\u043e\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c'), (b'S2', '\u041e\u043a\u043e \u0441\u0430\u0443\u0440\u043e\u043d\u0430'), (b'A', '\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440'), (b'Ts', '\u0422\u0435\u0441\u0442\u043e\u0432\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c'), (b'F', '\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430')], default=b'U', max_length=2, verbose_name='\u0420\u043e\u043b\u044c'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-05-31 12:40 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0030_auto_20160526_1727'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 5, 31, 12, 40, 17, 702246), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AlterField( + model_name='user', + name='in_role', + field=models.CharField(choices=[(b'U', '\u0421\u0442\u0443\u0434\u0435\u043d\u0442 \u0448\u043a\u043e\u043b\u044b'), (b'T', '\u041f\u0440\u0435\u043f\u043e\u0434\u0430\u0432\u0430\u0442\u0435\u043b\u044c'), (b'M', '\u041c\u0435\u043d\u0435\u0434\u0436\u0435\u0440'), (b'S', '\u0420\u0443\u043a\u043e\u0432\u043e\u0434\u0438\u0442\u0435\u043b\u044c'), (b'S2', '\u041e\u043a\u043e \u0441\u0430\u0443\u0440\u043e\u043d\u0430'), (b'A', '\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440'), (b'Ts', '\u0422\u0435\u0441\u0442\u043e\u0432\u044b\u0439 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c'), (b'F', '\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0447\u0435\u0442\u0430')], default=b'U', max_length=2, verbose_name='\u0420\u043e\u043b\u044c'), + ), + ] diff --git a/access/migrations/0032_auto_20160601_1256.py b/access/migrations/0032_auto_20160601_1256.py old mode 100644 new mode 100755 index 57af364..5bc7eb2 --- a/access/migrations/0032_auto_20160601_1256.py +++ b/access/migrations/0032_auto_20160601_1256.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-01 12:56 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0031_auto_20160531_1240'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 1, 12, 56, 55, 630156), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-01 12:56 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0031_auto_20160531_1240'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 1, 12, 56, 55, 630156), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0033_auto_20160607_1614.py b/access/migrations/0033_auto_20160607_1614.py old mode 100644 new mode 100755 index 05dad00..b86a02f --- a/access/migrations/0033_auto_20160607_1614.py +++ b/access/migrations/0033_auto_20160607_1614.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-07 16:14 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0032_auto_20160601_1256'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 16, 14, 9, 853317), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-07 16:14 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0032_auto_20160601_1256'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 16, 14, 9, 853317), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0034_auto_20160607_2002.py b/access/migrations/0034_auto_20160607_2002.py old mode 100644 new mode 100755 index b314e6a..eeac88f --- a/access/migrations/0034_auto_20160607_2002.py +++ b/access/migrations/0034_auto_20160607_2002.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-07 20:02 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0033_auto_20160607_1614'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 20, 2, 41, 564255), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-07 20:02 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0033_auto_20160607_1614'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 20, 2, 41, 564255), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0035_auto_20160607_2034.py b/access/migrations/0035_auto_20160607_2034.py old mode 100644 new mode 100755 index 213c41c..66e9075 --- a/access/migrations/0035_auto_20160607_2034.py +++ b/access/migrations/0035_auto_20160607_2034.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-07 20:34 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0034_auto_20160607_2002'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 20, 34, 43, 673956), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-07 20:34 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0034_auto_20160607_2002'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 20, 34, 43, 673956), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0036_auto_20160607_2051.py b/access/migrations/0036_auto_20160607_2051.py old mode 100644 new mode 100755 index 927754a..7c7e96d --- a/access/migrations/0036_auto_20160607_2051.py +++ b/access/migrations/0036_auto_20160607_2051.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-07 20:51 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0035_auto_20160607_2034'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 20, 51, 37, 90991), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-07 20:51 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0035_auto_20160607_2034'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 7, 20, 51, 37, 90991), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0037_auto_20160608_1700.py b/access/migrations/0037_auto_20160608_1700.py old mode 100644 new mode 100755 index a0f0492..96c64d7 --- a/access/migrations/0037_auto_20160608_1700.py +++ b/access/migrations/0037_auto_20160608_1700.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-08 17:00 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0036_auto_20160607_2051'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 16, 59, 59, 621057), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-08 17:00 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0036_auto_20160607_2051'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 16, 59, 59, 621057), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0038_auto_20160608_1705.py b/access/migrations/0038_auto_20160608_1705.py old mode 100644 new mode 100755 index 180a1bb..75e6ae2 --- a/access/migrations/0038_auto_20160608_1705.py +++ b/access/migrations/0038_auto_20160608_1705.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-08 17:05 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0037_auto_20160608_1700'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 17, 5, 4, 809207), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-08 17:05 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0037_auto_20160608_1700'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 17, 5, 4, 809207), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0039_auto_20160608_1804.py b/access/migrations/0039_auto_20160608_1804.py old mode 100644 new mode 100755 index d2418c9..0ced3c1 --- a/access/migrations/0039_auto_20160608_1804.py +++ b/access/migrations/0039_auto_20160608_1804.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-08 18:04 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0038_auto_20160608_1705'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 18, 4, 57, 435515), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-08 18:04 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0038_auto_20160608_1705'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 18, 4, 57, 435515), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0040_auto_20160608_1841.py b/access/migrations/0040_auto_20160608_1841.py old mode 100644 new mode 100755 index 52e5591..3a71be2 --- a/access/migrations/0040_auto_20160608_1841.py +++ b/access/migrations/0040_auto_20160608_1841.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-08 18:41 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0039_auto_20160608_1804'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 18, 41, 17, 775100), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-08 18:41 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0039_auto_20160608_1804'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 8, 18, 41, 17, 775100), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0041_auto_20160609_1429.py b/access/migrations/0041_auto_20160609_1429.py old mode 100644 new mode 100755 index de74cd0..843bac2 --- a/access/migrations/0041_auto_20160609_1429.py +++ b/access/migrations/0041_auto_20160609_1429.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 14:29 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0040_auto_20160608_1841'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 14, 29, 17, 471762), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 14:29 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0040_auto_20160608_1841'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 14, 29, 17, 471762), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0042_auto_20160609_1442.py b/access/migrations/0042_auto_20160609_1442.py old mode 100644 new mode 100755 index 9b470e9..ef23d38 --- a/access/migrations/0042_auto_20160609_1442.py +++ b/access/migrations/0042_auto_20160609_1442.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 14:42 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0041_auto_20160609_1429'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 14, 42, 25, 538404), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 14:42 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0041_auto_20160609_1429'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 14, 42, 25, 538404), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0043_auto_20160609_1534.py b/access/migrations/0043_auto_20160609_1534.py old mode 100644 new mode 100755 index c3a5212..49b94a5 --- a/access/migrations/0043_auto_20160609_1534.py +++ b/access/migrations/0043_auto_20160609_1534.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 15:34 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0042_auto_20160609_1442'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 34, 28, 437751), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 15:34 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0042_auto_20160609_1442'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 34, 28, 437751), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0044_auto_20160609_1536.py b/access/migrations/0044_auto_20160609_1536.py old mode 100644 new mode 100755 index 50e9f5c..5346e16 --- a/access/migrations/0044_auto_20160609_1536.py +++ b/access/migrations/0044_auto_20160609_1536.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 15:36 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0043_auto_20160609_1534'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 36, 24, 57777), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 15:36 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0043_auto_20160609_1534'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 36, 24, 57777), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0045_auto_20160609_1536.py b/access/migrations/0045_auto_20160609_1536.py old mode 100644 new mode 100755 index 2871926..788dd3b --- a/access/migrations/0045_auto_20160609_1536.py +++ b/access/migrations/0045_auto_20160609_1536.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 15:36 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0044_auto_20160609_1536'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 36, 29, 820351), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 15:36 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0044_auto_20160609_1536'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 36, 29, 820351), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0046_auto_20160609_1546.py b/access/migrations/0046_auto_20160609_1546.py old mode 100644 new mode 100755 index e207ece..e4700f1 --- a/access/migrations/0046_auto_20160609_1546.py +++ b/access/migrations/0046_auto_20160609_1546.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 15:46 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0045_auto_20160609_1536'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 46, 17, 181201), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 15:46 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0045_auto_20160609_1536'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 15, 46, 17, 181201), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0047_auto_20160609_1627.py b/access/migrations/0047_auto_20160609_1627.py old mode 100644 new mode 100755 index 3d7b092..50e944a --- a/access/migrations/0047_auto_20160609_1627.py +++ b/access/migrations/0047_auto_20160609_1627.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 16:27 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0046_auto_20160609_1546'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 16, 27, 14, 187304), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 16:27 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0046_auto_20160609_1546'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 16, 27, 14, 187304), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0048_auto_20160609_2224.py b/access/migrations/0048_auto_20160609_2224.py old mode 100644 new mode 100755 index 80cfbb3..5909b2d --- a/access/migrations/0048_auto_20160609_2224.py +++ b/access/migrations/0048_auto_20160609_2224.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-09 22:24 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0047_auto_20160609_1627'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 22, 24, 43, 724608), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-09 22:24 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0047_auto_20160609_1627'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 9, 22, 24, 43, 724608), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0049_auto_20160628_1731.py b/access/migrations/0049_auto_20160628_1731.py old mode 100644 new mode 100755 index 6a3bf2b..4040d21 --- a/access/migrations/0049_auto_20160628_1731.py +++ b/access/migrations/0049_auto_20160628_1731.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-06-28 17:31 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0048_auto_20160609_2224'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 28, 17, 31, 12, 186349), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-06-28 17:31 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0048_auto_20160609_2224'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 6, 28, 17, 31, 12, 186349), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0050_auto_20160711_1518.py b/access/migrations/0050_auto_20160711_1518.py old mode 100644 new mode 100755 index e3fdf6c..c756561 --- a/access/migrations/0050_auto_20160711_1518.py +++ b/access/migrations/0050_auto_20160711_1518.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-07-11 15:18 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0049_auto_20160628_1731'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 11, 15, 18, 42, 159532), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-07-11 15:18 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0049_auto_20160628_1731'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 11, 15, 18, 42, 159532), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0051_auto_20160713_2038.py b/access/migrations/0051_auto_20160713_2038.py old mode 100644 new mode 100755 index bdda95b..e411c9e --- a/access/migrations/0051_auto_20160713_2038.py +++ b/access/migrations/0051_auto_20160713_2038.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-07-13 20:38 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0050_auto_20160711_1518'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 13, 20, 38, 33, 272929), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-07-13 20:38 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0050_auto_20160711_1518'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 13, 20, 38, 33, 272929), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0052_auto_20160718_1714.py b/access/migrations/0052_auto_20160718_1714.py old mode 100644 new mode 100755 index 3bffe82..9c0ae5b --- a/access/migrations/0052_auto_20160718_1714.py +++ b/access/migrations/0052_auto_20160718_1714.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-07-18 17:14 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0051_auto_20160713_2038'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 18, 17, 14, 45, 907017), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-07-18 17:14 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0051_auto_20160713_2038'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 18, 17, 14, 45, 907017), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0053_auto_20160718_1714.py b/access/migrations/0053_auto_20160718_1714.py old mode 100644 new mode 100755 index dced6d0..81e91dc --- a/access/migrations/0053_auto_20160718_1714.py +++ b/access/migrations/0053_auto_20160718_1714.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-07-18 17:14 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0052_auto_20160718_1714'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 18, 17, 14, 57, 300386), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-07-18 17:14 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0052_auto_20160718_1714'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 18, 17, 14, 57, 300386), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0054_auto_20160725_1551.py b/access/migrations/0054_auto_20160725_1551.py old mode 100644 new mode 100755 index 8275ae2..6085f62 --- a/access/migrations/0054_auto_20160725_1551.py +++ b/access/migrations/0054_auto_20160725_1551.py @@ -1,31 +1,31 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-07-25 15:51 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0053_auto_20160718_1714'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 25, 15, 51, 36, 404906), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AlterField( - model_name='user', - name='is_admin', - field=models.BooleanField(default=False, editable=False), - ), - migrations.AlterField( - model_name='user', - name='is_staff', - field=models.BooleanField(default=False, editable=False), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-07-25 15:51 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0053_auto_20160718_1714'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 7, 25, 15, 51, 36, 404906), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AlterField( + model_name='user', + name='is_admin', + field=models.BooleanField(default=False, editable=False), + ), + migrations.AlterField( + model_name='user', + name='is_staff', + field=models.BooleanField(default=False, editable=False), + ), + ] diff --git a/access/migrations/0055_auto_20160809_1653.py b/access/migrations/0055_auto_20160809_1653.py old mode 100644 new mode 100755 index 6e33c71..8f10fb3 --- a/access/migrations/0055_auto_20160809_1653.py +++ b/access/migrations/0055_auto_20160809_1653.py @@ -1,36 +1,36 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-08-09 16:53 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0054_auto_20160725_1551'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='sync', - field=models.BooleanField(default=False, verbose_name='\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d'), - ), - migrations.AlterField( - model_name='trafhistory', - name='action', - field=models.CharField(choices=[(b'G', b'\xd0\x9f\xd0\xbe\xd0\xbb\xd1\x83\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xb4\xd0\xb0\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85'), (b'D', b'\xd0\x97\xd0\xb0\xd0\xbf\xd0\xb8\xd1\x81\xd1\x8c \xd0\xb4\xd0\xb0\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85'), (b'C', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f'), (b'O', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x81\xd1\x87\xd0\xb5\xd1\x82\xd0\xb0')], max_length=1, verbose_name='\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 9, 16, 53, 12, 35311), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - migrations.AlterField( - model_name='user', - name='private', - field=models.CharField(choices=[(b'A', b'\xd0\x92\xd1\x81\xd0\xb5\xd0\xbc\xd1\x83 \xd0\xb8\xd0\xbd\xd1\x82\xd0\xb5\xd1\x80\xd0\xbd\xd0\xb5\xd1\x82\xd1\x83'), (b'U', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f\xd0\xbc \xd1\x81\xd0\xb8\xd1\x81\xd1\x82\xd0\xb5\xd0\xbc\xd1\x8b'), (b'L', b'\xd0\x9f\xd0\xbe \xd0\xbf\xd1\x80\xd1\x8f\xd0\xbc\xd0\xbe\xd0\xb9 \xd1\x81\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb5'), (b'B', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbc\xd0\xbd\xd0\xb5')], default=b'A', max_length=1, verbose_name='\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0441\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044f'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-08-09 16:53 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0054_auto_20160725_1551'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='sync', + field=models.BooleanField(default=False, verbose_name='\u0421\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0438\u0440\u043e\u0432\u0430\u043d'), + ), + migrations.AlterField( + model_name='trafhistory', + name='action', + field=models.CharField(choices=[(b'G', b'\xd0\x9f\xd0\xbe\xd0\xbb\xd1\x83\xd1\x87\xd0\xb5\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xb4\xd0\xb0\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85'), (b'D', b'\xd0\x97\xd0\xb0\xd0\xbf\xd0\xb8\xd1\x81\xd1\x8c \xd0\xb4\xd0\xb0\xd0\xbd\xd0\xbd\xd1\x8b\xd1\x85'), (b'C', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f'), (b'O', b'\xd0\xa1\xd0\xbe\xd0\xb7\xd0\xb4\xd0\xb0\xd0\xbd\xd0\xb8\xd0\xb5 \xd1\x81\xd1\x87\xd0\xb5\xd1\x82\xd0\xb0')], max_length=1, verbose_name='\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 9, 16, 53, 12, 35311), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + migrations.AlterField( + model_name='user', + name='private', + field=models.CharField(choices=[(b'A', b'\xd0\x92\xd1\x81\xd0\xb5\xd0\xbc\xd1\x83 \xd0\xb8\xd0\xbd\xd1\x82\xd0\xb5\xd1\x80\xd0\xbd\xd0\xb5\xd1\x82\xd1\x83'), (b'U', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbf\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xb7\xd0\xbe\xd0\xb2\xd0\xb0\xd1\x82\xd0\xb5\xd0\xbb\xd1\x8f\xd0\xbc \xd1\x81\xd0\xb8\xd1\x81\xd1\x82\xd0\xb5\xd0\xbc\xd1\x8b'), (b'L', b'\xd0\x9f\xd0\xbe \xd0\xbf\xd1\x80\xd1\x8f\xd0\xbc\xd0\xbe\xd0\xb9 \xd1\x81\xd1\x81\xd1\x8b\xd0\xbb\xd0\xba\xd0\xb5'), (b'B', b'\xd0\xa2\xd0\xbe\xd0\xbb\xd1\x8c\xd0\xba\xd0\xbe \xd0\xbc\xd0\xbd\xd0\xb5')], default=b'A', max_length=1, verbose_name='\u041f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0441\u0442\u044c \u043f\u0440\u043e\u0444\u0438\u043b\u044f'), + ), + ] diff --git a/access/migrations/0056_auto_20160809_1659.py b/access/migrations/0056_auto_20160809_1659.py old mode 100644 new mode 100755 index ca74ece..20db0e8 --- a/access/migrations/0056_auto_20160809_1659.py +++ b/access/migrations/0056_auto_20160809_1659.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-08-09 16:59 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0055_auto_20160809_1653'), - ] - - operations = [ - migrations.AddField( - model_name='user', - name='sync_date', - field=models.DateTimeField(blank=True, null=True, verbose_name='\u0414\u0430\u0442\u0430 \u043f\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043d\u0430 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044e'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 9, 16, 59, 0, 490315), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-08-09 16:59 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0055_auto_20160809_1653'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='sync_date', + field=models.DateTimeField(blank=True, null=True, verbose_name='\u0414\u0430\u0442\u0430 \u043f\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u043d\u0430 \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044e'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 9, 16, 59, 0, 490315), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0057_auto_20160810_1234.py b/access/migrations/0057_auto_20160810_1234.py old mode 100644 new mode 100755 index 8b2b25a..4bfca78 --- a/access/migrations/0057_auto_20160810_1234.py +++ b/access/migrations/0057_auto_20160810_1234.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-08-10 12:34 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0056_auto_20160809_1659'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 10, 12, 34, 1, 608983), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-08-10 12:34 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0056_auto_20160809_1659'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 10, 12, 34, 1, 608983), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0058_auto_20160814_1736.py b/access/migrations/0058_auto_20160814_1736.py old mode 100644 new mode 100755 index c14f5ab..79374b6 --- a/access/migrations/0058_auto_20160814_1736.py +++ b/access/migrations/0058_auto_20160814_1736.py @@ -1,21 +1,21 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.2 on 2016-08-14 17:36 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0057_auto_20160810_1234'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 14, 17, 36, 41, 669896), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.2 on 2016-08-14 17:36 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0057_auto_20160810_1234'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 14, 17, 36, 41, 669896), null=True, verbose_name='\u0417\u0430\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043e. \u041d\u0435 \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u044d\u0442\u043e\u0442 \u0434\u0435\u043d\u044c.'), + ), + ] diff --git a/access/migrations/0059_auto_20160815_1853.py b/access/migrations/0059_auto_20160815_1853.py old mode 100644 new mode 100755 index e24c3b0..3d7e4a2 --- a/access/migrations/0059_auto_20160815_1853.py +++ b/access/migrations/0059_auto_20160815_1853.py @@ -1,198 +1,198 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.3 on 2016-08-15 18:53 -from __future__ import unicode_literals - -import datetime -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0058_auto_20160814_1736'), - ] - - operations = [ - migrations.CreateModel( - name='UserSync', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('date', models.DateTimeField(default=datetime.datetime.now, verbose_name='Дата начала')), - ('f_date', models.DateTimeField(blank=True, null=True, verbose_name='Дата завершения процеса')), - ('source', models.CharField(max_length=255, verbose_name='Источник синхронизации')), - ('dist', models.CharField(max_length=255, verbose_name='Получатель синхронизации')), - ('result', models.BooleanField(default=False, verbose_name='Результат синхронизации')), - ], - options={ - 'verbose_name': 'Задача синхронизации', - 'verbose_name_plural': 'Задачи синхронизации', - }, - ), - migrations.AlterField( - model_name='actionj', - name='a_type', - field=models.CharField(choices=[('B', 'b-default'), ('P', 'b-primary'), ('S', 'b-success'), ('I', 'b-info'), ('W', 'b-warning'), ('D', 'b-danger')], default='B', max_length=1, verbose_name='Тип события'), - ), - migrations.AlterField( - model_name='document', - name='file', - field=models.FileField(blank=True, null=True, upload_to='documents', verbose_name='Скан'), - ), - migrations.AlterField( - model_name='document', - name='status', - field=models.CharField(choices=[('W', 'На оформлении'), ('F', 'Оформлен')], default='W', editable=False, max_length=1, verbose_name='Статус'), - ), - migrations.AlterField( - model_name='questionnaire', - name='age', - field=models.CharField(blank=True, choices=[('1', 'до 18'), ('2', '18-25'), ('3', '25-30'), ('4', '30-40'), ('5', 'больше 40')], max_length=1, null=True, verbose_name='Возраст'), - ), - migrations.AlterField( - model_name='questionnaire', - name='aim', - field=models.CharField(blank=True, choices=[('1', 'Да, в офисе'), ('2', 'Да, свой проект'), ('3', 'Да, на фрилансе'), ('4', 'Нет, изучаю для себя')], max_length=1, null=True, verbose_name='Цель обучения'), - ), - migrations.AlterField( - model_name='questionnaire', - name='experience', - field=models.CharField(blank=True, choices=[('1', 'Только начинаю'), ('2', 'Да, менее года'), ('3', 'Да, 1-2 года'), ('4', 'Да, более 2 лет')], max_length=1, null=True, verbose_name='Опыт'), - ), - migrations.AlterField( - model_name='questionnaire', - name='fully', - field=models.CharField(choices=[('1', 'Флаги'), ('2', 'Свободный ответ'), ('3', 'Завершено')], default=1, max_length=1, verbose_name='Стадия'), - ), - migrations.AlterField( - model_name='questionnaire', - name='male', - field=models.CharField(blank=True, choices=[('M', 'Мужчина'), ('W', 'Женщина')], max_length=1, null=True, verbose_name='Пол'), - ), - migrations.AlterField( - model_name='trafhistory', - name='action', - field=models.CharField(choices=[('G', 'Получение данных'), ('D', 'Запись данных'), ('C', 'Создание пользователя'), ('O', 'Создание счета')], max_length=1, verbose_name='Действие'), - ), - migrations.AlterField( - model_name='user', - name='avatar', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Ключ аватара'), - ), - migrations.AlterField( - model_name='user', - name='back_phone', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Предидущий телефон'), - ), - migrations.AlterField( - model_name='user', - name='city', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Город'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 15, 18, 53, 53, 111817), null=True, verbose_name='Задержка до. Не включая этот день.'), - ), - migrations.AlterField( - model_name='user', - name='email', - field=models.EmailField(blank=True, db_index=True, editable=False, max_length=255, unique=True, verbose_name='email'), - ), - migrations.AlterField( - model_name='user', - name='facebook', - field=models.CharField(blank=True, default='', max_length=255), - ), - migrations.AlterField( - model_name='user', - name='fname', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Фамилия'), - ), - migrations.AlterField( - model_name='user', - name='in_avatar', - field=models.ImageField(blank=True, editable=False, null=True, upload_to='', verbose_name='Наш аватар'), - ), - migrations.AlterField( - model_name='user', - name='in_role', - field=models.CharField(choices=[('U', 'Студент школы'), ('T', 'Преподаватель'), ('M', 'Менеджер'), ('S', 'Руководитель'), ('S2', 'Око саурона'), ('A', 'Администратор'), ('Ts', 'Тестовый пользователь'), ('F', 'Пользователь свободного счета')], default='U', max_length=2, verbose_name='Роль'), - ), - migrations.AlterField( - model_name='user', - name='linkedin', - field=models.CharField(blank=True, default='', max_length=255), - ), - migrations.AlterField( - model_name='user', - name='name', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Имя'), - ), - migrations.AlterField( - model_name='user', - name='odnoklassniki', - field=models.CharField(blank=True, default='', max_length=255), - ), - migrations.AlterField( - model_name='user', - name='oname', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Отчество'), - ), - migrations.AlterField( - model_name='user', - name='phone', - field=models.CharField(default='', max_length=255, verbose_name='Телефон'), - ), - migrations.AlterField( - model_name='user', - name='private', - field=models.CharField(choices=[('A', 'Всему интернету'), ('U', 'Только пользователям системы'), ('L', 'По прямой ссылке'), ('B', 'Только мне')], default='A', max_length=1, verbose_name='Приватность профиля'), - ), - migrations.AlterField( - model_name='user', - name='refer', - field=models.CharField(choices=[('S', 'Органично'), ('B', 'Привлечен')], default='S', max_length=1, null=True, verbose_name='Источник'), - ), - migrations.AlterField( - model_name='user', - name='refer_source', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Источник пользователя'), - ), - migrations.AlterField( - model_name='user', - name='reg_status', - field=models.CharField(choices=[('1', 'Пароль'), ('2', 'О себе'), ('3', 'Фото'), ('4', 'Закончена')], default='1', max_length=1, verbose_name='Статус регистрации'), - ), - migrations.AlterField( - model_name='user', - name='skype', - field=models.CharField(blank=True, default='', max_length=300), - ), - migrations.AlterField( - model_name='user', - name='status', - field=models.CharField(choices=[('ON', 'on-line'), ('OFF', 'off-line')], default='ON', max_length=9), - ), - migrations.AlterField( - model_name='user', - name='token', - field=models.CharField(blank=True, default='', max_length=255), - ), - migrations.AlterField( - model_name='user', - name='unique_role', - field=models.CharField(blank=True, default='', max_length=255, verbose_name='Уникальная роль'), - ), - migrations.AlterField( - model_name='user', - name='vk', - field=models.CharField(blank=True, default='', max_length=255), - ), - migrations.AddField( - model_name='usersync', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Синхронизируемый'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-08-15 18:53 +from __future__ import unicode_literals + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0058_auto_20160814_1736'), + ] + + operations = [ + migrations.CreateModel( + name='UserSync', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date', models.DateTimeField(default=datetime.datetime.now, verbose_name='Дата начала')), + ('f_date', models.DateTimeField(blank=True, null=True, verbose_name='Дата завершения процеса')), + ('source', models.CharField(max_length=255, verbose_name='Источник синхронизации')), + ('dist', models.CharField(max_length=255, verbose_name='Получатель синхронизации')), + ('result', models.BooleanField(default=False, verbose_name='Результат синхронизации')), + ], + options={ + 'verbose_name': 'Задача синхронизации', + 'verbose_name_plural': 'Задачи синхронизации', + }, + ), + migrations.AlterField( + model_name='actionj', + name='a_type', + field=models.CharField(choices=[('B', 'b-default'), ('P', 'b-primary'), ('S', 'b-success'), ('I', 'b-info'), ('W', 'b-warning'), ('D', 'b-danger')], default='B', max_length=1, verbose_name='Тип события'), + ), + migrations.AlterField( + model_name='document', + name='file', + field=models.FileField(blank=True, null=True, upload_to='documents', verbose_name='Скан'), + ), + migrations.AlterField( + model_name='document', + name='status', + field=models.CharField(choices=[('W', 'На оформлении'), ('F', 'Оформлен')], default='W', editable=False, max_length=1, verbose_name='Статус'), + ), + migrations.AlterField( + model_name='questionnaire', + name='age', + field=models.CharField(blank=True, choices=[('1', 'до 18'), ('2', '18-25'), ('3', '25-30'), ('4', '30-40'), ('5', 'больше 40')], max_length=1, null=True, verbose_name='Возраст'), + ), + migrations.AlterField( + model_name='questionnaire', + name='aim', + field=models.CharField(blank=True, choices=[('1', 'Да, в офисе'), ('2', 'Да, свой проект'), ('3', 'Да, на фрилансе'), ('4', 'Нет, изучаю для себя')], max_length=1, null=True, verbose_name='Цель обучения'), + ), + migrations.AlterField( + model_name='questionnaire', + name='experience', + field=models.CharField(blank=True, choices=[('1', 'Только начинаю'), ('2', 'Да, менее года'), ('3', 'Да, 1-2 года'), ('4', 'Да, более 2 лет')], max_length=1, null=True, verbose_name='Опыт'), + ), + migrations.AlterField( + model_name='questionnaire', + name='fully', + field=models.CharField(choices=[('1', 'Флаги'), ('2', 'Свободный ответ'), ('3', 'Завершено')], default=1, max_length=1, verbose_name='Стадия'), + ), + migrations.AlterField( + model_name='questionnaire', + name='male', + field=models.CharField(blank=True, choices=[('M', 'Мужчина'), ('W', 'Женщина')], max_length=1, null=True, verbose_name='Пол'), + ), + migrations.AlterField( + model_name='trafhistory', + name='action', + field=models.CharField(choices=[('G', 'Получение данных'), ('D', 'Запись данных'), ('C', 'Создание пользователя'), ('O', 'Создание счета')], max_length=1, verbose_name='Действие'), + ), + migrations.AlterField( + model_name='user', + name='avatar', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Ключ аватара'), + ), + migrations.AlterField( + model_name='user', + name='back_phone', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Предидущий телефон'), + ), + migrations.AlterField( + model_name='user', + name='city', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Город'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 15, 18, 53, 53, 111817), null=True, verbose_name='Задержка до. Не включая этот день.'), + ), + migrations.AlterField( + model_name='user', + name='email', + field=models.EmailField(blank=True, db_index=True, editable=False, max_length=255, unique=True, verbose_name='email'), + ), + migrations.AlterField( + model_name='user', + name='facebook', + field=models.CharField(blank=True, default='', max_length=255), + ), + migrations.AlterField( + model_name='user', + name='fname', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Фамилия'), + ), + migrations.AlterField( + model_name='user', + name='in_avatar', + field=models.ImageField(blank=True, editable=False, null=True, upload_to='', verbose_name='Наш аватар'), + ), + migrations.AlterField( + model_name='user', + name='in_role', + field=models.CharField(choices=[('U', 'Студент школы'), ('T', 'Преподаватель'), ('M', 'Менеджер'), ('S', 'Руководитель'), ('S2', 'Око саурона'), ('A', 'Администратор'), ('Ts', 'Тестовый пользователь'), ('F', 'Пользователь свободного счета')], default='U', max_length=2, verbose_name='Роль'), + ), + migrations.AlterField( + model_name='user', + name='linkedin', + field=models.CharField(blank=True, default='', max_length=255), + ), + migrations.AlterField( + model_name='user', + name='name', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Имя'), + ), + migrations.AlterField( + model_name='user', + name='odnoklassniki', + field=models.CharField(blank=True, default='', max_length=255), + ), + migrations.AlterField( + model_name='user', + name='oname', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Отчество'), + ), + migrations.AlterField( + model_name='user', + name='phone', + field=models.CharField(default='', max_length=255, verbose_name='Телефон'), + ), + migrations.AlterField( + model_name='user', + name='private', + field=models.CharField(choices=[('A', 'Всему интернету'), ('U', 'Только пользователям системы'), ('L', 'По прямой ссылке'), ('B', 'Только мне')], default='A', max_length=1, verbose_name='Приватность профиля'), + ), + migrations.AlterField( + model_name='user', + name='refer', + field=models.CharField(choices=[('S', 'Органично'), ('B', 'Привлечен')], default='S', max_length=1, null=True, verbose_name='Источник'), + ), + migrations.AlterField( + model_name='user', + name='refer_source', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Источник пользователя'), + ), + migrations.AlterField( + model_name='user', + name='reg_status', + field=models.CharField(choices=[('1', 'Пароль'), ('2', 'О себе'), ('3', 'Фото'), ('4', 'Закончена')], default='1', max_length=1, verbose_name='Статус регистрации'), + ), + migrations.AlterField( + model_name='user', + name='skype', + field=models.CharField(blank=True, default='', max_length=300), + ), + migrations.AlterField( + model_name='user', + name='status', + field=models.CharField(choices=[('ON', 'on-line'), ('OFF', 'off-line')], default='ON', max_length=9), + ), + migrations.AlterField( + model_name='user', + name='token', + field=models.CharField(blank=True, default='', max_length=255), + ), + migrations.AlterField( + model_name='user', + name='unique_role', + field=models.CharField(blank=True, default='', max_length=255, verbose_name='Уникальная роль'), + ), + migrations.AlterField( + model_name='user', + name='vk', + field=models.CharField(blank=True, default='', max_length=255), + ), + migrations.AddField( + model_name='usersync', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Синхронизируемый'), + ), + ] diff --git a/access/migrations/0060_auto_20160815_1855.py b/access/migrations/0060_auto_20160815_1855.py old mode 100644 new mode 100755 index d48d603..c0d42b7 --- a/access/migrations/0060_auto_20160815_1855.py +++ b/access/migrations/0060_auto_20160815_1855.py @@ -1,26 +1,26 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.3 on 2016-08-15 18:55 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0059_auto_20160815_1853'), - ] - - operations = [ - migrations.AddField( - model_name='usersync', - name='data', - field=models.TextField(blank=True, default='', verbose_name='Сырые данные'), - ), - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 15, 18, 55, 46, 279309), null=True, verbose_name='Задержка до. Не включая этот день.'), - ), - ] +# -*- coding: utf-8 -*- +# Generated by Django 1.9.3 on 2016-08-15 18:55 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('access', '0059_auto_20160815_1853'), + ] + + operations = [ + migrations.AddField( + model_name='usersync', + name='data', + field=models.TextField(blank=True, default='', verbose_name='Сырые данные'), + ), + migrations.AlterField( + model_name='user', + name='delay_date', + field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 8, 15, 18, 55, 46, 279309), null=True, verbose_name='Задержка до. Не включая этот день.'), + ), + ] diff --git a/access/migrations/0081_auto_20161008_0222.py b/access/migrations/0081_auto_20161008_0222.py deleted file mode 100644 index c175928..0000000 --- a/access/migrations/0081_auto_20161008_0222.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.3 on 2016-10-08 02:22 -from __future__ import unicode_literals - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('access', '0080_auto_20160926_0804'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='delay_date', - field=models.DateTimeField(blank=True, default=datetime.datetime(2016, 10, 8, 2, 22, 31, 971980), null=True, verbose_name='Задержка до. Не включая этот день.'), - ), - migrations.AlterField( - model_name='user', - name='in_role', - field=models.CharField(choices=[('U', 'Студент школы'), ('T', 'Преподаватель'), ('M', 'Менеджер'), ('S', 'Руководитель'), ('S2', 'Куратор'), ('A', 'Администратор'), ('Ts', 'Тестовый пользователь'), ('F', 'Пользователь свободного счета')], default='U', max_length=2, verbose_name='Роль'), - ), - ] diff --git a/access/migrations/__init__.py b/access/migrations/__init__.py old mode 100644 new mode 100755