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

fixes #1225

Browse Source
This commit is contained in:
JC Brand 2018-10-01 21:46:38 +02:00
parent defe32d172
commit 45643d52bf
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -4,11 +4,14 @@
- M4A and WEBM files when sent as XEP-0066 Out of Band Data, are now playable directly in chat - M4A and WEBM files when sent as XEP-0066 Out of Band Data, are now playable directly in chat
- OMEMO fixes for Edge. - 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 - #1220 Converse not working in Edge
- #1225 User profile sometimes not displayed when libsignal-protocol.js is used
## 4.0.1 (2018-09-19) ## 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 [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) - New config setting [enable_muc_push](https://conversejs.org/docs/html/configuration.html#enable-muc-push)
- #1182 MUC occupants without nick or JID created - #1182 MUC occupants without nick or JID created

2
dist/converse.js vendored
View File

@ -80476,7 +80476,7 @@ __e(o.__('Save and close')) +
__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">' + __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")) + __e(o.__("This device's OMEMO fingerprint")) +
'</li>\n <li class="list-group-item">\n '; '</li>\n <li class="list-group-item">\n ';
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) { ;
__p += '\n <span class="fingerprint">' + __p += '\n <span class="fingerprint">' +
__e(o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)) + __e(o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)) +
'</span>\n '; '</span>\n ';

2
src/templates/profile_modal.html
View File

@ -71,7 +71,7 @@
<ul class="list-group fingerprints"> <ul class="list-group fingerprints">
<li class="list-group-item active">{{{o.__("This device's OMEMO fingerprint")}}}</li> <li class="list-group-item active">{{{o.__("This device's OMEMO fingerprint")}}}</li>
<li class="list-group-item"> <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> <span class="fingerprint">{{{o.utils.formatFingerprint(o.view.current_device.get('bundle').fingerprint)}}}</span>
{[ } else {]} {[ } else {]}
<span class="spinner fa fa-spinner centered"/> <span class="spinner fa fa-spinner centered"/>