Merge branch 'master' into 'master'

Task #6038: Change datacenterlight.ch message form to send email to support@ungleich.ch See merge request ungleich-public/dynamicweb!679
Change datacenterlight.ch message form to send email to support@ungleich.ch
2018-11-11 18:49:55 +01:00 · 2018-11-11 17:01:19 +01:00 · 2018-10-22 23:25:05 +02:00 · 2018-10-22 23:13:00 +02:00 · 2018-10-22 22:39:22 +02:00 · 2018-10-18 09:21:16 +02:00
3 changed files with 6 additions and 3 deletions
--- a/4
+++ b/4
@ -1,3 +1,7 @@
+Next:
+    * bugfix: Use correct version of django-multisite (MR #676)
+2.4.1: 2018-10-18
+    * bugfix: Update pycryptodome module from 3.4 to 3.6.6 (PR #674)
 2.4: 2018-10-18
    * #5681: [hosting,dcl] Allow admin to lower minimum RAM to 512 MB (PR #672)
 2.3.1: 2018-10-17
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@ -64,7 +64,7 @@ class ContactUsView(FormView):
                sender=form.cleaned_data.get('email')
            ),
            'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
-            'to': [from_emails.get(from_page, 'info@ungleich.ch')],
+            'to': [from_emails.get(from_page, 'support@ungleich.ch')],
            'body': "\n".join(
                ["%s=%s" % (k, v) for (k, v) in form.cleaned_data.items()]),
            'reply_to': [form.cleaned_data.get('email')],
--- a/requirements.txt
+++ b/requirements.txt
@ -34,7 +34,6 @@ django-meta==1.2
 django-meta-mixin==0.3.0
 django-model-utils==2.5
 django-mptt==0.8.4
-django-multisite==1.4.1
 django-parler==1.6.3
 django-phonenumber-field==1.1.0
 django-polymorphic==0.9.2
@ -69,7 +68,7 @@ model-mommy==1.2.6
 phonenumbers==7.4.0
 phonenumberslite==7.4.0
 psycopg2==2.7.3.2
-pycryptodome==3.4
+pycryptodome==3.6.6
 pylibmc==1.5.1
 python-dateutil==2.5.3
 python-slugify==1.2.0
Author	SHA1	Message	Date
nico14571	66538f7335	Merge branch 'master' into 'master' Task #6038: Change datacenterlight.ch message form to send email to support@ungleich.ch See merge request ungleich-public/dynamicweb!679	2018-11-11 18:49:55 +01:00
aatish	1bfb710ee6	Change datacenterlight.ch message form to send email to support@ungleich.ch	2018-11-11 17:01:19 +01:00
PCoder	2c674572c9	Update Changelog	2018-10-22 23:25:05 +02:00
pcoder116	b1a4ba6f0e	Merge branch 'bugfix/use-correct-django-multisite-version' into 'master' Use correct django-multisite version See merge request ungleich-public/dynamicweb!676	2018-10-22 23:13:00 +02:00
PCoder	e9cb303b09	Use correct django-multisite version We had multiple versions of django-multisite in the requirements.txt. This commit removes the wrong version that caused server not to start with an error File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in get_current 65. return self._get_site_by_id(site_id) File "/usr/local/lib/python3.5/site-packages/django/contrib/sites/models.py" in _get_site_by_id 37. return SITE_CACHE[site_id] File "/usr/local/lib/python3.5/site-packages/multisite/hacks.py" in __getitem__ 124. raise KeyError(key)	2018-10-22 22:39:22 +02:00
PCoder	bdf9f53648	Update Changelog for 2.4.1	2018-10-18 09:21:16 +02:00
Pcoder	8d6f2ed4ae	Merge pull request #674 from pcoder/bugfix/update-pycryptodome Update pycryptodome	2018-10-18 09:15:14 +02:00
PCoder	062e81408d	Update pycryptodome From 3.4 to 3.6.6	2018-10-18 09:03:08 +02:00