Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 6 Nov 2014 19:02:32 +0000 (15:02 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 6 Nov 2014 19:02:32 +0000 (15:02 -0400)
IkiWiki/Plugin/openid.pm
debian/changelog

index 384af7e98965d520f58bd21ee87ccaceaa16ba48..107c6adcbb1e58e07d4e2a76a0845c14fb45fd5b 100644 (file)
@@ -104,7 +104,6 @@ sub formbuilder_setup (@) {
                        size => 1, force => 1,
                        fieldset => "login",
                        comment => $session->param("name"));
-               $form->field(name => "email", type => "hidden");
        }
 }
 
index a698be8e406d68e3a68e1bb6f971efddfb67d571..727a8047a725a34d7cf2ebd81f66d89dc907f10c 100644 (file)
@@ -3,6 +3,7 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium
   * Added ikiwiki-comment program.
   * Add missing build-depends on libcgi-formbuilder-perl, needed for
     t/relativity.t
+  * openid: Stop suppressing the email field on the Preferences page.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400