Merge branch 'master' into plugins-refactor
This commit is contained in:
commit
ea687d67f9
|
@ -1562,6 +1562,7 @@
|
||||||
allow_otr: converse.allow_otr && !this.is_chatroom,
|
allow_otr: converse.allow_otr && !this.is_chatroom,
|
||||||
label_clear: __('Clear all messages'),
|
label_clear: __('Clear all messages'),
|
||||||
label_end_encrypted_conversation: __('End encrypted conversation'),
|
label_end_encrypted_conversation: __('End encrypted conversation'),
|
||||||
|
label_insert_smiley: __('Insert a smiley'),
|
||||||
label_hide_participants: __('Hide the list of participants'),
|
label_hide_participants: __('Hide the list of participants'),
|
||||||
label_refresh_encrypted_conversation: __('Refresh encrypted conversation'),
|
label_refresh_encrypted_conversation: __('Refresh encrypted conversation'),
|
||||||
label_start_call: __('Start a call'),
|
label_start_call: __('Start a call'),
|
||||||
|
@ -4624,7 +4625,7 @@
|
||||||
if (this.get('fullname') === undefined) {
|
if (this.get('fullname') === undefined) {
|
||||||
converse.getVCard(
|
converse.getVCard(
|
||||||
null, // No 'to' attr when getting one's own vCard
|
null, // No 'to' attr when getting one's own vCard
|
||||||
$.proxy(function (jid, fullname, image, image_type, url) {
|
$.proxy(function (iq, jid, fullname, image, image_type, url) {
|
||||||
this.save({'fullname': fullname});
|
this.save({'fullname': fullname});
|
||||||
}, this)
|
}, this)
|
||||||
);
|
);
|
||||||
|
|
|
@ -7,7 +7,9 @@ Changelog
|
||||||
* Refactored in order to remove the strophe.roster.js dependency. [jcbrand]
|
* Refactored in order to remove the strophe.roster.js dependency. [jcbrand]
|
||||||
* 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]
|
||||||
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
|
* #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
|
||||||
|
* Add placeholder for "Insert a smiley" translation [thierrytiti]
|
||||||
|
|
||||||
0.9.3 (2015-05-01)
|
0.9.3 (2015-05-01)
|
||||||
------------------
|
------------------
|
||||||
|
|
|
@ -610,6 +610,9 @@ This setting enables the second mechanism, otherwise by default the first will b
|
||||||
A default JSON encoded list of objects must be returned. Each object
|
A default JSON encoded list of objects must be returned. Each object
|
||||||
corresponds to a matched user and needs the keys ``id`` and ``fullname``.
|
corresponds to a matched user and needs the keys ``id`` and ``fullname``.
|
||||||
|
|
||||||
|
.. note::
|
||||||
|
Make sure your server script sets the header `Content-Type: application/json`.
|
||||||
|
|
||||||
xhr_user_search_url
|
xhr_user_search_url
|
||||||
-------------------
|
-------------------
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{[ if (show_emoticons) { ]}
|
{[ if (show_emoticons) { ]}
|
||||||
<li class="toggle-smiley icon-happy" title="Insert a smiley">
|
<li class="toggle-smiley icon-happy" title="{{label_insert_smiley}}">
|
||||||
<ul>
|
<ul>
|
||||||
<li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>
|
<li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>
|
||||||
<li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>
|
<li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user