From a0ae61d05d62e7046239a1c90d50b8977966d264 Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Wed, 18 May 2016 22:11:38 +0100 Subject: [PATCH] Add BASE_URL setting back to project template --- CHANGELOG.txt | 1 + docs/releases/1.4.5.rst | 1 + wagtail/project_template/project_name/settings/base.py | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d41811d95..bdb66963a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -10,6 +10,7 @@ Changelog * Fix: The up / down / delete controls on the "Promoted search results" form no longer trigger a form submission (Matt Westcott) * Fix: Opening preview window no longer performs user-agent sniffing, and now works correctly on IE11 (Matt Westcott) * Fix: Tree paths are now correctly assigned when previewing a newly-created page underneath a parent with deleted children (Matt Westcott) + * Fix: Added BASE_URL setting back to project template 1.4.4 (10.05.2016) diff --git a/docs/releases/1.4.5.rst b/docs/releases/1.4.5.rst index a9126c5cd..4dc360482 100644 --- a/docs/releases/1.4.5.rst +++ b/docs/releases/1.4.5.rst @@ -19,3 +19,4 @@ Bug fixes * The up / down / delete controls on the "Promoted search results" form no longer trigger a form submission (Matt Westcott) * Opening preview window no longer performs user-agent sniffing, and now works correctly on IE11 (Matt Westcott) * Tree paths are now correctly assigned when previewing a newly-created page underneath a parent with deleted children (Matt Westcott) + * Added BASE_URL setting back to project template diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py index 28cb1f667..e86d4495f 100644 --- a/wagtail/project_template/project_name/settings/base.py +++ b/wagtail/project_template/project_name/settings/base.py @@ -134,3 +134,7 @@ MEDIA_URL = '/media/' # Wagtail settings WAGTAIL_SITE_NAME = "{{ project_name }}" + +# Base URL to use when referring to full URLs within the Wagtail admin backend - +# e.g. in notification emails. Don't include '/admin' or a trailing slash +BASE_URL = 'http://example.com'