From e6574ef57de5a202a1053e27d35c7396a95ccf6d Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 10 May 2024 17:17:42 +0200 Subject: [PATCH 1/5] Update setup.py --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index d1a5955..cc03cfa 100644 --- a/setup.py +++ b/setup.py @@ -16,6 +16,8 @@ 'Framework :: Django', 'Framework :: Django :: 2.2', 'Framework :: Django :: 3.2', + 'Framework :: Django :: 4.2', + 'Framework :: Django :: 5.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Operating System :: OS Independent', @@ -25,6 +27,8 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', 'Topic :: Communications', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', 'Topic :: Internet :: WWW/HTTP :: Dynamic Content :: Message Boards', From 8d2a3fea8f8063acd79f8826214aac9235556ff2 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 10 May 2024 17:18:28 +0200 Subject: [PATCH 2/5] Update __init__.py --- djangocms_column/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_column/__init__.py b/djangocms_column/__init__.py index afced14..a33997d 100644 --- a/djangocms_column/__init__.py +++ b/djangocms_column/__init__.py @@ -1 +1 @@ -__version__ = '2.0.0' +__version__ = '2.1.0' From 8b4524f325b7ce79083f44d0d47a74c18ab120b1 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 10 May 2024 17:19:46 +0200 Subject: [PATCH 3/5] Update column.html --- djangocms_column/templates/cms/plugins/column.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/djangocms_column/templates/cms/plugins/column.html b/djangocms_column/templates/cms/plugins/column.html index b328bef..02d3cd7 100644 --- a/djangocms_column/templates/cms/plugins/column.html +++ b/djangocms_column/templates/cms/plugins/column.html @@ -1,6 +1,6 @@ {% load cms_tags %} -
+
{% for plugin in instance.child_plugin_instances %} {% render_plugin plugin %} {% endfor %} -
\ No newline at end of file +
From fe15c6fd57ea6bef57c33bfcf1a0902b9410c648 Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 10 May 2024 17:20:13 +0200 Subject: [PATCH 4/5] Update column.html --- djangocms_column/templates/cms/plugins/column.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangocms_column/templates/cms/plugins/column.html b/djangocms_column/templates/cms/plugins/column.html index 02d3cd7..3d646f4 100644 --- a/djangocms_column/templates/cms/plugins/column.html +++ b/djangocms_column/templates/cms/plugins/column.html @@ -1,5 +1,5 @@ {% load cms_tags %} -
+
{% for plugin in instance.child_plugin_instances %} {% render_plugin plugin %} {% endfor %} From 43f2b882a620e3379dbfce63f80d69aa3afc52dc Mon Sep 17 00:00:00 2001 From: Fabian Braun Date: Fri, 10 May 2024 17:25:39 +0200 Subject: [PATCH 5/5] Update CHANGELOG.rst --- CHANGELOG.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 56dac7a..7ec9532 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,12 @@ Changelog ========= +2.1.0 (2024-05-10) +================== + +* fix: add missing migration by @sephii in https://github.com/django-cms/djangocms-column/pull/58 +* fix: Update cms_plugins.py for django CMS 4 compatibility by @aacimov in https://github.com/django-cms/djangocms-column/pull/60 + 2.0.0 (2022-04-11) ==================