Merge branch 'migrations' into 'master'

Migrations

See merge request AlekSIS/AlekSIS!148

aleksis/core/migrations/0002_activity_notification.py

@@ -20,9 +20,9 @@ class Migration(migrations.Migration):
                 ('title', models.CharField(max_length=150)),
                 ('description', models.TextField(max_length=500)),
                 ('link', models.URLField(blank=True)),
-                ('app', models.CharField(max_length=100)),
+                ('app', models.CharField(max_length=100, verbose_name='Sender')),
                 ('read', models.BooleanField(default=False)),
-                ('mailed', models.BooleanField(default=False)),
+                ('mailed', models.BooleanField(default=False, verbose_name='Sent')),
                 ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notifications',
                                            to=settings.AUTH_USER_MODEL)),

aleksis/core/migrations/0010_create_validation_service.py

+from django.db import migrations
+
+
+def create_validation_service(apps, schema_editor):
+    apps.get_model('otp_yubikey', 'ValidationService').objects.update_or_create(
+        name='default', defaults={'use_ssl': True, 'param_sl': '', 'param_timeout': ''}
+    )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0009_dashboard_widget'),
+    ]
+
+    operations = [
+        migrations.RunPython(create_validation_service)
+    ]
+