summaryrefslogtreecommitdiffstats
path: root/askbot/deps
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2013-03-11 08:01:56 -0600
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2013-03-11 08:01:56 -0600
commit2710304978832c9d4affa3b939d444b1088ef4c0 (patch)
treeec20d957e6c744bcab156d31767c8e5c300eb8af /askbot/deps
parent35d55fb02ffe955ab521b0c74a9c01661b311691 (diff)
parent6f5ec65e213a4b4b9ef7e7ea292090e9a809a950 (diff)
downloadaskbot-2710304978832c9d4affa3b939d444b1088ef4c0.tar.gz
askbot-2710304978832c9d4affa3b939d444b1088ef4c0.tar.bz2
askbot-2710304978832c9d4affa3b939d444b1088ef4c0.zip
Merge branch 'master' of github.com:ASKBOT/askbot-devel
Diffstat (limited to 'askbot/deps')
-rw-r--r--askbot/deps/django_authopenid/util.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/askbot/deps/django_authopenid/util.py b/askbot/deps/django_authopenid/util.py
index 75169cc9..7e78da16 100644
--- a/askbot/deps/django_authopenid/util.py
+++ b/askbot/deps/django_authopenid/util.py
@@ -493,6 +493,14 @@ def get_enabled_major_login_providers():
'icon_media_path': '/jquery-openid/images/aol.gif',
'openid_endpoint': 'http://openid.aol.com/%(username)s'
}
+ data['launchpad'] = {
+ 'name': 'launchpad',
+ 'display_name': 'LaunchPad',
+ 'type': 'openid-direct',
+ 'icon_media_path': '/jquery-openid/images/launchpad.gif',
+ 'tooltip_text': _('Sign in with LaunchPad'),
+ 'openid_endpoint': 'https://login.launchpad.net/'
+ }
data['openid'] = {
'name': 'openid',
'display_name': 'OpenID',