Commit 10da240e authored by JC Brand's avatar JC Brand

New release 2.0.0

parent 713922a9
{ {
"name": "converse.js", "name": "converse.js",
"description": "Web-based XMPP/Jabber chat client written in javascript", "description": "Web-based XMPP/Jabber chat client written in javascript",
"version": "1.0.6", "version": "2.0.0",
"license": "MPL-2.0", "license": "MPL-2.0",
"devDependencies": { "devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x", "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -546,16 +546,20 @@ __p += '\n <span class="spinner login-submit"/>\n '; ...@@ -546,16 +546,20 @@ __p += '\n <span class="spinner login-submit"/>\n ';
__p += '\n '; __p += '\n ';
if (!auto_login) { ; if (!auto_login) { ;
__p += '\n '; __p += '\n ';
if (authentication == LOGIN) { ; if (authentication == LOGIN || authentication == EXTERNAL) { ;
__p += '\n <label>' + __p += '\n <label>' +
((__t = (label_username)) == null ? '' : __t) + ((__t = (label_username)) == null ? '' : __t) +
'</label>\n <input type="text" name="jid" placeholder="' + '</label>\n <input type="text" name="jid" placeholder="' +
((__t = (placeholder_username)) == null ? '' : __t) + ((__t = (placeholder_username)) == null ? '' : __t) +
'">\n <label>' + '">\n ';
if (authentication !== EXTERNAL) { ;
__p += '\n <label>' +
((__t = (label_password)) == null ? '' : __t) + ((__t = (label_password)) == null ? '' : __t) +
'</label>\n <input type="password" name="password" placeholder="' + '</label>\n <input type="password" name="password" placeholder="' +
((__t = (placeholder_password)) == null ? '' : __t) + ((__t = (placeholder_password)) == null ? '' : __t) +
'">\n <input class="pure-button button-primary" type="submit" value="' + '">\n ';
} ;
__p += '\n <input class="pure-button button-primary" type="submit" value="' +
((__t = (label_login)) == null ? '' : __t) + ((__t = (label_login)) == null ? '' : __t) +
'">\n <span class="conn-feedback"></span>\n '; '">\n <span class="conn-feedback"></span>\n ';
} ; } ;
...@@ -988,10 +992,10 @@ __p += ' selected="selected" '; ...@@ -988,10 +992,10 @@ __p += ' selected="selected" ';
__p += '\n value="online">' + __p += '\n value="online">' +
((__t = (label_online)) == null ? '' : __t) + ((__t = (label_online)) == null ? '' : __t) +
'</option>\n <option '; '</option>\n <option ';
if (chat_state === 'chatty') { ; if (chat_state === 'chat') { ;
__p += ' selected="selected" '; __p += ' selected="selected" ';
} ; } ;
__p += '\n value="chatty">' + __p += '\n value="chat">' +
((__t = (label_chatty)) == null ? '' : __t) + ((__t = (label_chatty)) == null ? '' : __t) +
'</option>\n <option '; '</option>\n <option ';
if (chat_state === 'dnd') { ; if (chat_state === 'dnd') { ;
......
# Changelog # Changelog
## 2.0.0 (Unreleased) ## 2.0.0 (2016-09-16)
- Backwards incompatible change: the `_super` attribute in plugins is now named `__super__`. [jcbrand] - Backwards incompatible change: the `_super` attribute in plugins is now named `__super__`. [jcbrand]
- Continuously attempt to resurrect dead connections when `auto_reconnect` is `true`. [jcbrand] - Continuously attempt to resurrect dead connections when `auto_reconnect` is `true`. [jcbrand]
- Update the 'rooms' API to allow user to pass in room attributes. [jcbrand] - Update the 'rooms' API to allow user to pass in room attributes. [jcbrand]
......
...@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand' ...@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '1.0.6' version = '2.0.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '1.0.6' release = '2.0.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -35,7 +35,7 @@ authentication ...@@ -35,7 +35,7 @@ authentication
-------------- --------------
* Default: ``login`` * Default: ``login``
* Allowed values: `login`_, `anonymous`_, `prebind`_ * Allowed values: `login`_, `external`, `anonymous`_, `prebind`_
This option states the way converse.js will authenticate. This option states the way converse.js will authenticate.
...@@ -46,6 +46,16 @@ The default means is ``login``, which means that the user either logs in manuall ...@@ -46,6 +46,16 @@ The default means is ``login``, which means that the user either logs in manuall
username and password, or automatically if used together with ``auto_login=true`` username and password, or automatically if used together with ``auto_login=true``
and ``jid`` and ``password`` values. See `auto_login`_. and ``jid`` and ``password`` values. See `auto_login`_.
external
~~~~~~~~
This setting will still show a login form and submit button, but the form will
only contain an input for the user's JID, *not* for the password.
That's because this setting is intended to be used when you are using
SASL-EXTERNAL as authentication mechanism, in which case a password is usually
not required.
anonymous anonymous
~~~~~~~~~ ~~~~~~~~~
......
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
null, null,
"ek" "ek"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"tik tans" "tik tans"
...@@ -206,13 +210,21 @@ ...@@ -206,13 +210,21 @@
null, null,
"Klik om hierdie kontakte te verskuil" "Klik om hierdie kontakte te verskuil"
], ],
"Attempting to reconnect": [ "Reconnecting": [
null,
"Herkonnekteer"
],
"The connection has dropped, attempting to reconnect.": [
null, null,
"" ""
], ],
"Error": [ "Disconnected": [
null, null,
"Fout" "Ontkoppel"
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -594,10 +606,6 @@ ...@@ -594,10 +606,6 @@
null, null,
"wil jou kontak wees" "wil jou kontak wees"
], ],
"An error has occured": [
null,
"'n Fout het voorgekom"
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Herstel versleutelde sessie" "Herstel versleutelde sessie"
......
This diff is collapsed.
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
null, null,
"jo" "jo"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"està escrivint" "està escrivint"
...@@ -203,9 +207,17 @@ ...@@ -203,9 +207,17 @@
null, null,
"Feu clic per amagar aquests contactes" "Feu clic per amagar aquests contactes"
], ],
"Error": [ "The connection has dropped, attempting to reconnect.": [
null, null,
"Error" ""
],
"Disconnected": [
null,
""
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -567,10 +579,6 @@ ...@@ -567,10 +579,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"S'està tornant a establir la sessió xifrada" "S'està tornant a establir la sessió xifrada"
......
This diff is collapsed.
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"Ich" "Ich"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"tippt" "tippt"
...@@ -187,13 +191,21 @@ ...@@ -187,13 +191,21 @@
null, null,
"Hier klicken um diese Kontakte zu verstecken" "Hier klicken um diese Kontakte zu verstecken"
], ],
"Attempting to reconnect": [ "Reconnecting": [
null,
"Verbindung wiederherstellen …"
],
"The connection has dropped, attempting to reconnect.": [
null,
""
],
"Disconnected": [
null, null,
"" ""
], ],
"Error": [ "The connection to the chat server has dropped": [
null, null,
"Fehler" ""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -555,10 +567,6 @@ ...@@ -555,10 +567,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Verschlüsselte Sitzung wiederherstellen" "Verschlüsselte Sitzung wiederherstellen"
......
This diff is collapsed.
...@@ -19,6 +19,10 @@ ...@@ -19,6 +19,10 @@
null, null,
"" ""
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"" ""
...@@ -203,11 +207,23 @@ ...@@ -203,11 +207,23 @@
null, null,
"" ""
], ],
"Attempting to reconnect": [ "Reconnecting": [
null,
""
],
"The connection has dropped, attempting to reconnect.": [
null,
""
],
"Disconnected": [
null, null,
"" ""
], ],
"Error": [ "The connection to the chat server has dropped": [
null,
""
],
"Connection error": [
null, null,
"" ""
], ],
...@@ -215,6 +231,10 @@ ...@@ -215,6 +231,10 @@
null, null,
"" ""
], ],
"Authentication failed.": [
null,
""
],
"Authentication Failed": [ "Authentication Failed": [
null, null,
"" ""
...@@ -595,10 +615,6 @@ ...@@ -595,10 +615,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"" ""
......
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"yo" "yo"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"" ""
...@@ -163,13 +167,21 @@ ...@@ -163,13 +167,21 @@
null, null,
"Chat" "Chat"
], ],
"Attempting to reconnect": [ "Reconnecting": [
null,
"Reconectando"
],
"The connection has dropped, attempting to reconnect.": [
null, null,
"" ""
], ],
"Error": [ "Disconnected": [
null,
"Desconectado"
],
"The connection to the chat server has dropped": [
null, null,
"Error" ""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -507,10 +519,6 @@ ...@@ -507,10 +519,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Re-estableciendo sesión cifrada" "Re-estableciendo sesión cifrada"
......
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"moi" "moi"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"écrit" "écrit"
...@@ -191,13 +195,21 @@ ...@@ -191,13 +195,21 @@
null, null,
"Cliquez pour cacher ces contacts" "Cliquez pour cacher ces contacts"
], ],
"Attempting to reconnect": [ "Reconnecting": [
null,
"Reconnexion"
],
"The connection has dropped, attempting to reconnect.": [
null, null,
"" ""
], ],
"Error": [ "Disconnected": [
null,
"Déconnecté"
],
"The connection to the chat server has dropped": [
null, null,
"Erreur" ""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -559,10 +571,6 @@ ...@@ -559,10 +571,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Rétablissement de la session encryptée" "Rétablissement de la session encryptée"
......
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"אני" "אני"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"מקליד(ה) כעת" "מקליד(ה) כעת"
...@@ -195,9 +199,21 @@ ...@@ -195,9 +199,21 @@
null, null,
"לחץ כדי להסתיר את אנשי קשר אלה" "לחץ כדי להסתיר את אנשי קשר אלה"
], ],
"Error": [ "Reconnecting": [
null,
"כעת מתחבר"
],
"The connection has dropped, attempting to reconnect.": [
null, null,
"שגיאה" ""
],
"Disconnected": [
null,
"מנותק"
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -559,10 +575,6 @@ ...@@ -559,10 +575,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"בסס מחדש ישיבה מוצפנת" "בסס מחדש ישיבה מוצפנת"
......
This diff is collapsed.
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
null, null,
"Én" "Én"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"gépel..." "gépel..."
...@@ -202,9 +206,21 @@ ...@@ -202,9 +206,21 @@
null, null,
"A csevegő partnerek elrejtése" "A csevegő partnerek elrejtése"
], ],
"Error": [ "Reconnecting": [
null,
"Kapcsolódás"
],
"The connection has dropped, attempting to reconnect.": [
null, null,
"Hiba" ""
],
"Disconnected": [
null,
"Szétkapcsolva"
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -570,10 +586,6 @@ ...@@ -570,10 +586,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Titkosított kapcsolat újraépítése" "Titkosított kapcsolat újraépítése"
......
This diff is collapsed.
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
null, null,
"saya" "saya"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"" ""
...@@ -162,13 +166,17 @@ ...@@ -162,13 +166,17 @@
null, null,
"" ""
], ],
"Attempting to reconnect": [ "The connection has dropped, attempting to reconnect.": [
null, null,
"" ""
], ],
"Error": [ "Disconnected": [
null, null,
"Kesalahan" "Terputus"
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -498,10 +506,6 @@ ...@@ -498,10 +506,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Menyambung kembali sesi terenkripsi" "Menyambung kembali sesi terenkripsi"
......
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"me" "me"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"sta scrivendo" "sta scrivendo"
...@@ -199,9 +203,17 @@ ...@@ -199,9 +203,17 @@
null, null,
"Clicca per nascondere questi contatti" "Clicca per nascondere questi contatti"
], ],
"Error": [ "The connection has dropped, attempting to reconnect.": [
null,
""
],
"Disconnected": [
null, null,
"Errore" "Disconnesso"
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -567,10 +579,6 @@ ...@@ -567,10 +579,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"" ""
......
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"私" "私"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"" ""
...@@ -163,13 +167,17 @@ ...@@ -163,13 +167,17 @@
null, null,
"" ""
], ],
"Attempting to reconnect": [ "The connection has dropped, attempting to reconnect.": [
null, null,
"" ""
], ],
"Error": [ "Disconnected": [
null, null,
"エラー" "切断中"
],
"The connection to the chat server has dropped": [
null,
""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -499,10 +507,6 @@ ...@@ -499,10 +507,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"暗号化セッションの再接続" "暗号化セッションの再接続"
......
This diff is collapsed.
...@@ -15,6 +15,10 @@ ...@@ -15,6 +15,10 @@
null, null,
"meg" "meg"
], ],
"A very large message has been received.This might be due to an attack meant to degrade the chat performance.Output has been shortened.": [
null,
""
],
"is typing": [ "is typing": [
null, null,
"skriver" "skriver"
...@@ -175,13 +179,21 @@ ...@@ -175,13 +179,21 @@
null, null,
"Klikk for å skjule disse kontaktene" "Klikk for å skjule disse kontaktene"
], ],
"Attempting to reconnect": [ "Reconnecting": [
null,
"Kobler til igjen"
],
"The connection has dropped, attempting to reconnect.": [
null,
""
],
"Disconnected": [
null, null,
"" ""
], ],
"Error": [ "The connection to the chat server has dropped": [
null, null,
"Feil" ""
], ],
"Authenticating": [ "Authenticating": [
null, null,
...@@ -535,10 +547,6 @@ ...@@ -535,10 +547,6 @@
null, null,
"" ""
], ],
"An error has occured": [
null,
""
],
"Re-establishing encrypted session": [ "Re-establishing encrypted session": [
null, null,
"Gjenopptar kryptert økt" "Gjenopptar kryptert økt"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{ {
"name": "converse.js", "name": "converse.js",
"version": "1.0.6", "version": "2.0.0",
"description": "Browser based XMPP instant messaging client", "description": "Browser based XMPP instant messaging client",
"main": "main.js", "main": "main.js",
"directories": { "directories": {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment