Commit ca13c328 authored by JC Brand's avatar JC Brand

Merge branch 'master' of github.com:conversejs/converse.js into bootstrap4

parents 2977643b ae3942bc
......@@ -379,22 +379,30 @@ plugins from registering themselves under those names.
The core, and by default whitelisted, plugins are::
converse-bookmarks
converse-chatboxes
converse-chatview
converse-controlbox
converse-core
converse-disco
converse-dragresize
converse-fullscreen
converse-headline
converse-mam
converse-minimize
converse-muc
converse-muc-embedded
converse-notification
converse-otr
converse-ping
converse-profile
converse-register
converse-roomslist
converse-rosterview
converse-vcard
converse-singleton
converse-spoilers
converse-vcard'
An example from `the embedded room demo <https://conversejs.org/demo/embedded.html>`_
Example:
.. code-block:: javascript
......@@ -402,17 +410,13 @@ An example from `the embedded room demo <https://conversejs.org/demo/embedded.ht
converse.initialize({
// other settings removed for brevity
blacklisted_plugins: [
'converse-controlbox',
'converse-dragresize',
'converse-minimize',
'converse-vcard'
'converse-minimize'
],
});
});
.. _`bosh-service-url`:
bosh_service_url
......@@ -1427,7 +1431,7 @@ different builds, each for the different modes.
These were:
* ``converse-mobile.js`` for the ``mobile`` mode
* ``converse-muc-embedded.js`` for embedding a single MUC room into the page.
* ``converse-muc-embedded.js`` for embedding a single MUC room into a DOM element with id ``conversejs``
* ``converse.js`` for the ``overlayed`` mode
* ``inverse.js`` for the ``fullscreen`` mode
......@@ -1466,9 +1470,10 @@ when switching view modes.
JavaScript builds, you'll still need to use different CSS files depending
on the view mode.
* For ``overlayed`` this is ``./css/converse.css``
* For ``embedded`` you need to use ``./css/converse-muc-embedded.css``
* For ``fullscreen`` you need ``./css/inverse.css``
* For ``mobile`` you need to use both ``./css/converse.css`` and ``./css/mobile.css``
* For ``overlayed`` this is ``./css/converse.css``
Hopefully in a future release the CSS files will be combined and you'll
only need ``converse.css``
......@@ -1495,32 +1500,41 @@ By default all the core plugins are already whitelisted.
These are::
converse-bookmarks
converse-chatboxes
converse-chatview
converse-controlbox
converse-core
converse-disco
converse-dragresize
converse-fullscreen
converse-headline
converse-mam
converse-minimize
converse-muc
converse-muc-embedded
converse-notification
converse-otr
converse-ping
converse-profile
converse-register
converse-roomslist
converse-rosterview
converse-vcard
converse-singleton
converse-spoilers
converse-vcard'
If you are using a custom build which excludes some core plugins, then you
should blacklist them so that malicious scripts can't register their own
plugins under those names. See `blacklisted_plugins`_ for more info.
.. note::
If you are using a custom build which excludes some core plugins, then you
should blacklist them so that malicious scripts can't register their own
plugins under those names. See `blacklisted_plugins`_ for more info.
An example from `the embedded room demo <https://conversejs.org/demo/embedded.html>`_
Example:
.. code-block:: javascript
require(['converse-core', 'converse-muc-embedded'], function (converse) {
converse.initialize({
// other settings removed for brevity
whitelisted_plugins: ['converse-muc-embedded']
whitelisted_plugins: ['myplugin']
});
});
......@@ -125,6 +125,9 @@
<h2>Integration</h2>
</header>
<ul class="integration">
<li><a href="https://doc.tiki.org/xmpp" target="_blank" rel="noopener">Tiki Wiki CMS Groupware</a></li>
<li><a href="https://www.igniterealtime.org/projects/openfire/plugins.jsp" target="_blank" rel="noopener">Openfire</a></li>
<li><a href="https://modules.prosody.im/mod_conversejs.html" target="_blank" rel="noopener">Prosody</a></li>
<li><a href="https://github.com/mikemarsian/conversejs-rails" target="_blank" rel="noopener">Ruby on Rails</a></li>
<li><a href="http://github.com/collective/collective.xmpp.chat" target="_blank" rel="noopener">Plone</a></li>
<li><a href="https://pypi.python.org/pypi/django-conversejs" target="_blank" rel="noopener">Django (option 1)</a></li>
......
This diff is collapsed.
......@@ -929,7 +929,7 @@ msgstr "Entrar na sala"
#: dist/converse-no-dependencies.js:21104
msgid "Show rooms"
msgstr "Mostar salas"
msgstr "Mostrar salas"
#: dist/converse-no-dependencies.js:21165
msgid "Rooms"
......
......@@ -333,7 +333,7 @@
],
"Show rooms": [
null,
"Mostar salas"
"Mostrar salas"
],
"No rooms on %1$s": [
null,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment