Skip to content

C
converse.js
Commit 18dd3f0c authored by JC Brand's avatar JC Brand
Browse files
Options

Merge branch 'master' into bootstrap4

parents 1470b868 a7fa06c1
Show whitespace changes
Inline Side-by-side
Showing with 267 additions and 36 deletions
CHANGES.md
View file @ 18dd3f0c
......@@ -4,6 +4,7 @@
- Avoid `eval` (via `_.template` from lodash).
- Bugfix. Avatars weren't being shown.
- Add LibreJS support
## 3.3.3 (2018-02-14)
......
README.md
View file @ 18dd3f0c
# converse.js
[![inVerse](https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org)](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org)
[![XMPP Chat](https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org)](https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org)
[![Travis](https://api.travis-ci.org/jcbrand/converse.js.png?branch=master)](https://travis-ci.org/jcbrand/converse.js)
[![Bountysource bounties](https://img.shields.io/bountysource/team/converse.js/activity.svg?maxAge=2592000)](https://www.bountysource.com/teams/converse.js/issues?tracker_ids=194169)
[![Translation status](https://hosted.weblate.org/widgets/conversejs/-/svg-badge.svg)](https://hosted.weblate.org/engage/conversejs/?utm_source=widget)
......
css/theme.css
View file @ 18dd3f0c
......@@ -153,7 +153,7 @@ a:focus {
.brand-heading {
font-size: 2em;
text-align: center;
margin-top: 3em;
margin-top: 2.5em;
}
.brand-heading-embedded {
margin-top: 1.5em;
......@@ -285,7 +285,7 @@ a:focus {
font-size: 26px;
}
.banner-social-buttons {
padding-top: 5em;
padding-top: 3em;
}
::-moz-selection {
text-shadow: none;
......
demo/anonymous.html
View file @ 18dd3f0c
......@@ -50,6 +50,34 @@
</body>
<script>
/*
@licstart
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>
@licend
*/
converse.initialize({
allow_logout: false, // No point in logging out when we have auto_login as true.
allow_muc_invitations: false, // Doesn't make sense to allow because only
......
index.html
View file @ 18dd3f0c
......@@ -58,6 +58,9 @@
<li>
<a href="/docs/html/index.html">Documentation</a>
</li>
<li>
<a href="jslicenses.html" rel="jslicense">Licences</a>
</li>
<li>
<a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank" rel="noopener">Download</a>
</li>
......@@ -74,9 +77,14 @@
<div class="col-md-8 col-md-offset-2">
<p class="intro-text">A free and open-source XMPP chat client in your browser</p>
<p>Now also available in a fullscreen version.
Check out <a href="https://inverse.chat" target="_blank" rel="noopener">inverse.chat</a> </br>
Please support this project via <a href="https://www.patreon.com/jcbrand" target="_blank" rel="noopener">Patreon</a> or <a href="https://liberapay.com/jcbrand" target="_blank" rel="noopener">Liberapay</a>
Check out <a href="https://inverse.chat" target="_blank" rel="noopener">inverse.chat</a>
</p>
<p>
<a href="https://inverse.chat/#converse/room?jid=discuss@conference.conversejs.org"
target="_blank" rel="noopener"><img src="https://inverse.chat/badge.svg?room=discuss@conference.conversejs.org"/></a>
</p>
<div class="page-scroll">
<a href="#about" class="btn btn-default btn-lg"><span class="btn-text">Learn More</span></a>
</div>
......@@ -113,7 +121,7 @@
<section class="features-section content-section" id="features">
<div class="container">
<div class="row">
<div class="col-lg-4">
<div class="col-lg-6">
<section>
<span class="feature-icon page-scroll"><a class="fa fa-globe" href="#features" title="Integration"></a></span>
<header>
......@@ -132,7 +140,7 @@
</ul>
</section>
</div>
<div class="col-lg-4">
<div class="col-lg-6">
<section>
<span class="feature-icon page-scroll"><a class="fa fa-check-square-o" href="#features" title="Features"></a></span>
</section>
......@@ -166,31 +174,6 @@
<li>Translated into 17 languages</li>
</ul>
</div>
<div class="col-lg-4">
<section>
<span class="feature-icon page-scroll"><a class="fa fa-video-camera" href="#features" title="Screencasts"></a></span>
<header>
<h2>Screencasts</h2>
</header>
<ul class="screencasts">
<li>
<a href="https://opkode.com/blog/2012/07/30/instant-messaging-for-plone-with-javascript-and-xmpp" target="_blank" rel="noopener">
In a Plone site
</a>
</li>
<li>
<a href="http://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript" target="_blank" rel="noopener">
Chatting with buddies from Jabber.org and Gmail
</a>
</li>
<li>
<a href="https://opkode.com/media/blog/2013/11/11/conversejs-otr-support" target="_blank" rel="noopener">
Off-the-record encryption
</a>
</li>
</ul>
</section>
</div>
</div>
</div>
</section>
......@@ -201,10 +184,11 @@
<div class="col-lg-8 col-lg-offset-2">
<h2>Contact</h2>
<ul class="contact">
<li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank" rel="noopener">Twitter</a> or chat with me via XMPP at <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a>.</li>
<li>Follow me on <a href="http://twitter.com/jcopkode" target="_blank" rel="noopener">Twitter</a>
or <a href="https://mastodon.xyz/@jcbrand" target="_blank" rel="noopener">Mastodon</a>
<li>Chat with me via XMPP at <a href="xmpp:jc@opkode.com" class="xmpp JSnocheck" title="XMPP/Jabber">jc@opkode.com</a></li>
<li>For technical support, you can ask on <a href="http://stackoverflow.com/questions/tagged/converse.js">Stack Overflow</a>
or if you have a more simple question you can ask in the Converse.js chat room:
<a href="xmpp:discuss@conference.conversejs.org" class="xmpp JSnocheck" title="Converse.js chat room">discuss@conference.conversejs.org</a>.</li>
<li>The Converse.js XMPP chatroom: <a href="xmpp:discuss@conference.conversejs.org" class="xmpp JSnocheck" title="Converse.js chat room">discuss@conference.conversejs.org</a>.</li>
<li>Please file bugs and feature requests on <a target="_blank" rel="noopener" href="https://github.com/jcbrand/converse.js/issues">Github</a>.</li>
</ul>
</div>
......@@ -238,7 +222,7 @@
<p class="sponsors-text">Converse.js is a software commons; available at no cost to you or anyone else.
Sponsorships allow us to fund further development and improvements and are greatly appreciated.
If you'd like to sponsor this project, please visit <a href="https://www.patreon.com/jcbrand" target="_blank" rel="noopener">Patreon page</a>
If you'd like to sponsor this project, please visit <a href="https://www.patreon.com/jcbrand" target="_blank" rel="noopener">Patreon</a>
or <a href="https://liberapay.com/jcbrand" target="_blank" rel="noopener">Liberapay</a>.
</p>
</div>
......@@ -248,6 +232,34 @@
</body>
<script>
/*
@licstart
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>
@licend
*/
converse.initialize({
// Please use this connection manager only for testing purposes
bosh_service_url: 'https://conversejs.org/http-bind/',
......
inverse.html
View file @ 18dd3f0c
......@@ -17,6 +17,35 @@
</div>
</div>
<script>
/*
@licstart
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>
@licend
*/
converse.initialize({
authentication: 'login',
auto_away: 300,
......
jslicenses.html 0 → 100644
View file @ 18dd3f0c
<!DOCTYPE html>
<html lang=en>
<head>
<title>Converse.js</title>
<meta charset="utf-8">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="description" content="Converse.js: An XMPP chat client which can be integrated into any website" />
<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="css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
<script type="text/javascript" src="analytics.js"></script>
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<script src="src/website.js"></script>
<![if gte IE 11]>
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
<script src="dist/converse.js"></script>
<![endif]>
</head>
<body id="page-top" data-spy="scroll" data-target=".navbar-custom">
<nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand" href="/"><i class="fa fa-play-circle"></i> <span class="light">Home</span></a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-right navbar-main-collapse">
<ul class="nav navbar-nav">
<li>
<a href="/docs/html/manual.html">User Manual</a>
</li>
<li>
<a href="/docs/html/index.html">Documentation</a>
</li>
<li>
<a href="jslicenses.html" rel="jslicense">Licences</a>
</li>
<li>
<a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank" rel="noopener">Download</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->
</div>
<!-- /.container -->
</nav>
<section class="intro" class="container">
<div class="row">
<h1 class="brand-heading"><i class="icon-conversejs"></i> converse</h1>
<div class="col-md-8 col-md-offset-2">
<p class="intro-text">JavaScript Licences</p>
</div>
<div class="col-md-8 col-md-offset-2">
<table id="jslicense-labels1" style="width: 100%">
<tr>
<td>
<a href="https://cdn.conversejs.org/3.3.1/dist/converse.min.js">converse.min.js</a>
</td>
<td>
<a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a>
<br />
<a href="magnet:?xt=urn:btih:e95b018ef3580986a04669f1b5879592219e2a7a&amp;dn=public-domain.txt">Public-Domain</a>
<br />
<a href="http://www.jclark.com/xml/copying.txt">Expat</a>
</td>
<td>
<a href="https://github.com/jcbrand/converse.js/blob/master/src/converse.js">converse.js</a>
<br />
<a href="https://github.com/jcbrand/converse.js/blob/master/3rdparty/bigint.js">bigint.js</a>
<br />
<a href="https://github.com/jcbrand/converse.js/blob/master/3rdparty/lodash.fp.js">lodash.fp.js</a>
</td>
</tr>
<tr>
<td>
<a href="https://stats.opkode.com/piwik.js">piwik.js</a>
</td>
<td>
<a href="http://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a>
<a href="http://www.jclark.com/xml/copying.txt">Expat</a>
</td>
<td>
<a href="https://stats.opkode.com/piwik.js">piwik.js</a>
<a href="https://github.com/bestiejs/json3">json3</a>
</td>
</tr>
<tr>
<td>
<a href="https://conversejs.org/analytics.js">analytics.js</a>
</td>
<td>
<a href="http://www.mozilla.org/MPL/2.0">MPL-2.0</a>
</td>
<td>
<a href="https://conversejs.org/analytics.js">analytics.js</a>
</td>
</tr>
<tr>
<td>
<a href="https://inverse.chat/inverse-analytics.js">inverse-analytics.js</a>
</td>
<td>
<a href="http://www.mozilla.org/MPL/2.0">MPL-2.0</a>
</td>
<td>
<a href="https://inverse.chat/inverse-analytics.js">inverse-analytics.js</a>
</td>
<tr/>
<tr>
<td>
<a href="https://conversejs.org/src/website.js">website.js</a>
</td>
<td>
<a href="http://www.mozilla.org/MPL/2.0">MPL-2.0</a>
</td>
<td>
<a href="https://github.com/jcbrand/converse.js/blob/master/src/website.js">website.js</a>
</td>
</tr>
</table>
</div>
</div>
</section>
</body>
</html>
mobile.html
View file @ 18dd3f0c
......@@ -123,6 +123,34 @@
</body>
<script>
/*
@licstart
This is free and unencumbered software released into the public domain.
Anyone is free to copy, modify, publish, use, compile, sell, or
distribute this software, either in source code form or as a compiled
binary, for any purpose, commercial or non-commercial, and by any
means.
In jurisdictions that recognize copyright laws, the author or authors
of this software dedicate any and all copyright interest in the
software to the public domain. We make this dedication for the benefit
of the public at large and to the detriment of our heirs and
successors. We intend this dedication to be an overt act of
relinquishment in perpetuity of all present and future rights to this
software under copyright law.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
For more information, please refer to <http://unlicense.org/>
@licend
*/
converse.initialize({
bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
show_controlbox_by_default: false,
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7