Permalink
Browse files

merge mobile development branch into master in preparation for suppor…

…ting user logins on deployment server
  • Loading branch information...
1 parent 7579996 commit 4a544f8cc958169930fda3a29b0d6401f9f8e34e @visiblegovernment committed Oct 12, 2011
Showing with 7 additions and 1 deletion.
  1. +7 −1 settings.py
View
@@ -113,7 +113,7 @@
# 'social_auth.backends.yahoo.YahooBackend',
# 'social_auth.backends.OpenIDBackend',
'django.contrib.auth.backends.ModelBackend',
- 'mainapp.tests.testsocial_auth.dummy_socialauth.DummyBackend',
+# 'mainapp.tests.testsocial_auth.dummy_socialauth.DummyBackend',
)
SOCIAL_AUTH_USER_MODEL = 'mainapp.FMSUser'
@@ -152,6 +152,12 @@
#
#ADMIN_EMAIL =
#ADMINS =
+#
+# ----- social_auth consumer id's ----- #
+#TWITTER_CONSUMER_KEY = ''
+#TWITTER_CONSUMER_SECRET = ''
+#FACEBOOK_APP_ID = ''
+#FACEBOOK_API_SECRET = ''
#####################################################################################
# import local settings overriding the defaults

0 comments on commit 4a544f8

Please sign in to comment.