diff --git a/apps/activities/migrations/0001_initial.py b/apps/activities/migrations/0001_initial.py index 845bf8514..320a4d4c8 100644 --- a/apps/activities/migrations/0001_initial.py +++ b/apps/activities/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.6 on 2019-10-24 12:30 -import adhocracy4.ckeditor.fields import autoslug.fields from django.db import migrations, models import django.db.models.deletion @@ -46,9 +45,7 @@ class Migration(migrations.Migration): ), ( "description", - adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( - verbose_name="Description" - ), + models.TextField(verbose_name="Description"), ), ], options={ diff --git a/apps/budgeting/migrations/0001_initial.py b/apps/budgeting/migrations/0001_initial.py index d6f67cdbe..3d10dd16e 100644 --- a/apps/budgeting/migrations/0001_initial.py +++ b/apps/budgeting/migrations/0001_initial.py @@ -5,7 +5,6 @@ import adhocracy4.maps.fields import apps.moderatorfeedback.fields import autoslug.fields -import ckeditor.fields from django.db import migrations, models import django.db.models.deletion @@ -61,7 +60,7 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=120, verbose_name="Title")), ( "description", - ckeditor.fields.RichTextField(verbose_name="Description"), + models.TextField(verbose_name="Description"), ), ( "image", diff --git a/apps/documents/migrations/0001_initial.py b/apps/documents/migrations/0001_initial.py index 33a8bec92..610afba79 100644 --- a/apps/documents/migrations/0001_initial.py +++ b/apps/documents/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.6 on 2019-10-24 12:30 -import ckeditor_uploader.fields from django.db import migrations, models import django.db.models.deletion import django.utils.timezone @@ -60,7 +59,7 @@ class Migration(migrations.Migration): models.DateTimeField(blank=True, editable=False, null=True), ), ("name", models.CharField(blank=True, max_length=120)), - ("text", ckeditor_uploader.fields.RichTextUploadingField()), + ("text", models.TextField()), ("weight", models.PositiveIntegerField()), ( "chapter", diff --git a/apps/ideas/migrations/0001_initial.py b/apps/ideas/migrations/0001_initial.py index 6dacb127a..4fbe80cb2 100644 --- a/apps/ideas/migrations/0001_initial.py +++ b/apps/ideas/migrations/0001_initial.py @@ -4,7 +4,6 @@ import adhocracy4.images.fields import apps.moderatorfeedback.fields import autoslug.fields -import ckeditor.fields from django.db import migrations, models import django.db.models.deletion @@ -60,7 +59,7 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=120, verbose_name="Title")), ( "description", - ckeditor.fields.RichTextField(verbose_name="Description"), + models.TextField(verbose_name="Description"), ), ( "image", diff --git a/apps/interactiveevents/migrations/0001_initial.py b/apps/interactiveevents/migrations/0001_initial.py index 60b78abcb..234ef3008 100644 --- a/apps/interactiveevents/migrations/0001_initial.py +++ b/apps/interactiveevents/migrations/0001_initial.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.17 on 2020-11-24 12:12 import adhocracy4.categories.fields -import adhocracy4.ckeditor.fields from django.db import migrations, models import django.db.models.deletion import django.utils.timezone @@ -33,9 +32,7 @@ class Migration(migrations.Migration): ), ( "live_stream", - adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( - blank=True, verbose_name="Live Stream" - ), + models.TextField(blank=True, verbose_name="Live Stream"), ), ], options={ diff --git a/apps/mapideas/migrations/0001_initial.py b/apps/mapideas/migrations/0001_initial.py index 2b7e6ee7e..d60b96d3a 100644 --- a/apps/mapideas/migrations/0001_initial.py +++ b/apps/mapideas/migrations/0001_initial.py @@ -5,7 +5,6 @@ import adhocracy4.maps.fields import apps.moderatorfeedback.fields import autoslug.fields -import ckeditor.fields from django.db import migrations, models import django.db.models.deletion @@ -61,7 +60,7 @@ class Migration(migrations.Migration): ("name", models.CharField(max_length=120, verbose_name="Title")), ( "description", - ckeditor.fields.RichTextField(verbose_name="Description"), + models.TextField(verbose_name="Description"), ), ( "image", diff --git a/apps/moderatorfeedback/migrations/0001_initial.py b/apps/moderatorfeedback/migrations/0001_initial.py index 5150cabfa..89310b832 100644 --- a/apps/moderatorfeedback/migrations/0001_initial.py +++ b/apps/moderatorfeedback/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.6 on 2019-10-24 12:31 -import ckeditor.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -40,7 +39,7 @@ class Migration(migrations.Migration): ), ( "statement", - ckeditor.fields.RichTextField( + models.TextField( blank=True, help_text="The official feedback will appear below the idea, indicating your organisation. The idea provider receives a notification.", verbose_name="Official feedback", diff --git a/apps/moderatorfeedback/migrations/0005_moderatorcommentfeedback.py b/apps/moderatorfeedback/migrations/0005_moderatorcommentfeedback.py index d502ae678..66bcaa75f 100644 --- a/apps/moderatorfeedback/migrations/0005_moderatorcommentfeedback.py +++ b/apps/moderatorfeedback/migrations/0005_moderatorcommentfeedback.py @@ -1,6 +1,5 @@ # Generated by Django 3.2.18 on 2023-03-30 11:17 -import ckeditor.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -44,9 +43,7 @@ class Migration(migrations.Migration): ), ( "feedback_text", - ckeditor.fields.RichTextField( - blank=True, verbose_name="Moderator feedback" - ), + models.TextField(blank=True, verbose_name="Moderator feedback"), ), ( "comment", diff --git a/apps/newsletters/migrations/0001_initial.py b/apps/newsletters/migrations/0001_initial.py index aafa26b4e..26be7d040 100644 --- a/apps/newsletters/migrations/0001_initial.py +++ b/apps/newsletters/migrations/0001_initial.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.6 on 2019-10-24 13:08 -import ckeditor_uploader.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -50,9 +49,7 @@ class Migration(migrations.Migration): ("subject", models.CharField(max_length=254, verbose_name="Subject")), ( "body", - ckeditor_uploader.fields.RichTextUploadingField( - blank=True, verbose_name="Email body" - ), + models.TextField(blank=True, verbose_name="Email body"), ), ( "sent", diff --git a/apps/newsletters/migrations/0002_add_helptext_to_body.py b/apps/newsletters/migrations/0002_add_helptext_to_body.py index 2ea074062..0bfa8e3ef 100644 --- a/apps/newsletters/migrations/0002_add_helptext_to_body.py +++ b/apps/newsletters/migrations/0002_add_helptext_to_body.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.17 on 2020-11-27 16:03 -import ckeditor_uploader.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -14,7 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="newsletter", name="body", - field=ckeditor_uploader.fields.RichTextUploadingField( + field=models.TextField( blank=True, help_text="When adding images, please ensure to set the width no larger than 600px.", verbose_name="Email body", diff --git a/apps/offlineevents/migrations/0001_initial.py b/apps/offlineevents/migrations/0001_initial.py index 4de9b6533..a5eb6791f 100644 --- a/apps/offlineevents/migrations/0001_initial.py +++ b/apps/offlineevents/migrations/0001_initial.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.6 on 2019-10-24 12:32 import autoslug.fields -import ckeditor_uploader.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -58,9 +57,7 @@ class Migration(migrations.Migration): ("date", models.DateTimeField(verbose_name="Date")), ( "description", - ckeditor_uploader.fields.RichTextUploadingField( - verbose_name="Description" - ), + models.TextField(verbose_name="Description"), ), ( "creator", diff --git a/apps/organisations/migrations/0001_initial.py b/apps/organisations/migrations/0001_initial.py index eaf63534f..d107f9ad8 100644 --- a/apps/organisations/migrations/0001_initial.py +++ b/apps/organisations/migrations/0001_initial.py @@ -2,8 +2,6 @@ import adhocracy4.images.fields import autoslug.fields -import ckeditor.fields -import ckeditor_uploader.fields import parler.models from django.conf import settings from django.db import migrations, models @@ -85,7 +83,7 @@ class Migration(migrations.Migration): ), ( "information", - ckeditor_uploader.fields.RichTextUploadingField( + models.TextField( blank=True, help_text="You can provide general information about your participation platform to your visitors. It’s also helpful to name a general person of contact for inquiries. The information will be shown on a separate page that can be reached via the main menu.", verbose_name="Information about your organisation", @@ -93,7 +91,7 @@ class Migration(migrations.Migration): ), ( "imprint", - ckeditor.fields.RichTextField( + models.TextField( help_text="Please provide all the legally required information of your imprint. The imprint will be shown on a separate page.", verbose_name="Imprint", ), diff --git a/apps/organisations/migrations/0003_collapsible_element.py b/apps/organisations/migrations/0003_collapsible_element.py index c89bfa645..8256b792d 100644 --- a/apps/organisations/migrations/0003_collapsible_element.py +++ b/apps/organisations/migrations/0003_collapsible_element.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.8 on 2020-01-16 17:12 -import adhocracy4.ckeditor.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -14,7 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="organisation", name="information", - field=adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( + field=models.TextField( blank=True, help_text="You can provide general information about your participation platform to your visitors. It’s also helpful to name a general person of contact for inquiries. The information will be shown on a separate page that can be reached via the main menu.", verbose_name="Information about your organisation", diff --git a/apps/organisations/migrations/0008_org_info_helptext.py b/apps/organisations/migrations/0008_org_info_helptext.py index 89e89f263..98fda9ed9 100644 --- a/apps/organisations/migrations/0008_org_info_helptext.py +++ b/apps/organisations/migrations/0008_org_info_helptext.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.10 on 2020-02-20 10:46 -import adhocracy4.ckeditor.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -14,7 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="organisation", name="information", - field=adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( + field=models.TextField( blank=True, help_text='You can provide general information about your participation platform to your visitors. It’s also helpful to name a general person of contact for inquiries. The information will be shown on a separate "About" page that can be reached via the main menu.', verbose_name="Information about your organisation", diff --git a/apps/organisations/migrations/0011_org_add_terms_use_data_protection_netiquette.py b/apps/organisations/migrations/0011_org_add_terms_use_data_protection_netiquette.py index 4386a222a..9173848d8 100644 --- a/apps/organisations/migrations/0011_org_add_terms_use_data_protection_netiquette.py +++ b/apps/organisations/migrations/0011_org_add_terms_use_data_protection_netiquette.py @@ -1,6 +1,5 @@ # Generated by Django 2.2.11 on 2020-04-05 16:41 -import ckeditor.fields from django.db import migrations, models @@ -14,7 +13,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="organisation", name="data_protection", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide your data protection information.", verbose_name="Data protection", @@ -23,7 +22,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="organisation", name="netiquette", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide your rules for online discussions.", verbose_name="Netiquette", @@ -32,7 +31,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name="organisation", name="terms_of_use", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide your terms of use.", verbose_name="Terms of use", @@ -51,7 +50,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="organisation", name="imprint", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide all the legally required information of your imprint. The imprint will be shown on a separate page.", verbose_name="Imprint", diff --git a/apps/organisations/migrations/0012_orga_helptexts_terms_of_use_data_protection_netiquette.py b/apps/organisations/migrations/0012_orga_helptexts_terms_of_use_data_protection_netiquette.py index 4bcd6f365..f66d65553 100644 --- a/apps/organisations/migrations/0012_orga_helptexts_terms_of_use_data_protection_netiquette.py +++ b/apps/organisations/migrations/0012_orga_helptexts_terms_of_use_data_protection_netiquette.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.11 on 2020-04-07 10:34 -import ckeditor.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -14,7 +13,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="organisation", name="data_protection", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide all the legally required information of your data protection. The data protection policy will be shown on a separate page.", verbose_name="Data protection policy", @@ -23,7 +22,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="organisation", name="netiquette", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide a netiquette for the participants. The netiquette helps improving the climate of online discussions and supports the moderation.", verbose_name="Netiquette", @@ -32,7 +31,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="organisation", name="terms_of_use", - field=ckeditor.fields.RichTextField( + field=models.TextField( blank=True, help_text="Please provide all the legally required information of your terms of use. The terms of use will be shown on a separate page.", verbose_name="Terms of use", diff --git a/apps/organisations/migrations/0014_add_translatable_fields_and_rename_odl_fields.py b/apps/organisations/migrations/0014_add_translatable_fields_and_rename_odl_fields.py index 6a6d7c97f..9d7cac171 100644 --- a/apps/organisations/migrations/0014_add_translatable_fields_and_rename_odl_fields.py +++ b/apps/organisations/migrations/0014_add_translatable_fields_and_rename_odl_fields.py @@ -7,8 +7,6 @@ from django.db import migrations from django.db import models -import adhocracy4.ckeditor.fields - class Migration(migrations.Migration): @@ -70,7 +68,7 @@ class Migration(migrations.Migration): ), ( "information", - adhocracy4.ckeditor.fields.RichTextCollapsibleUploadingField( + models.TextField( blank=True, help_text='You can provide general information about your participation platform to your visitors. It’s also helpful to name a general person of contact for inquiries. The information will be shown on a separate "About" page that can be reached via the main menu.', verbose_name="Information about your organisation", diff --git a/apps/topicprio/migrations/0001_initial.py b/apps/topicprio/migrations/0001_initial.py index 1646f3e99..6d890726a 100644 --- a/apps/topicprio/migrations/0001_initial.py +++ b/apps/topicprio/migrations/0001_initial.py @@ -3,7 +3,6 @@ import adhocracy4.categories.fields import adhocracy4.images.fields import autoslug.fields -import ckeditor_uploader.fields from django.db import migrations, models import django.db.models.deletion @@ -40,7 +39,7 @@ class Migration(migrations.Migration): ), ), ("name", models.CharField(max_length=120, verbose_name="Title")), - ("description", ckeditor_uploader.fields.RichTextUploadingField()), + ("description", models.TextField()), ( "image", adhocracy4.images.fields.ConfiguredImageField( diff --git a/apps/topicprio/migrations/0002_topic_description_add_verbose_name.py b/apps/topicprio/migrations/0002_topic_description_add_verbose_name.py index f7e4da796..7c81be034 100644 --- a/apps/topicprio/migrations/0002_topic_description_add_verbose_name.py +++ b/apps/topicprio/migrations/0002_topic_description_add_verbose_name.py @@ -1,7 +1,6 @@ # Generated by Django 2.2.20 on 2021-05-07 14:27 -import ckeditor_uploader.fields -from django.db import migrations +from django.db import migrations, models class Migration(migrations.Migration): @@ -14,8 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name="topic", name="description", - field=ckeditor_uploader.fields.RichTextUploadingField( - verbose_name="Description" - ), + field=models.TextField(verbose_name="Description"), ), ] diff --git a/changelog/_0003.md b/changelog/_0003.md new file mode 100644 index 000000000..5849749a8 --- /dev/null +++ b/changelog/_0003.md @@ -0,0 +1,3 @@ +# Removed + +- removed the deprecated django-ckeditor fields from older migrations diff --git a/requirements/base.txt b/requirements/base.txt index 657d882c5..c8f9dea1e 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -19,7 +19,6 @@ redis==5.1.1 Django==4.2.16 django-allauth[socialaccount]==65.0.2 django-autoslug==1.9.9 -django-ckeditor==6.7.1 https://github.com/liqd/django-ckeditor-5/releases/download/v0.2.12-liqd/django_ckeditor_5-0.2.12-py3-none-any.whl django-filter==23.5 django-widget-tweaks==1.5.0