Merge branch 'master' into roster_refactor

docs/CHANGES.rst

@@ -6,6 +6,7 @@ Changelog
 
 * Add the ability to log in anonymously. [jcbrand]
 * Add the ability to log in automatically. [jcbrand]
+* Remove ``type=email`` from JID field in login form. Resulting validation error confuses people. [jcbrand]
 * #344 Enable the path to the sound files to be configured [thierrytiti and jcbrand]
 * #370 Unable to register a new user to ejabberd 2.1.11. [gbonvehi]
 * #372 Some offline users have a visible empty <dd> in the roster. [floriancargoet]

src/templates/login_panel.html

@@ -5,7 +5,7 @@
     {[ if (!auto_login) { ]}
         {[ if (authentication == LOGIN) { ]}
             <label>{{label_username}}</label>
-            <input type="email" name="jid" placeholder="user@server">
+            <input name="jid" placeholder="user@server">
             <label>{{label_password}}</label>
             <input type="password" name="password" placeholder="password">
             <input class="submit" type="submit" value="{{label_login}}">