Merge branch 'main' into review-rate

bookwyrm/migrations/0030_auto_20201224_1939.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.7 on 2020-12-24 19:39
+
+import bookwyrm.models.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0029_auto_20201221_2014'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='localname',
+            field=models.CharField(max_length=255, null=True, unique=True, validators=[bookwyrm.models.fields.validate_localname]),
+        ),
+    ]

bookwyrm/migrations/0031_auto_20210104_2040.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.0.7 on 2021-01-04 20:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0030_auto_20201224_1939'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='favicon',
+            field=models.ImageField(blank=True, null=True, upload_to='logos/'),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='logo',
+            field=models.ImageField(blank=True, null=True, upload_to='logos/'),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='logo_small',
+            field=models.ImageField(blank=True, null=True, upload_to='logos/'),
+        ),
+    ]

bookwyrm/migrations/0032_auto_20210104_2055.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.7 on 2021-01-04 20:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bookwyrm', '0031_auto_20210104_2040'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='instance_tagline',
+            field=models.CharField(default='Social Reading and Reviewing', max_length=150),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='registration_closed_text',
+            field=models.TextField(default='Contact an administrator to get an invite'),
+        ),
+    ]