From e64c19fc18edd040bbe4d95974710afd0dff876c Mon Sep 17 00:00:00 2001 From: thierrytiti Date: Fri, 15 May 2015 11:05:26 +0200 Subject: [PATCH 1/3] Bugfix. fullname is null wrong callback argument mapping in XmppStatus initialize: fullname is null --- converse.js | 2 +- docs/CHANGES.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/converse.js b/converse.js index 7522f5ecf..5f85df34f 100644 --- a/converse.js +++ b/converse.js @@ -4629,7 +4629,7 @@ if (this.get('fullname') === undefined) { converse.getVCard( 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) ); diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst index 66b5d3114..ac3c142d6 100644 --- a/docs/CHANGES.rst +++ b/docs/CHANGES.rst @@ -7,6 +7,7 @@ Changelog * 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. 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] 0.9.3 (2015-05-01) From 7a359562ad52a73d2c23d6d331e147fe88c23540 Mon Sep 17 00:00:00 2001 From: thierrytiti Date: Fri, 15 May 2015 12:01:29 +0200 Subject: [PATCH 2/3] Add placeholder for 'Insert a smiley' --- converse.js | 1 + docs/CHANGES.rst | 1 + src/templates/toolbar.html | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/converse.js b/converse.js index 7522f5ecf..4ed4427ef 100644 --- a/converse.js +++ b/converse.js @@ -1567,6 +1567,7 @@ allow_otr: converse.allow_otr && !this.is_chatroom, label_clear: __('Clear all messages'), label_end_encrypted_conversation: __('End encrypted conversation'), + label_insert_smiley: __('Insert a smiley'), label_hide_participants: __('Hide the list of participants'), label_refresh_encrypted_conversation: __('Refresh encrypted conversation'), label_start_call: __('Start a call'), diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst index 66b5d3114..023169ded 100644 --- a/docs/CHANGES.rst +++ b/docs/CHANGES.rst @@ -8,6 +8,7 @@ Changelog * 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] * #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) ------------------ diff --git a/src/templates/toolbar.html b/src/templates/toolbar.html index c1d21ef2c..2b5dd2fa0 100644 --- a/src/templates/toolbar.html +++ b/src/templates/toolbar.html @@ -1,5 +1,5 @@ {[ if (show_emoticons) { ]} -
  • +
      • From 3cbb93479ff84924fdc46d6aafd977912d7c355a Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 15 May 2015 14:45:08 +0200 Subject: [PATCH 3/3] Mention json header. updates #395. --- docs/source/configuration.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst index db6512059..348b327bc 100644 --- a/docs/source/configuration.rst +++ b/docs/source/configuration.rst @@ -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 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 -------------------