aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-07-03 16:21:47 -0400
committerJoey Hess <joey@kitenet.net>2014-07-03 16:21:47 -0400
commit6660fd643bf3b65745d62b24cb16fef1b5205207 (patch)
tree939ef584d310b3ddb1787453ad304aab23032608
parent1e2e6eeb2b4dbf908368ba08639878814015cdfc (diff)
downloadikiwiki-6660fd643bf3b65745d62b24cb16fef1b5205207.tar
ikiwiki-6660fd643bf3b65745d62b24cb16fef1b5205207.tar.gz
Add google back to openid selector. Apparently this has gotten a stay of execution until April 2015. (It may continue to work until 2017.)
-rw-r--r--debian/changelog7
-rw-r--r--underlays/openid-selector/ikiwiki/openid/openid-jquery.js5
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 5675670a8..11ad07712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ikiwiki (3.20140614) UNRELEASED; urgency=medium
+
+ * Add google back to openid selector. Apparently this has gotten a stay
+ of execution until April 2015. (It may continue to work until 2017.)
+
+ -- Joey Hess <joeyh@debian.org> Thu, 03 Jul 2014 16:19:40 -0400
+
ikiwiki (3.20140613) unstable; urgency=medium
* only_committed_changes could fail in a git repository merged
diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 1df419fb8..0400ae6bb 100644
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
@@ -6,6 +6,11 @@ This code is licenced under the New BSD License.
*/
var providers_large = {
+ google: {
+ name: 'Google',
+ icon: 'ikiwiki/openid/goa-account-google.png',
+ url: 'https://www.google.com/accounts/o8/id'
+ },
verisign: {
name: 'Verisign',
icon: 'ikiwiki/openid/verisign.png',