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

Update changelog after merge.

Browse Source
This commit is contained in:
JC Brand 2015-06-22 18:55:02 +02:00
parent ed3be3730c
commit 56cd540f5d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
converse.js
View File

@ -4052,7 +4052,7 @@
if (contact instanceof converse.RosterContact) { if (contact instanceof converse.RosterContact) {
contact.authorize().subscribe(); contact.authorize().subscribe();
} else { } else {
// XXX: Happen when subscription retries or roster deleted // Can happen when a subscription is retried or roster was deleted
this.addContact(bare_jid, '', [], { 'subscription': 'from' }).done(function (contact) { this.addContact(bare_jid, '', [], { 'subscription': 'from' }).done(function (contact) {
if (contact instanceof converse.RosterContact) { if (contact instanceof converse.RosterContact) {
contact.authorize().subscribe(); contact.authorize().subscribe();

2
docs/CHANGES.rst
View File

@ -14,7 +14,9 @@ Changelog
* #408 MUC: missing toggle call handler and updated documentation about call. [thierrytiti] * #408 MUC: missing toggle call handler and updated documentation about call. [thierrytiti]
* #415 closeAllChatBoxes is giving ReferenceError when 2 chats are open [nevcos, jcbrand] * #415 closeAllChatBoxes is giving ReferenceError when 2 chats are open [nevcos, jcbrand]
* #416 Add icon for XA status [thierrytiti] * #416 Add icon for XA status [thierrytiti]
* #418 Logging out with `auto_reconnect=true` causes reconnection retries [jcbrand]
* #420 Updated German translation [1st8] * #420 Updated German translation [1st8]
* #427 Converse.js does not subscribe back to a contact not in the roster. [emmanuel-florent]
* Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand] * Bugfix. Manual login doesn't work when only websocket_url is set and not bosh_service_url. [jcbrand]
* Bugfix. ClearSessions during unload event would throw an error when not logged in. [gbonvehi] * Bugfix. ClearSessions during unload event would throw an error when not logged in. [gbonvehi]
* Bugfix. Wrong callback argument mapping in XmppStatus initialize: fullname is null [thierrytiti] * Bugfix. Wrong callback argument mapping in XmppStatus initialize: fullname is null [thierrytiti]