From ecdfd29604281357d06f4f61cf710bbfdd514936 Mon Sep 17 00:00:00 2001
From: Ben Adida <ben@adida.net>
Date: Thu, 5 Aug 2010 17:26:55 -0700
Subject: [PATCH] status updates

---
 auth               |  2 +-
 helios             |  2 +-
 settings.py.sample | 12 ++++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/auth b/auth
index 1b4293e..0f6107e 160000
--- a/auth
+++ b/auth
@@ -1 +1 @@
-Subproject commit 1b4293e0b1476dab0214c2da1075aba0fd836bc2
+Subproject commit 0f6107eadd2033e35a5aa62e94838a2090b71f06
diff --git a/helios b/helios
index 8653d35..ab6991d 160000
--- a/helios
+++ b/helios
@@ -1 +1 @@
-Subproject commit 8653d35324dcd97ffec612f99854b3ce82ff7551
+Subproject commit ab6991d1c220c9200266af7cf16af8f9163eff30
diff --git a/settings.py.sample b/settings.py.sample
index 42fc18e..b145fc6 100644
--- a/settings.py.sample
+++ b/settings.py.sample
@@ -121,10 +121,18 @@ HELIOS_ADMIN = None
 HELIOS_VOTERS_UPLOAD = True
 HELIOS_VOTERS_EMAIL = True
 
-# authentication limited to passwords
-AUTH_ENABLED_AUTH_SYSTEMS = ['password','facebook','twitter']
+# authentication systems enabled
+AUTH_ENABLED_AUTH_SYSTEMS = ['password','facebook','twitter', 'google', 'yahoo']
 AUTH_DEFAULT_AUTH_SYSTEM = None
 
+# facebook
+FACEBOOK_API_KEY = ''
+FACEBOOK_API_SECRET = ''
+
+# twitter
+TWITTER_API_KEY = ''
+TWITTER_API_SECRET = ''
+
 # email server
 EMAIL_HOST = 'localhost'
 EMAIL_PORT = 1025
-- 
GitLab