diff --git a/district/migrations/0109_districtcustompage_mastodon_feed_and_more.py b/district/migrations/0109_districtcustompage_mastodon_feed_and_more.py
deleted file mode 100644
index 93c515a83d42121db08883d1e371d1489dfb9565..0000000000000000000000000000000000000000
--- a/district/migrations/0109_districtcustompage_mastodon_feed_and_more.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# Generated by Django 4.1.8 on 2023-04-24 20:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("district", "0108_alter_districtcenterpage_content_and_more"),
- ]
-
- operations = [
- migrations.AddField(
- model_name="districtcustompage",
- name="mastodon_feed",
- field=models.URLField(
- blank=True,
- help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
- verbose_name="Mastodon feed",
- ),
- ),
- migrations.AddField(
- model_name="districthomepage",
- name="mastodon_feed",
- field=models.URLField(
- blank=True,
- help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
- verbose_name="Mastodon feed",
- ),
- ),
- migrations.AddField(
- model_name="districtpeoplepage",
- name="mastodon_feed",
- field=models.URLField(
- blank=True,
- help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
- verbose_name="Mastodon feed",
- ),
- ),
- migrations.AddField(
- model_name="districtpersonpage",
- name="mastodon_feed",
- field=models.URLField(
- blank=True,
- help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
- verbose_name="Mastodon feed",
- ),
- ),
- ]
diff --git a/district/migrations/0112_merge_20230505_0128.py b/district/migrations/0112_merge_20230505_2059.py
similarity index 66%
rename from district/migrations/0112_merge_20230505_0128.py
rename to district/migrations/0112_merge_20230505_2059.py
index 1b0c257e96662a64caf082abb2df5ef2bf3a5190..8996906c1f0fc599a3124ccf48a5213664f62a4d 100644
--- a/district/migrations/0112_merge_20230505_0128.py
+++ b/district/migrations/0112_merge_20230505_2059.py
@@ -1,11 +1,10 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:28
+# Generated by Django 4.1.8 on 2023-05-05 18:59
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ("district", "0109_districtcustompage_mastodon_feed_and_more"),
("district", "0109_districthomepage_footer_links"),
("district", "0111_merge_20230502_1633"),
]
diff --git a/district/migrations/0113_districtcustompage_mastodon_and_more.py b/district/migrations/0113_districtcustompage_mastodon_and_more.py
index f54a941bb41ca59388aeac9180a254ff8c7c13ab..30e09de618c6199f57019bb3f66586e3ee4f6335 100644
--- a/district/migrations/0113_districtcustompage_mastodon_and_more.py
+++ b/district/migrations/0113_districtcustompage_mastodon_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:46
+# Generated by Django 4.1.8 on 2023-05-05 18:59
import django.db.models.deletion
import wagtail.blocks
@@ -13,7 +13,7 @@ import shared.blocks
class Migration(migrations.Migration):
dependencies = [
("shared", "0003_initial"),
- ("district", "0112_merge_20230505_0128"),
+ ("district", "0112_merge_20230505_2059"),
]
operations = [
@@ -27,6 +27,15 @@ class Migration(migrations.Migration):
to="shared.mastodon",
),
),
+ migrations.AddField(
+ model_name="districtcustompage",
+ name="mastodon_feed",
+ field=models.URLField(
+ blank=True,
+ help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
+ verbose_name="Mastodon feed",
+ ),
+ ),
migrations.AddField(
model_name="districthomepage",
name="mastodon",
@@ -37,6 +46,15 @@ class Migration(migrations.Migration):
to="shared.mastodon",
),
),
+ migrations.AddField(
+ model_name="districthomepage",
+ name="mastodon_feed",
+ field=models.URLField(
+ blank=True,
+ help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
+ verbose_name="Mastodon feed",
+ ),
+ ),
migrations.AddField(
model_name="districtpeoplepage",
name="mastodon",
@@ -47,6 +65,15 @@ class Migration(migrations.Migration):
to="shared.mastodon",
),
),
+ migrations.AddField(
+ model_name="districtpeoplepage",
+ name="mastodon_feed",
+ field=models.URLField(
+ blank=True,
+ help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
+ verbose_name="Mastodon feed",
+ ),
+ ),
migrations.AddField(
model_name="districtpersonpage",
name="mastodon",
@@ -57,6 +84,15 @@ class Migration(migrations.Migration):
to="shared.mastodon",
),
),
+ migrations.AddField(
+ model_name="districtpersonpage",
+ name="mastodon_feed",
+ field=models.URLField(
+ blank=True,
+ help_text="Zadejte mastodon feed url v tomto formátu: https://mastodon.pirati.cz/users/ivanbartos",
+ verbose_name="Mastodon feed",
+ ),
+ ),
migrations.AlterField(
model_name="districtcenterpage",
name="content",
diff --git a/senat_campaign/migrations/0012_merge_20230505_0128.py b/senat_campaign/migrations/0012_merge_20230505_2059.py
similarity index 85%
rename from senat_campaign/migrations/0012_merge_20230505_0128.py
rename to senat_campaign/migrations/0012_merge_20230505_2059.py
index 653e08cf2c3936ce776a175bfaf2fd588c49ce73..5a0206a5c3dd6a4599ca853093d74c5cb750d6a5 100644
--- a/senat_campaign/migrations/0012_merge_20230505_0128.py
+++ b/senat_campaign/migrations/0012_merge_20230505_2059.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:28
+# Generated by Django 4.1.8 on 2023-05-05 18:59
from django.db import migrations
diff --git a/senat_campaign/migrations/0013_senatcampaignhomepage_mastodon_and_more.py b/senat_campaign/migrations/0013_senatcampaignhomepage_mastodon_and_more.py
index c07e466d5f508c5d64e0ee32821f403151dd847a..58bcd7096f5d4e759751c71acafa54c0a0dec9aa 100644
--- a/senat_campaign/migrations/0013_senatcampaignhomepage_mastodon_and_more.py
+++ b/senat_campaign/migrations/0013_senatcampaignhomepage_mastodon_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:46
+# Generated by Django 4.1.8 on 2023-05-05 18:59
import django.db.models.deletion
from django.db import migrations, models
@@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("shared", "0003_initial"),
- ("senat_campaign", "0012_merge_20230505_0128"),
+ ("senat_campaign", "0012_merge_20230505_2059"),
]
operations = [
diff --git a/shared/migrations/0003_initial.py b/shared/migrations/0003_initial.py
index f3b9ebba64aa2dd679a948e5946989c8deb3ad09..af18937f50622c24fc62ec6f9b3dce826941b967 100644
--- a/shared/migrations/0003_initial.py
+++ b/shared/migrations/0003_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:46
+# Generated by Django 4.1.8 on 2023-05-05 18:59
import django.core.serializers.json
import django.db.models.deletion
@@ -44,7 +44,6 @@ class Migration(migrations.Migration):
null=True,
),
),
- ("summary", models.TextField(blank=True, null=True)),
],
options={
"abstract": False,
diff --git a/shared/migrations/0004_remove_mastodon_summary.py b/shared/migrations/0004_remove_mastodon_summary.py
deleted file mode 100644
index 4185eb78d58a0950d01052e60c2d5d822933e0d2..0000000000000000000000000000000000000000
--- a/shared/migrations/0004_remove_mastodon_summary.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Generated by Django 4.1.8 on 2023-05-05 00:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ("shared", "0003_initial"),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name="mastodon",
- name="summary",
- ),
- ]
diff --git a/uniweb/migrations/0043_merge_20230505_0128.py b/uniweb/migrations/0043_merge_20230505_2059.py
similarity index 83%
rename from uniweb/migrations/0043_merge_20230505_0128.py
rename to uniweb/migrations/0043_merge_20230505_2059.py
index ef620715b8218b2a00bc1618e97902505677293f..b68637abbbf3eda250b16e8f5515dde36d14c920 100644
--- a/uniweb/migrations/0043_merge_20230505_0128.py
+++ b/uniweb/migrations/0043_merge_20230505_2059.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:28
+# Generated by Django 4.1.8 on 2023-05-05 18:59
from django.db import migrations
diff --git a/uniweb/migrations/0044_uniwebhomepage_mastodon_uniwebhomepage_mastodon_feed_and_more.py b/uniweb/migrations/0044_uniwebhomepage_mastodon_uniwebhomepage_mastodon_feed_and_more.py
index ceba567afacca6b3b473bd02203d11292ffcd60b..d95ed405f5bb5e56d1da435ffff6e57e18218bd0 100644
--- a/uniweb/migrations/0044_uniwebhomepage_mastodon_uniwebhomepage_mastodon_feed_and_more.py
+++ b/uniweb/migrations/0044_uniwebhomepage_mastodon_uniwebhomepage_mastodon_feed_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.1.8 on 2023-05-04 23:46
+# Generated by Django 4.1.8 on 2023-05-05 18:59
import django.db.models.deletion
from django.db import migrations, models
@@ -7,7 +7,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("shared", "0003_initial"),
- ("uniweb", "0043_merge_20230505_0128"),
+ ("uniweb", "0043_merge_20230505_2059"),
]
operations = [