diff options
Diffstat (limited to 'scipy2016')
| -rw-r--r-- | scipy2016/__init__.pyc | bin | 134 -> 157 bytes | |||
| -rwxr-xr-x | scipy2016/settings.py | 24 | ||||
| -rw-r--r-- | scipy2016/settings.pyc | bin | 4209 -> 4465 bytes | |||
| -rw-r--r-- | scipy2016/urls.pyc | bin | 1619 -> 1642 bytes | |||
| -rw-r--r-- | scipy2016/wsgi.pyc | bin | 930 -> 953 bytes |
5 files changed, 10 insertions, 14 deletions
diff --git a/scipy2016/__init__.pyc b/scipy2016/__init__.pyc Binary files differindex 9584aa2..646985b 100644 --- a/scipy2016/__init__.pyc +++ b/scipy2016/__init__.pyc diff --git a/scipy2016/settings.py b/scipy2016/settings.py index fa8430a..a8314a1 100755 --- a/scipy2016/settings.py +++ b/scipy2016/settings.py @@ -61,6 +61,8 @@ TEMPLATE_CONTEXT_PROCESSORS = ( 'django.contrib.messages.context_processors.messages', 'social.apps.django_app.context_processors.backends', 'social.apps.django_app.context_processors.login_redirect', + # 'website.context_processors.contact_us_context_processor' + ) AUTHENTICATION_BACKENDS = ( @@ -102,14 +104,16 @@ DATABASES = { } } -# SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY -# SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET +LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = '628178553368-dvc6sjtgp90cm0591b8p4da62rhttn35.apps.googleusercontent.com' +LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = 'eoiek3jLz9Ax3dv7k3mXFrbU' +# API key AIzaSyDxRqGfJNJJIFw6traKTG5nC1mY8TNODu4 + -# SOCIAL_AUTH_FACEBOOK_KEY = LOCAL_SOCIAL_AUTH_FB_KEY -# SOCIAL_AUTH_FACEBOOK_SECRET = LOCAL_SOCIAL_AUTH_FB_SECRET +LOCAL_SOCIAL_AUTH_FB_KEY = '160224867760606' +LOCAL_SOCIAL_AUTH_FB_SECRET = '45eb71682352723c44d79471ecab5894' -# SOCIAL_AUTH_GITHUB_KEY = LOCAL_SOCIAL_AUTH_GITHUB_KEY -# SOCIAL_AUTH_GITHUB_SECRET = LOCAL_SOCIAL_AUTH_GITHUB_SECRET +LOCAL_SOCIAL_AUTH_GITHUB_KEY = '0bcac418003a6d06fb50' +LOCAL_SOCIAL_AUTH_GITHUB_SECRET = 'cd1b070917d0a5c8cd27ef997fd353a4' # Internationalization # https://docs.djangoproject.com/en/1.6/topics/i18n/ @@ -136,11 +140,3 @@ MEDIA_URL = "/downloads/" LOGIN_REDIRECT_URL = '/cfp' # smtp - -ACCOUNT_ACTIVATION_DAYS = 7 -EMAIL_HOST = 'localhost' -EMAIL_PORT = 1025 -EMAIL_HOST_USER = '' -EMAIL_HOST_PASSWORD = '' -EMAIL_USE_TLS = False -DEFAULT_FROM_EMAIL = 'komal@gmail.com' diff --git a/scipy2016/settings.pyc b/scipy2016/settings.pyc Binary files differindex 304a8ed..a5ef033 100644 --- a/scipy2016/settings.pyc +++ b/scipy2016/settings.pyc diff --git a/scipy2016/urls.pyc b/scipy2016/urls.pyc Binary files differindex d797f72..6daec6d 100644 --- a/scipy2016/urls.pyc +++ b/scipy2016/urls.pyc diff --git a/scipy2016/wsgi.pyc b/scipy2016/wsgi.pyc Binary files differindex ae7c175..798bf1f 100644 --- a/scipy2016/wsgi.pyc +++ b/scipy2016/wsgi.pyc |