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
0369f11d
Commit
0369f11d
authored
Nov 11, 2013
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix. Contact's name got replaced with JID. updates #58
parent
e8af60e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
CHANGES.rst
CHANGES.rst
+8
-0
converse.js
converse.js
+3
-2
No files found.
CHANGES.rst
View file @
0369f11d
...
@@ -9,11 +9,19 @@ Changelog
...
@@ -9,11 +9,19 @@ Changelog
HTML needed in your webpage for converse.js to work has been reduced to a
HTML needed in your webpage for converse.js to work has been reduced to a
single div: <div id="conversejs"></div>
single div: <div id="conversejs"></div>
Features:
~~~~~~~~~
* Add a toolbar for single user chat [jcbrand]
* Add a toolbar for single user chat [jcbrand]
* Add support for OTR (off-the-record) encryption [jcbrand]
* Add support for OTR (off-the-record) encryption [jcbrand]
* Add support for smileys [jcbrand]
* Add support for smileys [jcbrand]
* Simplified boilerplate markup [jcbrand]
* Simplified boilerplate markup [jcbrand]
* New configuration settings, ``xhr_custom_status_url`` and ``xhr_user_search_url`` [jcbrand]
* New configuration settings, ``xhr_custom_status_url`` and ``xhr_user_search_url`` [jcbrand]
Bugfixes:
~~~~~~~~~
* #58 Contact's name gets replaced with their JID [jcbrand]
* #81 Requesting contacts appear as pending contacts [jcbrand]
* #81 Requesting contacts appear as pending contacts [jcbrand]
0.6.6 (2013-10-16)
0.6.6 (2013-10-16)
...
...
converse.js
View file @
0369f11d
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
converse
.
connection
.
vcard
.
get
(
converse
.
connection
.
vcard
.
get
(
$
.
proxy
(
function
(
iq
)
{
$
.
proxy
(
function
(
iq
)
{
// Successful callback
// Successful callback
$vcard
=
$
(
iq
).
find
(
'
vCard
'
);
var
$vcard
=
$
(
iq
).
find
(
'
vCard
'
);
var
fullname
=
$vcard
.
find
(
'
FN
'
).
text
(),
var
fullname
=
$vcard
.
find
(
'
FN
'
).
text
(),
img
=
$vcard
.
find
(
'
BINVAL
'
).
text
(),
img
=
$vcard
.
find
(
'
BINVAL
'
).
text
(),
img_type
=
$vcard
.
find
(
'
TYPE
'
).
text
(),
img_type
=
$vcard
.
find
(
'
TYPE
'
).
text
(),
...
@@ -198,8 +198,9 @@
...
@@ -198,8 +198,9 @@
if
(
jid
)
{
if
(
jid
)
{
var
rosteritem
=
converse
.
roster
.
get
(
jid
);
var
rosteritem
=
converse
.
roster
.
get
(
jid
);
if
(
rosteritem
)
{
if
(
rosteritem
)
{
fullname
=
_
.
isEmpty
(
fullname
)?
rosteritem
.
get
(
'
fullname
'
)
||
jid
:
fullname
;
rosteritem
.
save
({
rosteritem
.
save
({
'
fullname
'
:
fullname
||
jid
,
'
fullname
'
:
fullname
,
'
image_type
'
:
img_type
,
'
image_type
'
:
img_type
,
'
image
'
:
img
,
'
image
'
:
img
,
'
url
'
:
url
,
'
url
'
:
url
,
...
...
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