Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge branch 'master' into roster_refactor

Browse Source
This commit is contained in:
JC Brand 2015-04-25 23:37:12 +02:00
commit 3df0c95714
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/CHANGES.rst
View File

@ -6,6 +6,7 @@ Changelog
* Add the ability to log in anonymously. [jcbrand] * Add the ability to log in anonymously. [jcbrand]
* Add the ability to log in automatically. [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] * #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] * #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] * #372 Some offline users have a visible empty <dd> in the roster. [floriancargoet]

2
src/templates/login_panel.html
View File

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