From 8f6bae6bd61034ba7faabb06ae6be16ab3a210d5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 28 Mar 2018 08:53:49 +0200 Subject: [PATCH 01/11] Remove conflicting cms/ urlconf --- dynamicweb/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index 884c95b4..6d4f838a 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -56,7 +56,7 @@ urlpatterns += i18n_patterns( url( r'^blog/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/$', RedirectView.as_view(pattern_name='ungleich:post-detail')), - url(r'^blog/|cms/$', RedirectView.as_view( + url(r'^blog/$', RedirectView.as_view( url=reverse_lazy('ungleich:post-list')), name='blog_list_view'), url(r'^cms/', include('cms.urls')), ) From 41d073da3b43d9d93a0101f1f86811befb96f32e Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 28 Mar 2018 08:53:49 +0200 Subject: [PATCH 02/11] Remove conflicting cms/ urlconf --- dynamicweb/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index 884c95b4..6d4f838a 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -56,7 +56,7 @@ urlpatterns += i18n_patterns( url( r'^blog/(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/(?P\w[-\w]*)/$', RedirectView.as_view(pattern_name='ungleich:post-detail')), - url(r'^blog/|cms/$', RedirectView.as_view( + url(r'^blog/$', RedirectView.as_view( url=reverse_lazy('ungleich:post-list')), name='blog_list_view'), url(r'^cms/', include('cms.urls')), ) From e0df641dbdefc9cb12702fb9b6b381b4601c77d1 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 3 Apr 2018 22:50:00 +0200 Subject: [PATCH 03/11] Merge master into task/4362/fix_need_of_cms_dummy_page --- Changelog | 5 ++-- .../datacenterlight/includes/_footer.html | 29 ++----------------- dynamicweb/urls.py | 21 +++++++++----- 3 files changed, 19 insertions(+), 36 deletions(-) diff --git a/Changelog b/Changelog index b2492674..899849ff 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ -Next: - * bugfix: [dcl] Fix user activation email style; add/correct some DE text +1.6.2: 2018-04-01: + * bgfix: [dcl] Fix user activation email style; add/correct some DE text + * #4373: [dcl] update footer menu for pw reset/login/signup/activation request pages 1.6.1: 2018-03-28 * bgfix: fix header slider interval issue * #4315: [cms] navbar consistency from cms page to static page diff --git a/datacenterlight/templates/datacenterlight/includes/_footer.html b/datacenterlight/templates/datacenterlight/includes/_footer.html index 8643deda..7d27eaef 100644 --- a/datacenterlight/templates/datacenterlight/includes/_footer.html +++ b/datacenterlight/templates/datacenterlight/includes/_footer.html @@ -3,37 +3,14 @@