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
45643d52
Commit
45643d52
authored
Oct 01, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #1225
parent
defe32d1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
9 deletions
+12
-9
CHANGES.md
CHANGES.md
+4
-1
dist/converse.js
dist/converse.js
+4
-4
src/templates/profile_modal.html
src/templates/profile_modal.html
+4
-4
No files found.
CHANGES.md
View file @
45643d52
...
...
@@ -4,11 +4,14 @@
-
M4A and WEBM files when sent as XEP-0066 Out of Band Data, are now playable directly in chat
-
OMEMO fixes for Edge.
-
#1187 UTF-8 characters have the wrong encoding when using OMEMO
-
#1189 Video playback failure
-
#1220 Converse not working in Edge
-
#1225 User profile sometimes not displayed when libsignal-protocol.js is used
## 4.0.1 (2018-09-19)
-
Use https://compliance.conversations.im instead of
(dead)
https://xmpp.net
-
Use https://compliance.conversations.im instead of
dead link tot st
https://xmpp.net
-
New config setting
[
auto_register_muc_nickname
](
https://conversejs.org/docs/html/configuration.html#auto-register-muc-nickname
)
-
New config setting
[
enable_muc_push
](
https://conversejs.org/docs/html/configuration.html#enable-muc-push
)
-
#1182 MUC occupants without nick or JID created
...
...
dist/converse.js
View file @
45643d52
...
...
@@ -80475,13 +80475,13 @@ __e(o.__('Save and close')) +
if (o._converse.pluggable.plugins['converse-omemo'].enabled(o._converse)) { ;
__p += '\n <div class="tab-pane fade" id="omemo-tabpanel" role="tabpanel" aria-labelledby="omemo-tab">\n <form class="converse-form fingerprint-removal">\n <ul class="list-group fingerprints">\n <li class="list-group-item active">' +
__e(o.__("This device's OMEMO fingerprint")) +
'</li>\n <li class="list-group-item">\n
';
if (o.view.current_device.get('bundle') && o.view.current_device.get('bundle').fingerprint) { ;
'</li>\n <li class="list-group-item">\n ';
if (o.view.current_device
&& o.view.current_device
.get('bundle') && o.view.current_device.get('bundle').fingerprint) { ;
__p += '\n <span class="fingerprint">' +
__e(o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)) +
'</span>\n
';
'</span>\n ';
} else {;
__p += '\n
<span class="spinner fa fa-spinner centered"/>\n
';
__p += '\n
<span class="spinner fa fa-spinner centered"/>\n
';
} ;
__p += '\n </li>\n </ul>\n ';
if (o.view.other_devices.length) { ;
src/templates/profile_modal.html
View file @
45643d52
...
...
@@ -71,11 +71,11 @@
<ul
class=
"list-group fingerprints"
>
<li
class=
"list-group-item active"
>
{{{o.__("This device's OMEMO fingerprint")}}}
</li>
<li
class=
"list-group-item"
>
{[ if (
o.view.current_device.get('bundle')
&&
o.view.current_device.get('bundle').fingerprint) { ]}
{[ if (o.view.current_device
&&
o.view.current_device.get('bundle')
&&
o.view.current_device.get('bundle').fingerprint) { ]}
<span
class=
"fingerprint"
>
{{{o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)}}}
</span>
{[ } else {]}
<span
class=
"spinner fa fa-spinner centered"
/>
{[ } ]}
{[ } else {]}
<span
class=
"spinner fa fa-spinner centered"
/>
{[ } ]}
</li>
</ul>
{[ if (o.view.other_devices.length) { ]}
...
...
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