diff --git a/app/migrations/0001_initial.py b/app/migrations/0001_initial.py index 6ed99da..e805b4e 100644 --- a/app/migrations/0001_initial.py +++ b/app/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.db import migrations, models @@ -26,8 +26,8 @@ class Migration(migrations.Migration): ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')), ], options={ - 'verbose_name_plural': 'Amadeus SMTP settings', 'verbose_name': 'Amadeus SMTP setting', + 'verbose_name_plural': 'Amadeus SMTP settings', }, ), ] diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index e1267d2..79e9423 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals import autoslug.fields @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name_plural': 'Actions', 'verbose_name': 'Action', + 'verbose_name_plural': 'Actions', }, ), migrations.CreateModel( @@ -35,8 +35,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ], options={ - 'verbose_name_plural': 'Action_Resources', 'verbose_name': 'Action_Resource', + 'verbose_name_plural': 'Action_Resources', }, ), migrations.CreateModel( @@ -48,8 +48,8 @@ class Migration(migrations.Migration): ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ], options={ - 'verbose_name_plural': 'Logs', 'verbose_name': 'Log', + 'verbose_name_plural': 'Logs', }, ), migrations.CreateModel( @@ -60,8 +60,8 @@ class Migration(migrations.Migration): ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), ], options={ - 'verbose_name_plural': 'Amadeus Mime Types', 'verbose_name': 'Amadeus Mime Type', + 'verbose_name_plural': 'Amadeus Mime Types', }, ), migrations.CreateModel( @@ -74,8 +74,8 @@ class Migration(migrations.Migration): ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), ], options={ - 'verbose_name_plural': 'Notifications', 'verbose_name': 'Notification', + 'verbose_name_plural': 'Notifications', }, ), migrations.CreateModel( @@ -88,8 +88,8 @@ class Migration(migrations.Migration): ('url', models.CharField(default='', max_length=100, verbose_name='URL')), ], options={ - 'verbose_name_plural': 'Resources', 'verbose_name': 'Resource', + 'verbose_name_plural': 'Resources', }, ), ] diff --git a/core/migrations/0002_auto_20161117_0217.py b/core/migrations/0002_auto_20161117_0217.py deleted file mode 100644 index 418596b..0000000 --- a/core/migrations/0002_auto_20161117_0217.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='actor', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'), - ), - migrations.AddField( - model_name='notification', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - migrations.AddField( - model_name='log', - name='action_resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), - ), - migrations.AddField( - model_name='log', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), - ), - migrations.AddField( - model_name='action_resource', - name='action', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), - ), - migrations.AddField( - model_name='action_resource', - name='resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), - ), - ] diff --git a/core/migrations/0002_auto_20161124_1217.py b/core/migrations/0002_auto_20161124_1217.py new file mode 100644 index 0000000..509f7c9 --- /dev/null +++ b/core/migrations/0002_auto_20161124_1217.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-24 15:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='actor', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'), + ), + migrations.AddField( + model_name='notification', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + migrations.AddField( + model_name='log', + name='action_resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), + ), + migrations.AddField( + model_name='log', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), + ), + migrations.AddField( + model_name='action_resource', + name='action', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), + ), + migrations.AddField( + model_name='action_resource', + name='resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), + ), + ] diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index c63856c..cf33c8c 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals import autoslug.fields @@ -34,8 +34,8 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ], options={ - 'verbose_name_plural': 'Activitys Files', 'verbose_name': 'Activity File', + 'verbose_name_plural': 'Activitys Files', }, ), migrations.CreateModel( @@ -47,8 +47,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name_plural': 'Categories', 'verbose_name': 'Category', + 'verbose_name_plural': 'Categories', }, ), migrations.CreateModel( @@ -61,9 +61,9 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=False, verbose_name='Public')), ], options={ - 'verbose_name_plural': 'Courses', 'verbose_name': 'Course', - 'ordering': ('create_date', 'name'), + 'verbose_name_plural': 'Courses', + 'ordering': ('create_date', 'name'), }, ), migrations.CreateModel( @@ -75,8 +75,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name_plural': 'Categories', 'verbose_name': 'Category', + 'verbose_name_plural': 'Categories', }, ), migrations.CreateModel( @@ -120,8 +120,8 @@ class Migration(migrations.Migration): ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), ], options={ - 'verbose_name_plural': 'Subjects', 'verbose_name': 'Subject', + 'verbose_name_plural': 'Subjects', 'ordering': ('create_date', 'name'), }, ), @@ -135,8 +135,8 @@ class Migration(migrations.Migration): ('subjects', models.ManyToManyField(to='courses.Subject')), ], options={ - 'verbose_name_plural': 'subject categories', 'verbose_name': 'subject category', + 'verbose_name_plural': 'subject categories', }, ), migrations.CreateModel( @@ -152,8 +152,8 @@ class Migration(migrations.Migration): ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), ], options={ - 'verbose_name_plural': 'Topics', 'verbose_name': 'Topic', + 'verbose_name_plural': 'Topics', 'ordering': ('create_date', 'name'), }, ), diff --git a/courses/migrations/0002_auto_20161117_0217.py b/courses/migrations/0002_auto_20161117_0217.py deleted file mode 100644 index 18900e6..0000000 --- a/courses/migrations/0002_auto_20161117_0217.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='professors', - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='subject', - name='students', - field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='students', - field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='linkmaterial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='filematerial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), - ), - migrations.AddField( - model_name='course', - name='coordenator', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), - ), - migrations.AddField( - model_name='course', - name='professors', - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='course', - name='students', - field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activityfile', - name='diet', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), - ), - migrations.AddField( - model_name='activity', - name='students', - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), - ), - ] diff --git a/courses/migrations/0002_auto_20161124_1217.py b/courses/migrations/0002_auto_20161124_1217.py new file mode 100644 index 0000000..c406720 --- /dev/null +++ b/courses/migrations/0002_auto_20161124_1217.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-24 15:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('courses', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='subject', + name='professors', + field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='subject', + name='students', + field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='material', + name='students', + field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='linkmaterial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='filematerial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='course', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), + ), + migrations.AddField( + model_name='course', + name='coordenator', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), + ), + migrations.AddField( + model_name='course', + name='professors', + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='course', + name='students', + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activityfile', + name='diet', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), + ), + migrations.AddField( + model_name='activity', + name='students', + field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py index b25376c..326f03c 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.db import migrations, models @@ -23,8 +23,8 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name_plural': 'Answers', 'verbose_name': 'Answer', + 'verbose_name_plural': 'Answers', 'ordering': ('order',), }, ), @@ -37,8 +37,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name_plural': 'Answers Student', 'verbose_name': 'Answer Stundent', + 'verbose_name_plural': 'Answers Student', }, ), migrations.CreateModel( @@ -49,8 +49,8 @@ class Migration(migrations.Migration): ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')), ], options={ - 'verbose_name_plural': 'Exams', 'verbose_name': 'Exam', + 'verbose_name_plural': 'Exams', }, bases=('courses.activity',), ), diff --git a/exam/migrations/0002_auto_20161117_0217.py b/exam/migrations/0002_auto_20161117_0217.py deleted file mode 100644 index f21976c..0000000 --- a/exam/migrations/0002_auto_20161117_0217.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('exam', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='exam', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), - ), - ] diff --git a/exam/migrations/0002_auto_20161124_1217.py b/exam/migrations/0002_auto_20161124_1217.py new file mode 100644 index 0000000..cea13f9 --- /dev/null +++ b/exam/migrations/0002_auto_20161124_1217.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-24 15:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('exam', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='answersstudent', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( + model_name='answer', + name='exam', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), + ), + ] diff --git a/exam/templates/exam/create.html.py b/exam/templates/exam/create.html.py deleted file mode 100644 index 6c97ee2..0000000 --- a/exam/templates/exam/create.html.py +++ /dev/null @@ -1,109 +0,0 @@ -BBBBBBB BBBBBBBBBBB - -BBBB BBBB - -BBBBB BBBBBBB -XXXX XXXXXXXXXXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - BBBBB BBBBBBBBBB - XXX XXXXXXXXXXXXXXXXXXXX gettext(u'New Exam') XXXXX - BBBBBBBB BBBBBBBBBB - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Exam Name') XXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Exam Name') XX - XXXXXX - XXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u"Exam's begin date") XXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Begin Date') XX - XXXXXX - XXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u"Exam's end date") XXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'End Date') XX - XXXXXX - XXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXX - XXXXXXX - XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX gettext(u'Allow submissions after deadline?') - XXXXXXXX - XXXXXX - XXXXXX - XXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXX - - XXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question Type') XXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXX - XXXXXXX XXXXXXXX XXXXXXXXX gettext(u'Question Type') XXXXXXXXX - XXXXXXX XXXXXXXXXX gettext(u'Multiple Choice') XXXXXXXXX - XXXXXXX XXXXXXXXXX gettext(u'True or False') XXXXXXXXX - XXXXXXX XXXXXXXXXX gettext(u'Gap Filling') XXXXXXXXX - XXXXXXX XXXXXXXXXX gettext(u'Discursive Question') XXXXXXXXX - XXXXXXXXX - XXXXXX - XXXXXX - XXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'add question') XXXXXXXXX - XXXXXX - XXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX gettext(u'Create') XXXXXXXXX - XXXXXX -XXXXXX -XXXXXXXX -XXX XX X XX -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX XXXXXXXXXXXXXXX - XX XXX XXXXX X XXXXXXXXXXXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX - XX XXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XXXX - XXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXX - XXX -XXX -XXX XXXXXXXXXXXXXXXX X XX -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X - XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X - XXXXXXXXX X - XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX X XXXXXXXXX XXXXXXXXXXXXXXXXX X XXXX X - XXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXXX X - XXXXXXXXXX X - XXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXX -XXX -XXX XXXXXXXXXXXXXXXXXX X XX -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X - XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X - XXXXXXXXX X - XXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXXX X - XXXXXXXXXX X - XXXXXXXXX X - XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXX X XXXXXXXXXXXXXXXXXX XXX XXXXXXXXXXX X - XXXXXXXXXX X - XXXXXXXXX X - XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXX X - XXXXXXXXXX X - XXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXX -XXX -XXXXXXXXXXXX X - XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX -XXX -XXXXXXXXX - -BBBBBBBB BBBBBBB diff --git a/exam/templates/exam/questions/discursive_question.html.py b/exam/templates/exam/questions/discursive_question.html.py deleted file mode 100644 index e126be3..0000000 --- a/exam/templates/exam/questions/discursive_question.html.py +++ /dev/null @@ -1,6 +0,0 @@ -XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXXXXX - XXXXXX -XXXXXX diff --git a/exam/templates/exam/questions/gap_filling_answer.html.py b/exam/templates/exam/questions/gap_filling_answer.html.py deleted file mode 100644 index e69de29..0000000 --- a/exam/templates/exam/questions/gap_filling_answer.html.py +++ /dev/null diff --git a/exam/templates/exam/questions/gap_filling_question.html.py b/exam/templates/exam/questions/gap_filling_question.html.py deleted file mode 100644 index a3117c9..0000000 --- a/exam/templates/exam/questions/gap_filling_question.html.py +++ /dev/null @@ -1,3 +0,0 @@ -XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX - XXX gettext(u'Gap Filling Question') XXXX -XXXXXX diff --git a/exam/templates/exam/questions/multiple_choice_answer.html.py b/exam/templates/exam/questions/multiple_choice_answer.html.py deleted file mode 100644 index e69de29..0000000 --- a/exam/templates/exam/questions/multiple_choice_answer.html.py +++ /dev/null diff --git a/exam/templates/exam/questions/multiple_choice_question.html.py b/exam/templates/exam/questions/multiple_choice_question.html.py deleted file mode 100644 index d351ca3..0000000 --- a/exam/templates/exam/questions/multiple_choice_question.html.py +++ /dev/null @@ -1,42 +0,0 @@ -BBBB BBBB - -XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX - - XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX - - - XXXX XXXXXXXXXXXXXXXXXX - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX - - -XXXXXX -XXXX XXXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Alternatives') XXXXXXXX - XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX - XXXXXXX - XXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX - XXXXXXX - XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXX - XXXXXX - XXXXXX -XXXXXX -XXXX XXX XXXXXXXXXXX XXXXXX XXX -XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XXXXXXXXXXX - XXXXXX -XXXXXX -XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX -XXXXXX diff --git a/exam/templates/exam/questions/true_or_false_answer.html.py b/exam/templates/exam/questions/true_or_false_answer.html.py deleted file mode 100644 index 4cd223f..0000000 --- a/exam/templates/exam/questions/true_or_false_answer.html.py +++ /dev/null @@ -1,15 +0,0 @@ -BBBB BBBB - -XXXX XXXXXXXXXX XXXXXXXXXXX X - XXXX XXXXXXXXXXXXXXXXX - XXXXX - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Write your alternative') XXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXX - XXXXX - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX -XXXXXX diff --git a/exam/templates/exam/questions/true_or_false_question.html.py b/exam/templates/exam/questions/true_or_false_question.html.py deleted file mode 100644 index db1a8ed..0000000 --- a/exam/templates/exam/questions/true_or_false_question.html.py +++ /dev/null @@ -1,67 +0,0 @@ - - -BBBB BBBB - -XXXXXXX - XXXXXXXXXXXXXXXXXXXXXXX X - XXXXXXX XXXXXXXX - X - XXXXXXXXXXXXXXXXXXXXX X - XXXXXXX XXXXX - X -XXXXXXXX -XXXX XXXXXXXX XXXXXXX - XXXX XXXXXXXXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXX - XXXXX - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXX - XXXXX - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXX - XXXXXX - XXXXXX - - XXXXXX - XXXX XXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX - XXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Alternatives: T/F') XXXXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXX - BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB - XXXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'New Alternative') XXXXXXXXX - XXXXXX - XXXXXX -XXXXXX -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX XXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX - XXX - XXXXXX XXX XXXXXXXXX XXXXXX XXXXXX XX XXXX - XX XXXXXXXXXXX XXXXXXXXXXXX XX XXXXXXXXX XXXX XXXXX X XXXXXXXXXXXXXX XXX XXXXXXXXX - XXXXXX XXXX - XXXXXXXXX XX - XXXXXXX XXXXXXXXX XXXXXX XX X X - XXX XXXX X XX - XXXXXXXXXXXX XXX XXX XXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX - XX - XXX -XXXXXXXXX - diff --git a/exam/templates/exam/remove.html.py b/exam/templates/exam/remove.html.py deleted file mode 100644 index e69de29..0000000 --- a/exam/templates/exam/remove.html.py +++ /dev/null diff --git a/exam/templates/exam/update.html.py b/exam/templates/exam/update.html.py deleted file mode 100644 index e69de29..0000000 --- a/exam/templates/exam/update.html.py +++ /dev/null diff --git a/exam/templates/exam/view.html.py b/exam/templates/exam/view.html.py deleted file mode 100644 index e69de29..0000000 --- a/exam/templates/exam/view.html.py +++ /dev/null diff --git a/exercise/migrations/0001_initial.py b/exercise/migrations/0001_initial.py index afe5e54..3073f98 100644 --- a/exercise/migrations/0001_initial.py +++ b/exercise/migrations/0001_initial.py @@ -1,12 +1,10 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 08:09 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from decimal import Decimal -from django.conf import settings from django.db import migrations, models import django.db.models.deletion -import exercise.models class Migration(migrations.Migration): @@ -14,9 +12,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('courses', '0002_auto_20161117_0217'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0002_auto_20161117_0217'), + ('core', '0001_initial'), ] operations = [ @@ -24,16 +20,13 @@ class Migration(migrations.Migration): name='Exercise', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name_exercise', models.CharField(max_length=100, verbose_name='Exercise Name')), + ('name_exercise', models.CharField(max_length=100, verbose_name='Name')), ('description', models.TextField(blank=True, verbose_name='Description')), - ('init_date', models.DateField(verbose_name='Begin of Subject Date')), - ('end_date', models.DateField(verbose_name='End of Subject Date')), + ('end_date', models.DateField(verbose_name='Delivery Date')), ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)), - ('file', models.FileField(upload_to=exercise.models.file_path)), - ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file')), - ('professors', models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), - ('students', models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students')), - ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic')), + ('file', models.FileField(upload_to='uploads/%Y/%m/%d')), + ('allowed', models.BooleanField(default=False, verbose_name='Allowed delivery after end date?')), + ('file_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file')), ], ), ] diff --git a/exercise/migrations/0002_auto_20161117_0555.py b/exercise/migrations/0002_auto_20161117_0555.py deleted file mode 100644 index e9328d1..0000000 --- a/exercise/migrations/0002_auto_20161117_0555.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 08:55 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercise', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='exercise', - name='file', - field=models.FileField(upload_to='uploads/%Y/%m/%d'), - ), - migrations.AlterField( - model_name='exercise', - name='name_exercise', - field=models.CharField(max_length=100, verbose_name='Name'), - ), - migrations.AlterField( - model_name='exercise', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercise_topic', to='courses.Topic', verbose_name='Topic'), - ), - ] diff --git a/exercise/migrations/0002_auto_20161124_1217.py b/exercise/migrations/0002_auto_20161124_1217.py new file mode 100644 index 0000000..a61ebed --- /dev/null +++ b/exercise/migrations/0002_auto_20161124_1217.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-24 15:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('exercise', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('courses', '0002_auto_20161124_1217'), + ] + + operations = [ + migrations.AddField( + model_name='exercise', + name='professors', + field=models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='exercise', + name='students', + field=models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='exercise', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercise_topic', to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/exercise/migrations/0003_auto_20161118_2242.py b/exercise/migrations/0003_auto_20161118_2242.py deleted file mode 100644 index 453b7dd..0000000 --- a/exercise/migrations/0003_auto_20161118_2242.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-19 01:42 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercise', '0002_auto_20161117_0555'), - ] - - operations = [ - migrations.AlterField( - model_name='exercise', - name='file_type', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file'), - ), - ] diff --git a/exercise/migrations/0004_auto_20161121_0922.py b/exercise/migrations/0004_auto_20161121_0922.py deleted file mode 100644 index 0433b90..0000000 --- a/exercise/migrations/0004_auto_20161121_0922.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-21 12:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercise', '0003_auto_20161118_2242'), - ] - - operations = [ - migrations.RemoveField( - model_name='exercise', - name='init_date', - ), - migrations.AlterField( - model_name='exercise', - name='end_date', - field=models.DateField(verbose_name='Delivery Date'), - ), - ] diff --git a/exercise/migrations/0005_exercise_allowed.py b/exercise/migrations/0005_exercise_allowed.py deleted file mode 100644 index f80cfd8..0000000 --- a/exercise/migrations/0005_exercise_allowed.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-21 12:50 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercise', '0004_auto_20161121_0922'), - ] - - operations = [ - migrations.AddField( - model_name='exercise', - name='allowed', - field=models.BooleanField(default=False, verbose_name='Allowed delivery after end date?'), - ), - ] diff --git a/exercise/migrations/0006_auto_20161121_1008.py b/exercise/migrations/0006_auto_20161121_1008.py deleted file mode 100644 index c0da128..0000000 --- a/exercise/migrations/0006_auto_20161121_1008.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-21 13:08 -from __future__ import unicode_literals - -from django.db import migrations, models -import exercise.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercise', '0005_exercise_allowed'), - ] - - operations = [ - migrations.AlterField( - model_name='exercise', - name='file', - field=models.FileField(upload_to=exercise.models.file_path, verbose_name='File'), - ), - ] diff --git a/exercise/migrations/0007_auto_20161121_1019.py b/exercise/migrations/0007_auto_20161121_1019.py deleted file mode 100644 index 8b4e5f7..0000000 --- a/exercise/migrations/0007_auto_20161121_1019.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-21 13:19 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('exercise', '0006_auto_20161121_1008'), - ] - - operations = [ - migrations.AlterField( - model_name='exercise', - name='file', - field=models.FileField(upload_to='uploads/%Y/%m/%d'), - ), - ] diff --git a/exercise/templates/exercise/create_exercise.html.py b/exercise/templates/exercise/create_exercise.html.py deleted file mode 100644 index 93569fd..0000000 --- a/exercise/templates/exercise/create_exercise.html.py +++ /dev/null @@ -1,83 +0,0 @@ -BBBB BBBBBBBBBBBBB BBBB BBBBBB -XXXXXXXXX XXXXXX XXXXXXXXXXX -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX gettext(u'Create a New Exercise') XXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXX XXX - XXXXX XXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBBBBBBBBB - BB BBBBBBBB - BBB BBBBBBB BB BBBBBBBB - XXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXX - XXXXXXX - XXXXXX - BBBBBB - BBBBB - BBB BBBBB BB BBBB - XXXX XXXXX XXXXXXXXXXXXXX - BB BBBBBBBBBBBBBBBBBBBB - XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBBBB - BBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBBBBB BBBBBBBBB - BB BBBBBBBBBBBB - XXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXX - XXXX - BBB BBBBB BB BBBBBBBBBBBB - XXXXXXXXX - BBBBBB - XXXXX - XXXXXX - BBBBB - XXXXXX - BBBBBB - XXXX XXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXXXXXXX - XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX - XXXXXX - XXXX XXXX XXXX XXX - XXXXXX - XXXXXX - XXXXXX -XXXXXX -XXXX XXXXXXXX XXX -XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBXXXXXXXXXXX -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXX - XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXX XXXXX - XXXXXX XXXXXX - XXXXXXXXXXXX XXXXXX - XXXXXXXXXXXX XXXXXX - XXXXXXXX XXXXXXXXXXXXXX X - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXX - XX - XXXXXX XXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXX X XXXXX XXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXX XX X XXXXXXXXXXXXXXXXXXX XX XXXXXX - X - XXX - XXXXXXXXXXXXXXXXXXXXXXX - XXX -XXXXXXXXX diff --git a/exercise/templates/exercise/delete_exercise.html.py b/exercise/templates/exercise/delete_exercise.html.py deleted file mode 100644 index c829ca1..0000000 --- a/exercise/templates/exercise/delete_exercise.html.py +++ /dev/null @@ -1,66 +0,0 @@ -BBBB BBBBBB BBBBBBBBBBBBB BBBB - -XXXX XXXXX XXXXXX XXXX XXX -XXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBXX - -XXXX XXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXX - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX gettext(u'Delete Exercise') XXXXX - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXX XXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBBBBBBBBB - XXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - gettext(u'Are you sure to delete the exercise ') XXXXXXXXXXXXXXXXXXX XXXX XX X - XXXXXX - XXXX XXXXXXXXXXXXXXXXXXX - XXXX XXXXXXXXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX - XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Delete') XXXXXXXXX - XXXXXX - XXXXXX - XXXXXXXXXXX - XXXXXXX - XXXX XXXX XXXX XXX - XXXXXX - XXXXXX - XXXXXX - XXXXXX -XXXXXX - XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBXXXXXXXXXXX - XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X - XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXX - XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBXX - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXX XXXXX - XXXXXX XXXXXX - XXXXXXXXXXXX XXXXXX - XXXXXXXXXXXX XXXXXX - XXXXXXXX XXXXXXXXXXXXXX X - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXX - XX - XXXXXX XXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XX XXXXXXXXXX - X - XXX - XXXXXXXXXXXXXXXXXXXXXXX - XXX - XXXXXXXXX -XXXX XXXXXXXX XXX diff --git a/exercise/templates/exercise/exercise_edit.html.py b/exercise/templates/exercise/exercise_edit.html.py deleted file mode 100644 index 2c5937c..0000000 --- a/exercise/templates/exercise/exercise_edit.html.py +++ /dev/null @@ -1,7 +0,0 @@ -BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB -XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBB BBBBBBBB BB BBBBBBBBB - XXX XXXXXXXXXXXXXXXXXXXXXXXX XX X XXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - XXX XX X XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - BBBBBB -XXXXXX diff --git a/exercise/templates/exercise/exercise_list.html.py b/exercise/templates/exercise/exercise_list.html.py deleted file mode 100644 index 9fcd85a..0000000 --- a/exercise/templates/exercise/exercise_list.html.py +++ /dev/null @@ -1,6 +0,0 @@ -BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB -XXXX XXXXXXXXXXXXXXXXXXXXXXXXXX -BBB BBBBBBBB BB BBBBBBBBB - XXX XXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXX -BBBBBB -XXXXXX diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py index 1212390..f2dda95 100644 --- a/files/migrations/0001_initial.py +++ b/files/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('courses', '0001_initial'), ('core', '0001_initial'), + ('courses', '0001_initial'), ] operations = [ @@ -26,8 +26,8 @@ class Migration(migrations.Migration): ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')), ], options={ - 'verbose_name_plural': 'Files', 'verbose_name': 'File', + 'verbose_name_plural': 'Files', 'ordering': ('-id',), }, bases=('courses.material',), diff --git a/files/migrations/0002_topicfile_professor.py b/files/migrations/0002_topicfile_professor.py index 112edaf..c42cf3b 100644 --- a/files/migrations/0002_topicfile_professor.py +++ b/files/migrations/0002_topicfile_professor.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.conf import settings @@ -11,8 +11,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('files', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('files', '0001_initial'), ] operations = [ diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index f795899..c64fab5 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.db import migrations, models @@ -24,8 +24,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), ], options={ - 'verbose_name_plural': 'Foruns', 'verbose_name': 'Forum', + 'verbose_name_plural': 'Foruns', }, bases=('courses.activity',), ), @@ -38,8 +38,8 @@ class Migration(migrations.Migration): ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), ], options={ - 'verbose_name_plural': 'Posts', 'verbose_name': 'Post', + 'verbose_name_plural': 'Posts', }, ), migrations.CreateModel( @@ -52,8 +52,8 @@ class Migration(migrations.Migration): ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), ], options={ - 'verbose_name_plural': 'Post Answers', 'verbose_name': 'Post Answer', + 'verbose_name_plural': 'Post Answers', }, ), ] diff --git a/forum/migrations/0002_auto_20161117_0217.py b/forum/migrations/0002_auto_20161117_0217.py deleted file mode 100644 index b68401a..0000000 --- a/forum/migrations/0002_auto_20161117_0217.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('forum', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='postanswer', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), - ), - migrations.AddField( - model_name='post', - name='forum', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'), - ), - migrations.AddField( - model_name='post', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), - ), - ] diff --git a/forum/migrations/0002_auto_20161124_1217.py b/forum/migrations/0002_auto_20161124_1217.py new file mode 100644 index 0000000..aa1a54a --- /dev/null +++ b/forum/migrations/0002_auto_20161124_1217.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-24 15:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('forum', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='postanswer', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), + ), + migrations.AddField( + model_name='post', + name='forum', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'), + ), + migrations.AddField( + model_name='post', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), + ), + ] diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py index 4635f97..c37cae2 100644 --- a/links/migrations/0001_initial.py +++ b/links/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.db import migrations, models @@ -24,8 +24,8 @@ class Migration(migrations.Migration): ('image', models.ImageField(blank=True, upload_to='links/')), ], options={ - 'verbose_name_plural': 'Links', 'verbose_name': 'Link', + 'verbose_name_plural': 'Links', }, bases=('courses.material',), ), diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index cab7ead..7f707d4 100644 --- a/poll/migrations/0001_initial.py +++ b/poll/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals from django.db import migrations, models @@ -23,8 +23,8 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name_plural': 'Answers', 'verbose_name': 'Answer', + 'verbose_name_plural': 'Answers', 'ordering': ('order',), }, ), @@ -37,8 +37,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name_plural': 'Answers Student', 'verbose_name': 'Answer Stundent', + 'verbose_name_plural': 'Answers Student', }, ), migrations.CreateModel( @@ -47,8 +47,8 @@ class Migration(migrations.Migration): ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')), ], options={ - 'verbose_name_plural': 'Polls', 'verbose_name': 'Poll', + 'verbose_name_plural': 'Polls', }, bases=('courses.activity',), ), diff --git a/poll/migrations/0002_auto_20161117_0217.py b/poll/migrations/0002_auto_20161117_0217.py deleted file mode 100644 index cf7d967..0000000 --- a/poll/migrations/0002_auto_20161117_0217.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('poll', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='poll', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), - ), - ] diff --git a/poll/migrations/0002_auto_20161124_1217.py b/poll/migrations/0002_auto_20161124_1217.py new file mode 100644 index 0000000..a5c8670 --- /dev/null +++ b/poll/migrations/0002_auto_20161124_1217.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-24 15:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('poll', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='answersstudent', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( + model_name='answer', + name='poll', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), + ), + ] diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py index a46ff9d..4122283 100644 --- a/users/migrations/0001_initial.py +++ b/users/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 05:17 +# Generated by Django 1.10 on 2016-11-24 15:17 from __future__ import unicode_literals import django.contrib.auth.models @@ -40,14 +40,14 @@ class Migration(migrations.Migration): ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution')), ('curriculum', models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum')), ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), - ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')), + ('is_staff', models.BooleanField(default=False, verbose_name='Administrator')), ('is_active', models.BooleanField(default=True, verbose_name='Active')), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), ], options={ - 'verbose_name_plural': 'Users', 'verbose_name': 'User', + 'verbose_name_plural': 'Users', }, managers=[ ('objects', django.contrib.auth.models.UserManager()), diff --git a/users/migrations/0002_auto_20161121_0922.py b/users/migrations/0002_auto_20161121_0922.py deleted file mode 100644 index d081e8e..0000000 --- a/users/migrations/0002_auto_20161121_0922.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-21 12:22 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('users', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='user', - name='is_staff', - field=models.BooleanField(default=False, verbose_name='Administrator'), - ), - ] -- libgit2 0.21.2