sanghee/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'ungleich/master'

Browse source
This commit is contained in:
Arvind Tiwari 2018-04-04 18:41:14 +05:30
commit cb4391b885
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Changelog
View file

@ -1,3 +1,5 @@
next:
* #4378: [dcl cms] update CMS Integration to have different content for different domains
1.6.2: 2018-04-01: 1.6.2: 2018-04-01:
* bgfix: [dcl] Fix user activation email style; add/correct some DE text * 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 * #4373: [dcl] update footer menu for pw reset/login/signup/activation request pages

1
datacenterlight/management/commands/cmsintegrate.py
View file

@ -1,4 +1,3 @@
from django.contrib.sites.models import Site
from django.core.management.base import BaseCommand from django.core.management.base import BaseCommand
from datacenterlight.cms_models import CMSIntegration from datacenterlight.cms_models import CMSIntegration

1
datacenterlight/views.py
View file

@ -9,7 +9,6 @@ from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect, HttpResponse from django.http import HttpResponseRedirect, HttpResponse
from django.shortcuts import render from django.shortcuts import render
from django.utils.translation import get_language, ugettext_lazy as _ from django.utils.translation import get_language, ugettext_lazy as _
from django.views.decorators.cache import cache_control from django.views.decorators.cache import cache_control
from django.views.generic import FormView, CreateView, DetailView from django.views.generic import FormView, CreateView, DetailView