diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index fca48f98..c0a97ada 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.11' cache: 'pip' - name: Cache dependencies uses: actions/cache@v3.3.2 @@ -41,7 +41,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v4 with: - python-version: '3.9' + python-version: '3.11' cache: 'pip' - name: Cache dependencies uses: actions/cache@v3.3.2 diff --git a/.readthedocs.yaml b/.readthedocs.yaml index c9cc154c..5df0d445 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -1,5 +1,12 @@ +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.11" + sphinx: configuration: docs/source/conf.py fail_on_warning: false @@ -9,7 +16,5 @@ formats: - pdf python: - version: 3.8 - install: - - requirements: docs/requirements.txt + - requirements: docs/requirements.txt diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 76017047..b288adda 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog ========= +1.1.10 (2023-10-23) +=================== + +* Fix bug: icon template tags do not throw an exception if called with + empty icon +* Rename "Template" fields to "Layout" +* Fix bug: Card image at top of card recognized also for django CMS v4 +* Fix bug: Picture ratio retained for image plugin +* Fix bug: Show selected page in menu of default template. + 1.1.7 (2023-08-03) ================== diff --git a/djangocms_frontend/__init__.py b/djangocms_frontend/__init__.py index cb4e84ea..476313cf 100644 --- a/djangocms_frontend/__init__.py +++ b/djangocms_frontend/__init__.py @@ -19,4 +19,4 @@ 13. Github actions will publish the new package to pypi """ -__version__ = "1.1.9" +__version__ = "1.1.10" diff --git a/djangocms_frontend/contrib/icon/templatetags/icon_tags.py b/djangocms_frontend/contrib/icon/templatetags/icon_tags.py index aefeff4b..5eb1b3e6 100644 --- a/djangocms_frontend/contrib/icon/templatetags/icon_tags.py +++ b/djangocms_frontend/contrib/icon/templatetags/icon_tags.py @@ -8,7 +8,7 @@ @register.inclusion_tag("djangocms_frontend/icon/add_css.html", takes_context=True) def add_css_for_icon(context, icon): - if icon.get("library", "") in ICON_LIBRARIES: + if icon and icon.get("library", "") in ICON_LIBRARIES: css_link = ICON_LIBRARIES[icon.get("library")][1] if css_link: if "/" not in css_link: # static link? diff --git a/djangocms_frontend/locale/de/LC_MESSAGES/django.po b/djangocms_frontend/locale/de/LC_MESSAGES/django.po index 320c08d2..ec042906 100644 --- a/djangocms_frontend/locale/de/LC_MESSAGES/django.po +++ b/djangocms_frontend/locale/de/LC_MESSAGES/django.po @@ -454,7 +454,7 @@ msgstr "Überblenden" #: contrib/jumbotron/forms.py:44 contrib/link/forms.py:324 #: contrib/navigation/forms.py:42 contrib/tabs/forms.py:45 msgid "Layout" -msgstr "" +msgstr "Layout" #: contrib/carousel/forms.py:61 contrib/tabs/forms.py:48 msgid "This is the template that will be used for the component." @@ -1103,8 +1103,8 @@ msgid "Makes the jumbotron fill the full width of the container or window." msgstr "" "Erweitert Jas Jumbotron auf die volle Breite des Containers oder Fensters." -#: contrib/link/apps.py:7 contrib/link/constants.py:5 contrib/link/models.py:11 -#: contrib/link/models.py:114 +#: contrib/link/apps.py:7 contrib/link/constants.py:5 +#: contrib/link/models.py:11 contrib/link/models.py:114 msgid "Link" msgstr "Link"