diff options
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | underlays/openid-selector/ikiwiki/openid/openid-jquery.js | 5 |
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', |