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
c39c5df2
Commit
c39c5df2
authored
Feb 14, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:jcbrand/converse.js
parents
50f03c90
af6867e6
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
9 deletions
+8
-9
.github/PULL_REQUEST_TEMPLATE.md
.github/PULL_REQUEST_TEMPLATE.md
+1
-1
demo/embedded.html
demo/embedded.html
+4
-4
src/converse-chatboxes.js
src/converse-chatboxes.js
+1
-1
src/converse-rosterview.js
src/converse-rosterview.js
+1
-2
src/templates/roster_item.html
src/templates/roster_item.html
+1
-1
No files found.
.github/PULL_REQUEST_TEMPLATE.md
View file @
c39c5df2
...
...
@@ -2,7 +2,7 @@ Thanks for making a pull request to converse.js!
Before submitting your request, please make sure the following conditions are met:
-
[ ] Add a changelog entry for your change in
`
docs/
CHANGES.md`
-
[ ] Add a changelog entry for your change in
`CHANGES.md`
-
[ ] When adding a configuration variable, please make sure to
document it in
`docs/source/configuration.rst`
-
[ ] Please add a test for your change. Tests can be run in the commandline
...
...
demo/embedded.html
View file @
c39c5df2
...
...
@@ -9,15 +9,15 @@
<meta
name=
"author"
content=
"JC Brand"
/>
<meta
name=
"keywords"
content=
"xmpp chat webchat converse.js"
/>
<link
rel=
"shortcut icon"
type=
"image/ico"
href=
"../css/images/favicon.ico"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"
..
/node_modules/bootstrap/dist/css/bootstrap.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"
..
/node_modules/font-awesome/css/font-awesome.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"
https://cdn.conversejs.org
/node_modules/bootstrap/dist/css/bootstrap.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"
https://cdn.conversejs.org
/node_modules/font-awesome/css/font-awesome.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"https://cdn.conversejs.org/css/theme.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"https://cdn.conversejs.org/css/converse.min.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
media=
"screen"
href=
"https://cdn.conversejs.org/css/converse-muc-embedded.min.css"
/>
<script
type=
"text/javascript"
src=
"
..
/analytics.js"
></script>
<script
type=
"text/javascript"
src=
"
https://cdn.conversejs.org
/analytics.js"
></script>
<noscript><p><img
src=
"//stats.opkode.com/piwik.php?idsite=1"
style=
"border:0;"
alt=
""
/></p></noscript>
<
![
if
gte
IE
9
]
>
<script
src=
"
..
/dist/converse-muc-embedded.min.js"
></script>
<script
src=
"
https://cdn.conversejs.org
/dist/converse-muc-embedded.min.js"
></script>
<
![
endif
]
>
</head>
...
...
src/converse-chatboxes.js
View file @
c39c5df2
...
...
@@ -7,7 +7,7 @@
/*global define */
(
function
(
root
,
factory
)
{
define
([
"
converse-core
"
],
factory
);
define
([
"
converse-core
"
,
"
backbone.overview
"
],
factory
);
}(
this
,
function
(
converse
)
{
"
use strict
"
;
const
{
Backbone
,
Promise
,
Strophe
,
b64_sha1
,
moment
,
utils
,
_
}
=
converse
.
env
;
...
...
src/converse-rosterview.js
View file @
c39c5df2
...
...
@@ -358,9 +358,8 @@
this
.
el
.
innerHTML
=
tpl_roster_item
(
_
.
extend
(
item
.
toJSON
(),
{
'
desc_status
'
:
STATUSES
[
item
.
get
(
'
chat_status
'
)
||
'
offline
'
],
'
desc_chat
'
:
__
(
'
Click to chat with
this contact
'
),
'
desc_chat
'
:
__
(
'
Click to chat with
%1$s (JID: %2$s)
'
,
item
.
get
(
'
fullname
'
),
item
.
get
(
'
jid
'
)
),
'
desc_remove
'
:
__
(
'
Click to remove %1$s as a contact
'
,
item
.
get
(
'
fullname
'
)),
'
title_fullname
'
:
__
(
'
Name
'
),
'
allow_contact_removal
'
:
_converse
.
allow_contact_removal
,
'
num_unread
'
:
item
.
get
(
'
num_unread
'
)
||
0
})
...
...
src/templates/roster_item.html
View file @
c39c5df2
<a
class=
"open-chat {[ if (o.num_unread) { ]} unread-msgs {[ } ]}"
title=
"{{{o.
title_fullname}}}: {{{o.fullname}}} JID: {{{o.jid}}} {{{o.
desc_chat}}}"
title=
"{{{o.desc_chat}}}"
href=
"#"
>
<div
class=
"avatar avatar-{{{o.chat_status}}}"
>
<span
class=
"status-icon icon-{{{o.chat_status}}}"
title=
"{{{o.desc_status}}}"
></span>
...
...
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