Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
56cd540f
Commit
56cd540f
authored
Jun 22, 2015
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update changelog after merge.
parent
ed3be373
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
converse.js
converse.js
+1
-1
docs/CHANGES.rst
docs/CHANGES.rst
+2
-0
No files found.
converse.js
View file @
56cd540f
...
@@ -4052,7 +4052,7 @@
...
@@ -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
();
...
...
docs/CHANGES.rst
View file @
56cd540f
...
@@ -14,7 +14,9 @@ Changelog
...
@@ -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]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment