Merge branch 'release/0.5.2' into production

* release/0.5.2:
  finish release 0.5.2 docs
  define proper allauth production settings

docs/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+* :release:`0.5.2 <2015-01-18>`
+* :bug:`-` define proper allauth production settings with https and mandatory
+  email verification
+
 * :release:`0.5.1 <2015-01-18>`
 * :bug:`-` load jquery and html5 with same URL schema as the rest of the site
 

docs/conf.py

@@ -62,7 +62,7 @@ copyright = u'2014, 2015 Jan Dittberner'
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.1'
+release = '0.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

gnuviechadmin/gnuviechadmin/settings/base.py

@@ -278,6 +278,8 @@ MESSAGE_TAGS = {
 
 
 ########## ALLAUTH CONFIGURATION
+ACCOUNT_EMAIL_REQUIRED = True
+ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
 LOGIN_REDIRECT_URL = '/'
 SOCIALACCOUNT_QUERY_EMAIL = True
 ########## END ALLAUTH CONFIGURATION

gnuviechadmin/gnuviechadmin/settings/production.py

@@ -26,3 +26,8 @@ SERVER_EMAIL = get_env_variable('GVA_SITE_ADMINMAIL')
 # See: https://docs.djangoproject.com/en/dev/ref/settings/#caches
 #CACHES = {}
 ########## END CACHE CONFIGURATION
+
+########## ALLAUTH PRODUCTION CONFIGURATION
+ACCOUNT_EMAIL_SUBJECT_PREFIX = '[Jan Dittberner IT-Consulting & -Solutions] '
+ACCOUNT_DEFAULT_HTTP_PROTOCOL = 'https'
+########## END ALLAUTH PRODUCTION CONFIGURATION