Rename 'enable_message_carbons' to 'message_carbons'

This commit is contained in:
JC Brand 2014-07-19 16:36:43 +02:00
parent 0be33b81ef
commit 7c9a86293d
10 changed files with 12 additions and 12 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -146,7 +146,7 @@
this.cache_otr_key = false;
this.debug = false;
this.default_box_height = 324; // The default height, in pixels, for the control box, chat boxes and chatrooms.
this.enable_message_carbons = false;
this.message_carbons = false;
this.expose_rid_and_sid = false;
this.forward_messages = false;
this.hide_muc_server = false;
@ -184,7 +184,7 @@
'connection',
'debug',
'default_box_height',
'enable_message_carbons',
'message_carbons',
'expose_rid_and_sid',
'forward_messages',
'fullname',
@ -544,7 +544,7 @@
/* Ask the XMPP server to enable Message Carbons
* See XEP-0280 https://xmpp.org/extensions/xep-0280.html#enabling
*/
if (!this.enable_message_carbons) {
if (!this.message_carbons) {
return;
}
var carbons_iq = new Strophe.Builder('iq', {

View File

@ -24,7 +24,7 @@ Changelog
* #123 Show converse.js in the resource assigned to a user. [jcbrand]
* #130 Fixed bootstrap conflicts. [jcbrand]
* #132 Support for `XEP-0280: Message Carbons <https://xmpp.org/extensions/xep-0280.html'>`_.
Configured via `enable_message_carbons <https://conversejs.org/docs/html/index.html#enable_message_carbons>`_ [hejazee]
Configured via `message_carbons <https://conversejs.org/docs/html/index.html#message_carbons>`_ [hejazee]
* #176 Add support for caching in sessionStorage as opposed to localStorage. [jcbrand]
* #180 RID and SID undefined [g8g3]
* #191 No messages history [heban]

Binary file not shown.

View File

@ -918,7 +918,7 @@ Default: ``false``
If set to true, debugging output will be logged to the browser console.
enable_message_carbons
message_carbons
----------------------
Default: ``false``

View File

@ -128,7 +128,7 @@
<li><a class="reference internal" href="#bosh-service-url" id="id45">bosh_service_url</a></li>
<li><a class="reference internal" href="#cache-otr-key" id="id46">cache_otr_key</a></li>
<li><a class="reference internal" href="#debug" id="id47">debug</a></li>
<li><a class="reference internal" href="#enable-message-carbons" id="id48">enable_message_carbons</a></li>
<li><a class="reference internal" href="#enable-message-carbons" id="id48">message_carbons</a></li>
<li><a class="reference internal" href="#expose-rid-and-sid" id="id49">expose_rid_and_sid</a></li>
<li><a class="reference internal" href="#forward-messages" id="id50">forward_messages</a></li>
<li><a class="reference internal" href="#fullname" id="id51">fullname</a></li>
@ -905,7 +905,7 @@ current session. Previous sessions however cannot be decrypted.</p>
<p>If set to true, debugging output will be logged to the browser console.</p>
</div>
<div class="section" id="enable-message-carbons">
<h3><a class="toc-backref" href="#id48">enable_message_carbons</a><a class="headerlink" href="#enable-message-carbons" title="Permalink to this headline"></a></h3>
<h3><a class="toc-backref" href="#id48">message_carbons</a><a class="headerlink" href="#enable-message-carbons" title="Permalink to this headline"></a></h3>
<p>Default: <tt class="docutils literal"><span class="pre">false</span></tt></p>
<p>Support for <a class="reference external" href="https://xmpp.org/extensions/xep-0280.html">XEP-0280: Message Carbons</a></p>
</div>

View File

@ -924,7 +924,7 @@ Default: ``false``
If set to true, debugging output will be logged to the browser console.
enable_message_carbons
message_carbons
----------------------
Default: ``false``