Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-08-15 10:25:11 +02:00
commit 0c70ca83ff
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/conf.py
View File

@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '3.2.0-rc' version = '3.2.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '3.2.0-rc' release = '3.2.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

8
docs/source/configuration.rst
View File

@ -485,7 +485,7 @@ default_domain
Specify a domain to act as the default for user JIDs. This allows users to log Specify a domain to act as the default for user JIDs. This allows users to log
in with only the username part of their JID, instead of the full JID. in with only the username part of their JID, instead of the full JID.
For example, if ``default_domain`` is ``example.org``, then the user: For example, if ``default_domain`` is ``example.org``, then the user
``johnny@example.org`` can log in with only ``johnny``. ``johnny@example.org`` can log in with only ``johnny``.
JIDs with other domains are still allowed but need to be provided in full. JIDs with other domains are still allowed but need to be provided in full.
@ -701,6 +701,12 @@ locked_domain
Similar to `default_domain`_ but no other domains are allowed. Similar to `default_domain`_ but no other domains are allowed.
For example, if ``locked_domain`` is set to ``example.org``, then the user
``johnny@example.org`` can log in with only ``johnny``.
Additionally, only users registered on the ``example.org`` host can log in, no
other users are allowed to log in.
message_archiving message_archiving
----------------- -----------------

1
src/converse-controlbox.js
View File

@ -188,6 +188,7 @@
_converse.api.settings.update({ _converse.api.settings.update({
allow_logout: true, allow_logout: true,
default_domain: undefined, default_domain: undefined,
locked_domain: undefined,
show_controlbox_by_default: false, show_controlbox_by_default: false,
sticky_controlbox: false, sticky_controlbox: false,
xhr_user_search: false, xhr_user_search: false,

1
src/converse-core.js
View File

@ -276,7 +276,6 @@
include_offline_state: false, include_offline_state: false,
jid: undefined, jid: undefined,
keepalive: true, keepalive: true,
locked_domain: undefined,
message_carbons: true, message_carbons: true,
message_storage: 'session', message_storage: 'session',
password: undefined, password: undefined,