JonathanWilliamson/bconla
0
0
Fork 1
forked from infrastructure/conference-website
Code Issues Pull Requests Activity

Adding placeholder text in the presentation proposal form #1

Closed
Jason van Gumster wants to merge 16 commits from (deleted):proposal_placeholders into staging
pull from: (deleted):proposal_placeholders
merge into: JonathanWilliamson:staging

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 16 Files Changed 5 +11
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5046f5d002 - Show all commits

11
conference/settings.py
View File

@ -40,6 +40,17 @@ BLENDER_ID = {
'OAUTH_SECRET': os.environ.get('OAUTH_SECRET'), 'OAUTH_SECRET': os.environ.get('OAUTH_SECRET'),
} }
# Email config
DEFAULT_FROM_EMAIL = 'bconla@autotroph.com'
DEFAULT_REPLY_TO_EMAIL = 'bconla@autotroph.com'
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
EMAIL_HOST = 'smtp.mailgun.org'
EMAIL_PORT = '587'
EMAIL_HOST_USER = os.environ.get('EMAIL_HOST_USER')
EMAIL_HOST_PASSWORD = os.environ.get('EMAIL_HOST_PASSWORD')
# Payments config
ACTIVE_PAYMENT_BACKEND = 'stripe' # or 'stripe'
db_from_env = dj_database_url.config(conn_max_age=600) db_from_env = dj_database_url.config(conn_max_age=600)
DATABASES['default'].update(db_from_env) DATABASES['default'].update(db_from_env)