Merge master into 5151/gdpr_modal

hosting/migrations/0047_auto_20180821_1240.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2018-08-21 12:40
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hosting', '0046_usercarddetail'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='hostingorder',
+            name='cc_brand',
+            field=models.CharField(max_length=128),
+        ),
+        migrations.AlterField(
+            model_name='usercarddetail',
+            name='brand',
+            field=models.CharField(max_length=128),
+        ),
+    ]

hosting/models.py

@@ -69,7 +69,7 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     approved = models.BooleanField(default=False)
     last4 = models.CharField(max_length=4)
-    cc_brand = models.CharField(max_length=10)
+    cc_brand = models.CharField(max_length=128)
     stripe_charge_id = models.CharField(max_length=100, null=True)
     price = models.FloatField()
     subscription_id = models.CharField(max_length=100, null=True)
@@ -212,7 +212,7 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
     permissions = ('view_usercarddetail',)
     stripe_customer = models.ForeignKey(StripeCustomer)
     last4 = models.CharField(max_length=4)
-    brand = models.CharField(max_length=10)
+    brand = models.CharField(max_length=128)
     card_id = models.CharField(max_length=100, blank=True, default='')
     fingerprint = models.CharField(max_length=100)
     exp_month = models.IntegerField(null=False)

hosting/templates/hosting/base.html

@@ -9,7 +9,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="description" content="">
-    <meta name="author" content="">
+    <meta name="author" content="ungleich glarus ag">
 
     <title>{{ domain }} - {{ hosting }} hosting as easy as possible</title>