From fe3fcb5100f571965f55f1acebadffa2dfe6cc4e Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Tue, 3 Apr 2018 22:51:04 +0530 Subject: [PATCH 1/3] flake8 fix --- datacenterlight/management/commands/cmsintegrate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/datacenterlight/management/commands/cmsintegrate.py b/datacenterlight/management/commands/cmsintegrate.py index 66691649..206248d2 100644 --- a/datacenterlight/management/commands/cmsintegrate.py +++ b/datacenterlight/management/commands/cmsintegrate.py @@ -1,4 +1,3 @@ -from django.contrib.sites.models import Site from django.core.management.base import BaseCommand from datacenterlight.cms_models import CMSIntegration From ae2dea993decaddc45427a51658fa6c3d25eee28 Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 4 Apr 2018 02:27:30 +0530 Subject: [PATCH 2/3] remove whitespace --- datacenterlight/views.py | 1 - 1 file changed, 1 deletion(-) diff --git a/datacenterlight/views.py b/datacenterlight/views.py index 371098ab..af3b774c 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect, HttpResponse from django.shortcuts import render - from django.utils.translation import get_language, ugettext_lazy as _ from django.views.decorators.cache import cache_control from django.views.generic import FormView, CreateView, DetailView From c5dba114df147152bc055bac122fdcbe734c610b Mon Sep 17 00:00:00 2001 From: Arvind Tiwari Date: Wed, 4 Apr 2018 18:26:19 +0530 Subject: [PATCH 3/3] update changelog --- Changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index 899849ff..de1c0d8a 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +next: + * #4378: [dcl cms] update CMS Integration to have different content for different domains 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 @@ -70,7 +72,7 @@ * [cms] Introduce UngleichHeaderBackgroundImageAndTextSliderPlugin that allows to have scrolling images and texts * [cms] Remove

tag for ungleich cms customer item template 1.2.12: 2017-12-09 - * #3594: [digitalglarus] Remove white scroll bar on the right in mobile + * #3594: [digitalglarus] Remove white scroll bar on the right in mobile * #3905: [ungleich] Update ungleich.ch header into a slider * #3968: [ungleich] Fix navbar logo alignment * [all] Enable logging custom modules