diff options
Diffstat (limited to 'scipy2016')
| -rwxr-xr-x | scipy2016/settings.py | 8 | ||||
| -rwxr-xr-x | scipy2016/urls.py | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scipy2016/settings.py b/scipy2016/settings.py index 7b43ace..721d775 100755 --- a/scipy2016/settings.py +++ b/scipy2016/settings.py @@ -108,13 +108,13 @@ DATABASES = { } } -LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = GOOGLE_KEY -LOCAL_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = GOOGLE_SECRET +SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = GOOGLE_KEY +SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = GOOGLE_SECRET # API key AIzaSyDxRqGfJNJJIFw6traKTG5nC1mY8TNODu4 -LOCAL_SOCIAL_AUTH_FB_KEY = FACEBOOK_KEY -LOCAL_SOCIAL_AUTH_FB_SECRET = FACEBOOK_SECRET +SOCIAL_AUTH_FB_KEY = FACEBOOK_KEY +SOCIAL_AUTH_FB_SECRET = FACEBOOK_SECRET LOCAL_SOCIAL_AUTH_GITHUB_KEY = GITHUB_KEY diff --git a/scipy2016/urls.py b/scipy2016/urls.py index 86f5cf2..e1259cf 100755 --- a/scipy2016/urls.py +++ b/scipy2016/urls.py @@ -10,6 +10,7 @@ urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), url(r'^', include('website.urls', namespace='website')), + url(r'^2016/', include('website.urls', namespace='website')), url(r'^', include('social.apps.django_app.urls', namespace='social')), url(r'^', include('django.contrib.auth.urls', namespace='auth')), |