From 518abc26731574b885b7a004d151064dfe520b1c Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Thu, 28 Apr 2016 11:45:41 +0100 Subject: [PATCH] changelog entry for #2517 should be in 1.4.4 --- CHANGELOG.txt | 2 +- docs/releases/1.4.4.rst | 1 + docs/releases/1.5.rst | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0b4122f813..67a18888d6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -33,7 +33,6 @@ Changelog * Fix: Failures on sending moderation notification emails now produce a warning, rather than crashing the admin page outright (Matt Fozard) * Fix: All admin forms that could potentially include file upload fields now specify `multipart/form-data` where appropriate (Tim Heap) * Fix: REM units in Wagtailuserbar caused incorrect spacing (Vincent Audebert) - * Fix: Now user can upload images / documents only into permitted collection from choosers * Fix: Explorer menu no longer scrolls with page content (Vincent Audebert) @@ -42,6 +41,7 @@ Changelog * 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) + * Fix: Now user can upload images / documents only into permitted collection from choosers 1.4.3 (04.04.2016) diff --git a/docs/releases/1.4.4.rst b/docs/releases/1.4.4.rst index ed942b1025..0bb1de2f0d 100644 --- a/docs/releases/1.4.4.rst +++ b/docs/releases/1.4.4.rst @@ -15,3 +15,4 @@ Bug fixes * 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) + * Now user can upload images / documents only into permitted collection from choosers diff --git a/docs/releases/1.5.rst b/docs/releases/1.5.rst index c5ee6998e2..12aef75f53 100644 --- a/docs/releases/1.5.rst +++ b/docs/releases/1.5.rst @@ -62,7 +62,6 @@ Bug fixes * Failures on sending moderation notification emails now produce a warning, rather than crashing the admin page outright (Matt Fozard) * All admin forms that could potentially include file upload fields now specify ``multipart/form-data`` where appropriate (Tim Heap) * REM units in Wagtailuserbar caused incorrect spacing (Vincent Audebert) - * Now user can upload images / documents only into permitted collection from choosers * Explorer menu no longer scrolls with page content (Vincent Audebert)