Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
0edb38e2
Commit
0edb38e2
authored
Jul 19, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #896 Consistently use `XMPP username` in user facing text
parent
713e49b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGES.md
CHANGES.md
+1
-0
src/converse-muc.js
src/converse-muc.js
+2
-2
No files found.
CHANGES.md
View file @
0edb38e2
...
@@ -5,6 +5,7 @@
...
@@ -5,6 +5,7 @@
### New features and improvements
### New features and improvements
-
Add support for Emojis (either native, or via
<a
href=
"https://www.emojione.com/"
>
Emojione
</a>
). [jcbrand]
-
Add support for Emojis (either native, or via
<a
href=
"https://www.emojione.com/"
>
Emojione
</a>
). [jcbrand]
-
Add JID validation in the contact add form. [jcbrand]
-
Add JID validation in the contact add form. [jcbrand]
-
#896 Consistently use
`XMPP username`
in user-facing text (instead of JID, Jabber ID etc.). [jcbrand]
### New configuration settings
### New configuration settings
*
The
`visible_toolbar_buttons.emoticons`
configuration option is now changed to
`visible_toolbar_buttons.emoji`
.
*
The
`visible_toolbar_buttons.emoticons`
configuration option is now changed to
`visible_toolbar_buttons.emoji`
.
...
...
src/converse-muc.js
View file @
0edb38e2
...
@@ -2173,12 +2173,12 @@
...
@@ -2173,12 +2173,12 @@
'
tt_mam_enabled
'
:
__
(
'
Messages are archived on the server
'
),
'
tt_mam_enabled
'
:
__
(
'
Messages are archived on the server
'
),
'
tt_membersonly
'
:
__
(
'
This room is restricted to members only
'
),
'
tt_membersonly
'
:
__
(
'
This room is restricted to members only
'
),
'
tt_moderated
'
:
__
(
'
This room is being moderated
'
),
'
tt_moderated
'
:
__
(
'
This room is being moderated
'
),
'
tt_nonanonymous
'
:
__
(
'
All other room occupants can see your
Jabber ID
'
),
'
tt_nonanonymous
'
:
__
(
'
All other room occupants can see your
XMPP username
'
),
'
tt_open
'
:
__
(
'
Anyone can join this room
'
),
'
tt_open
'
:
__
(
'
Anyone can join this room
'
),
'
tt_passwordprotected
'
:
__
(
'
This room requires a password before entry
'
),
'
tt_passwordprotected
'
:
__
(
'
This room requires a password before entry
'
),
'
tt_persistent
'
:
__
(
'
This room persists even if it
\'
s unoccupied
'
),
'
tt_persistent
'
:
__
(
'
This room persists even if it
\'
s unoccupied
'
),
'
tt_public
'
:
__
(
'
This room is publicly searchable
'
),
'
tt_public
'
:
__
(
'
This room is publicly searchable
'
),
'
tt_semianonymous
'
:
__
(
'
Only moderators can see your
Jabber ID
'
),
'
tt_semianonymous
'
:
__
(
'
Only moderators can see your
XMPP username
'
),
'
tt_temporary
'
:
__
(
'
This room will disappear once the last person leaves
'
),
'
tt_temporary
'
:
__
(
'
This room will disappear once the last person leaves
'
),
'
tt_unmoderated
'
:
__
(
'
This room is not being moderated
'
),
'
tt_unmoderated
'
:
__
(
'
This room is not being moderated
'
),
'
tt_unsecured
'
:
__
(
'
This room does not require a password upon entry
'
)
'
tt_unsecured
'
:
__
(
'
This room does not require a password upon entry
'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment