Merge branch 'master' of github.com:jcbrand/converse.js
This commit is contained in:
commit
c39c5df2db
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -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
|
||||
|
@ -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>
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
})
|
||||
|
@ -1,5 +1,5 @@
|
||||
<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>
|
||||
|
Loading…
Reference in New Issue
Block a user