Merge branch '0.6.x'
Conflicts: converse.css converse.js index.html Add allow_muc config option
This commit is contained in:
JC Brand
commit
e4c9fcbc4e
|
|
@ -8,6 +8,7 @@ Changelog
|
|||
* Hungarian translation [w3host]
|
||||
* Russian translation [bkocherov]
|
||||
* Update CSS to avoid clash with bootstrap [seocam]
|
||||
* Add config option ``allow_muc`` to enable/disable multi-user chat (MUC) [jcbrand]
|
||||
|
||||
0.6.4 (2013-09-15)
|
||||
------------------
|
||||
|
|
|
|||
|
|
@ -611,7 +611,7 @@ dd.available-chatroom:hover a.room-info {
|
|||
background-color: #DCEAC5;
|
||||
}
|
||||
|
||||
.controlbox-panes {
|
||||
#chatpanel div.controlbox-panes {
|
||||
background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */
|
||||
background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */
|
||||
background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */
|
||||
|
|
|
|||
10
converse.js
10
converse.js
|
|
@ -63,6 +63,7 @@
|
|||
this.hide_muc_server = false;
|
||||
this.i18n = locales.en;
|
||||
this.allow_otr = true;
|
||||
this.allow_muc = true;
|
||||
this.prebind = false;
|
||||
this.show_controlbox_by_default = false;
|
||||
this.show_toolbar = true;
|
||||
|
|
@ -73,6 +74,8 @@
|
|||
// Allow only the whitelisted settings attributes to be overwritten,
|
||||
// nothing else.
|
||||
whitelist = [
|
||||
'allow_muc',
|
||||
'allow_otr',
|
||||
'animate',
|
||||
'auto_list_rooms',
|
||||
'auto_subscribe',
|
||||
|
|
@ -83,7 +86,6 @@
|
|||
'hide_muc_server',
|
||||
'i18n',
|
||||
'jid',
|
||||
'allow_otr',
|
||||
'prebind',
|
||||
'rid',
|
||||
'show_controlbox_by_default',
|
||||
|
|
@ -1506,8 +1508,10 @@
|
|||
this.contactspanel.render();
|
||||
converse.xmppstatusview = new converse.XMPPStatusView({'model': converse.xmppstatus});
|
||||
converse.xmppstatusview.render();
|
||||
this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('.controlbox-panes')});
|
||||
this.roomspanel.render();
|
||||
if (converse.allow_muc) {
|
||||
this.roomspanel = new converse.RoomsPanel({'$parent': this.$el.find('.controlbox-panes')});
|
||||
this.roomspanel.render();
|
||||
}
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -465,17 +465,25 @@ JS file so that it will include the new settings. Please refer to the
|
|||
Configuration variables
|
||||
=======================
|
||||
|
||||
allow_muc
|
||||
---------
|
||||
|
||||
Default = ``true``
|
||||
|
||||
Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove
|
||||
the ``Chatrooms`` tab from the control box.
|
||||
|
||||
animate
|
||||
-------
|
||||
|
||||
Default = True
|
||||
Default = ``true``
|
||||
|
||||
Show animations, for example when opening and closing chat boxes.
|
||||
|
||||
auto_list_rooms
|
||||
---------------
|
||||
|
||||
Default = False
|
||||
Default = ``false``
|
||||
|
||||
If true, and the XMPP server on which the current user is logged in supports
|
||||
multi-user chat, then a list of rooms on that server will be fetched.
|
||||
|
|
@ -489,7 +497,7 @@ option will create lots of extra connection traffic.
|
|||
auto_subscribe
|
||||
--------------
|
||||
|
||||
Default = False
|
||||
Default = ``false``
|
||||
|
||||
If true, the user will automatically subscribe back to any contact requests.
|
||||
|
||||
|
|
@ -504,6 +512,8 @@ See `here <http://metajack.im/2008/09/08/which-bosh-server-do-you-need>`_ for mo
|
|||
debug
|
||||
-----
|
||||
|
||||
Default = ``false``
|
||||
|
||||
If set to true, debugging output will be logged to the browser console.
|
||||
|
||||
fullname
|
||||
|
|
@ -515,7 +525,7 @@ logged in user, otherwise the user's vCard will be fetched.
|
|||
hide_muc_server
|
||||
---------------
|
||||
|
||||
Default = false
|
||||
Default = ``false``
|
||||
|
||||
Hide the ``server`` input field of the form inside the ``Room`` panel of the
|
||||
controlbox. Useful if you want to restrict users to a specific XMPP server of
|
||||
|
|
@ -530,7 +540,7 @@ Specify the locale/language. The language must be in the ``locales`` object. Ref
|
|||
prebind
|
||||
--------
|
||||
|
||||
Default = false
|
||||
Default = ``false``
|
||||
|
||||
Use this option when you want to attach to an existing XMPP connection that was
|
||||
already authenticated (usually on the backend before page load).
|
||||
|
|
@ -550,7 +560,7 @@ Additionally, you have to specify ``bosh_service_url``.
|
|||
show_controlbox_by_default
|
||||
--------------------------
|
||||
|
||||
Default = false
|
||||
Default = ``false``
|
||||
|
||||
The "controlbox" refers to the special chatbox containing your contacts roster,
|
||||
status widget, chatrooms and other controls.
|
||||
|
|
@ -565,7 +575,7 @@ page load.
|
|||
xhr_user_search
|
||||
---------------
|
||||
|
||||
Default = False
|
||||
Default = ``false``
|
||||
|
||||
There are two ways to add users.
|
||||
|
||||
|
|
|
|||
|
|
@ -195,6 +195,7 @@
|
|||
require(['converse'], function (converse) {
|
||||
converse.initialize({
|
||||
allow_otr: true,
|
||||
allow_muc: true,
|
||||
auto_list_rooms: false,
|
||||
auto_subscribe: false,
|
||||
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user