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

Merge remote-tracking branch 'mainRepo/master' into task/4799/show_selected_vms_only_in_calculator

Browse source
This commit is contained in:
PCoder 2018-06-24 15:14:11 +02:00
commit bf45bf1b4d
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Changelog
View file

@ -1,3 +1,6 @@
Next:
* #4847: [comic] Add google analytics code for comic.ungleich.ch
* feature: add vm_type option to vm_template and dcl calculator to distinguish between public and ipv6only templates (PR #635)
1.9: 2018-05-16 1.9: 2018-05-16
* #4559: [cms] enable discount on cms calculator * #4559: [cms] enable discount on cms calculator
1.8: 2018-05-01 1.8: 2018-05-01

1
dynamicweb/settings/base.py
View file

@ -630,6 +630,7 @@ GOOGLE_ANALYTICS_PROPERTY_IDS = {
'ipv6onlyhosting.ch': 'UA-62285904-10', 'ipv6onlyhosting.ch': 'UA-62285904-10',
'ipv6onlyhosting.net': 'UA-62285904-10', 'ipv6onlyhosting.net': 'UA-62285904-10',
'ipv6onlyhosting.com': 'UA-62285904-10', 'ipv6onlyhosting.com': 'UA-62285904-10',
'comic.ungleich.ch': 'UA-62285904-13',
'127.0.0.1:8000': 'localhost', '127.0.0.1:8000': 'localhost',
'dynamicweb-development.ungleich.ch': 'development', 'dynamicweb-development.ungleich.ch': 'development',
'dynamicweb-staging.ungleich.ch': 'staging' 'dynamicweb-staging.ungleich.ch': 'staging'