ungleich-public/dynamicweb
6
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Wiki Activity

Merge branch 'master' into task/3747/multiple_cards_support

Browse source
This commit is contained in:
PCoder 2017-10-21 12:04:15 +02:00
commit 76b3785adc
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog
View file

@ -1,3 +1,7 @@
1.2.8: 2017-10-21
* Remove ALLOWED_HOST alplora.ch
* Add ALLOWED_HOST hack4glarus.ch
* Fetch page_title and meta_description dynamically in glasfaser CMS template
1.2.7: 2017-10-20 1.2.7: 2017-10-20
* Bugfix: [dcl, hosting] Fix Stripe js error in confirm payment page * Bugfix: [dcl, hosting] Fix Stripe js error in confirm payment page
* #3847: [ungleich] change text 'hosting products' -> 'our products' * #3847: [ungleich] change text 'hosting products' -> 'our products'

2
dynamicweb/settings/prod.py
View file

@ -31,5 +31,5 @@ ALLOWED_HOSTS = [
".ipv6onlyhosting.com", ".ipv6onlyhosting.com",
".ipv6onlyhosting.net", ".ipv6onlyhosting.net",
".digitalglarus.ch", ".digitalglarus.ch",
".alplora.ch" ".hack4glarus.ch"
] ]

9
ungleich_page/templates/ungleich_page/glasfaser_cms_page.html
View file

@ -2,15 +2,14 @@
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
<!DOCTYPE html> <!DOCTYPE html>
<html lang="de"> <html lang="{{LANGUAGE_CODE}}">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content=""> <meta name="author" content="ungleich GmbH">
<meta name="author" content=""> <meta name="description" content="{% page_attribute 'meta_description' %}">
<title>ungleich GmbH</title> <title>{% page_attribute "page_title" %}</title>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'ungleich_page/css/bootstrap.min.css' %}" rel="stylesheet">