cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-02-03 13:14:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolved merge conflict

Browse Source
This commit is contained in:
Jannis Gebauer 2016-02-18 21:44:08 +01:00
commit 1d6edb6f2b
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS.rst
View File

@ -63,6 +63,7 @@ Listed in alphabetical order.
Daniele Tricoli `@eriol`_ Daniele Tricoli `@eriol`_
David Díaz `@ddiazpinto`_ @DavidDiazPinto David Díaz `@ddiazpinto`_ @DavidDiazPinto
Davur Clementsen `@dsclementsen`_ @davur Davur Clementsen `@dsclementsen`_ @davur
Eraldo Energy `@eraldo`_
Eyad Al Sibai `@eyadsibai`_ Eyad Al Sibai `@eyadsibai`_
Felipe Arruda `@arruda`_ Felipe Arruda `@arruda`_
Garry Cairns `@garry-cairns`_ Garry Cairns `@garry-cairns`_
@ -106,6 +107,7 @@ Listed in alphabetical order.
.. _@ad-m: https://github.com/ad-m .. _@ad-m: https://github.com/ad-m
.. _@alb3rto: https://github.com/alb3rto .. _@alb3rto: https://github.com/alb3rto
.. _@caffodian: https://github.com/caffodian .. _@caffodian: https://github.com/caffodian
.. _@eraldo: https://github.com/eraldo
.. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza .. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
.. _@amjith: https://github.com/amjith .. _@amjith: https://github.com/amjith
.. _@zcho: https://github.com/zcho .. _@zcho: https://github.com/zcho

5
{{cookiecutter.repo_name}}/config/settings/common.py
View File

@ -211,9 +211,10 @@ AUTHENTICATION_BACKENDS = (
ACCOUNT_AUTHENTICATION_METHOD = 'username' ACCOUNT_AUTHENTICATION_METHOD = 'username'
ACCOUNT_EMAIL_REQUIRED = True ACCOUNT_EMAIL_REQUIRED = True
ACCOUNT_EMAIL_VERIFICATION = 'mandatory' ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
ACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapter.AccountAdapter'
SOCIALACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapter.SocialAccountAdapter'
ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True) ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True)
ACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapters.AccountAdapter'
SOCIALACCOUNT_ADAPTER = '{{cookiecutter.repo_name}}.users.adapters.SocialAccountAdapter'
# Custom user app defaults # Custom user app defaults
# Select the correct user model # Select the correct user model

0
{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/adapter.py → {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/users/adapters.py
View File