From e5848941a01ae288e102f1e39b802b4273d91125 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Tue, 19 Apr 2016 14:18:13 +0100 Subject: [PATCH] #2456 is now in 1.4.x --- CHANGELOG.txt | 4 ++-- docs/releases/1.4.4.rst | 3 ++- docs/releases/1.5.rst | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e9e1882b60..eb69f83d6e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -26,13 +26,13 @@ Changelog * Fix: Registered settings admin menu items now show active correctly (Matthew Downey) * Fix: Direct usage of `Document` model replaced with `get_document_model` function in `wagtail.contrib.wagtailmedusa` and in `wagtail.contrib.wagtailapi` * Fix: Failures on sending moderation notification emails now produce a warning, rather than crashing the admin page outright (Matt Fozard) - * Fix: Meta classes on StreamField blocks now handle multiple inheritance correctly (Tim Heap) 1.4.4 (xx.xx.2016) ~~~~~~~~~~~~~~~~~~ -* The `wagtailuserbar` template tag now gracefully handles situations where the `request` object is not in the template context (Matt Westcott) + * Fix: The `wagtailuserbar` template tag now gracefully handles situations where the `request` object is not in the template context (Matt Westcott) + * Fix: Meta classes on StreamField blocks now handle multiple inheritance correctly (Tim Heap) 1.4.3 (04.04.2016) diff --git a/docs/releases/1.4.4.rst b/docs/releases/1.4.4.rst index 3322d47d85..ed942b1025 100644 --- a/docs/releases/1.4.4.rst +++ b/docs/releases/1.4.4.rst @@ -13,4 +13,5 @@ What's changed Bug fixes ~~~~~~~~~ -* The ``wagtailuserbar`` template tag now gracefully handles situations where the ``request`` object is not in the template context (Matt Westcott) + * The ``wagtailuserbar`` template tag now gracefully handles situations where the ``request`` object is not in the template context (Matt Westcott) + * Meta classes on StreamField blocks now handle multiple inheritance correctly (Tim Heap) diff --git a/docs/releases/1.5.rst b/docs/releases/1.5.rst index a20ec57dbe..d51cecc30c 100644 --- a/docs/releases/1.5.rst +++ b/docs/releases/1.5.rst @@ -55,7 +55,6 @@ Bug fixes * Registered settings admin menu items now show active correctly (Matthew Downey) * Direct usage of ``Document`` model replaced with ``get_document_model`` function in ``wagtail.contrib.wagtailmedusa`` and in ``wagtail.contrib.wagtailapi`` * Failures on sending moderation notification emails now produce a warning, rather than crashing the admin page outright (Matt Fozard) - * Meta classes on StreamField blocks now handle multiple inheritance correctly (Tim Heap) Upgrade considerations