diff --git a/CHANGELOG.txt b/CHANGELOG.txt index df11091ee9..a4a915a14c 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,6 +4,7 @@ Changelog 2.15 (xx.xx.xxxx) - IN DEVELOPMENT ~~~~~~~~~~~~~~~~~ + * Add the ability for the page chooser to convert external urls that match a page to internal links (Jacob Topp-Mugglestone. Sponsored by The Motley Fool) * Added "Extending Wagtail" section to documentation (Matt Westcott) * Support `min_num` / `max_num` options on ListBlock (Matt Westcott) * Added a `background_position_style` property to renditions (Karl Hobley) diff --git a/docs/reference/settings.rst b/docs/reference/settings.rst index 49734edc54..a6885c8033 100644 --- a/docs/reference/settings.rst +++ b/docs/reference/settings.rst @@ -826,6 +826,8 @@ Customise the behaviour of rich text fields. By default, ``RichTextField`` and ` If a ``'default'`` editor is not specified, rich text fields that do not specify an ``editor`` argument will use the Draftail editor with the default feature set enabled. +.. _WAGTAILADMIN_EXTERNAL_LINK_CONVERSION: + ``WAGTAILADMIN_EXTERNAL_LINK_CONVERSION`` ----------------------------------------- diff --git a/docs/releases/2.15.rst b/docs/releases/2.15.rst index d2cbe3b615..62055d6b66 100644 --- a/docs/releases/2.15.rst +++ b/docs/releases/2.15.rst @@ -15,6 +15,8 @@ What's new Other features ~~~~~~~~~~~~~~ + * Add the ability for the page chooser to convert external urls that match a page to internal links, see :ref:`WAGTAILADMIN_EXTERNAL_LINK_CONVERSION` (Jacob Topp-Mugglestone. Sponsored by The Motley Fool) + * Added "Extending Wagtail" section to documentation (Matt Westcott) * Added "Extending Wagtail" section to documentation (Matt Westcott) * Support ``min_num`` / ``max_num`` options on ListBlock (Matt Westcott) * Added a `background_position_style` property to renditions. This can be used to crop images using its focal point in the browser. See :ref:`rendition_background_position_style` (Karl Hobley)