Merge branch 'master' into task/4379/price_without_vat

This commit is contained in:
PCoder 2018-04-06 00:53:29 +02:00
commit 7fe5c3f88c
2 changed files with 4 additions and 3 deletions

View file

@ -9,6 +9,7 @@ env:
install: "pip install -r requirements.txt" install: "pip install -r requirements.txt"
script: script:
- flake8 - flake8
- python manage.py compilemessages
- python manage.py test -v 3 - python manage.py test -v 3
# - coverage run --source='.' manage.py test dynamicweb -v 3 # - coverage run --source='.' manage.py test dynamicweb -v 3
# - coverage report # - coverage report

View file

@ -1,7 +1,7 @@
next: 1.6.3: 2018-04-05
* bgfix: [cms] header btn external link fix * #4377: [cms] header btn external link fix
* #4378: [dcl cms] update CMS Integration to have different content for different domains * #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.6.1: 2018-03-28 1.6.1: 2018-03-28