Merge branch 'release/0.5.2' into production
* release/0.5.2: finish release 0.5.2 docs define proper allauth production settings
This commit is contained in:
commit
4fcfdd2670
4 changed files with 12 additions and 1 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue