Add google back to openid selector. Apparently this has gotten a stay of execution...

diff --git a/debian/changelog b/debian/changelog
index 5675670a840c68c8ecc4d1504c8e17b7a0150d87..11ad07712daee58cc6cf96c404348ae1f7252245 100644 (file)
--- 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 1df419fb834bf577108d8c9880505aca03032eb3..0400ae6bbf6d0b6d24146f3b135692b79e3acc56 100644 (file)
--- 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',