Merge branch 'v2' into v2-gamechanger

# Conflicts:
#	config/settings/base.py
This commit is contained in:
2022-06-08 07:09:14 -05:00
9 changed files with 79 additions and 83 deletions

View File

@@ -272,9 +272,5 @@ SOCIALACCOUNT_FORMS = {"signup": "benchcoach.users.forms.UserSocialSignupForm"}
# Your stuff...
# ------------------------------------------------------------------------------
INSTALLED_APPS += ["teamsnap", "instagen","gamechanger"]
SOCIALACCOUNT_PROVIDERS = {
'teamsnap': {
'SCOPE': ["read", "write"]
}
}
INSTALLED_APPS += ["teamsnap", "instagen"]
SOCIALACCOUNT_PROVIDERS = {"teamsnap": {"SCOPE": ["read", "write"]}}

View File

@@ -64,7 +64,14 @@ INSTALLED_APPS += ["django_extensions"] # noqa F405
# Your stuff...
# ------------------------------------------------------------------------------
ALLOWED_HOSTS += ["localhost", "0.0.0.0", "127.0.0.1", "asc-nas.local", "10.0.1.4", "benchcoach-dev.ascorrea.com"]
ALLOWED_HOSTS += [
"localhost",
"0.0.0.0",
"127.0.0.1",
"asc-nas.local",
"10.0.1.4",
"benchcoach-dev.ascorrea.com",
]
ACCOUNT_AUTHENTICATION_METHOD = "email"
ACCOUNT_EMAIL_REQUIRED = True
ACCOUNT_USERNAME_REQUIRED = False