Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-02-21 10:29:26 +01:00
commit d7cfaec244
3 changed files with 132 additions and 75 deletions

View File

@ -4,6 +4,7 @@
- Avoid `eval` (via `_.template` from lodash). - Avoid `eval` (via `_.template` from lodash).
- Bugfix. Avatars weren't being shown. - Bugfix. Avatars weren't being shown.
- Add LibreJS support
## 3.3.3 (2018-02-14) ## 3.3.3 (2018-02-14)
@ -43,9 +44,6 @@
- New configuration setting [root](https://conversejs.org/docs/html/configurations.html#root) - New configuration setting [root](https://conversejs.org/docs/html/configurations.html#root)
- The [view_mode](https://conversejs.org/docs/html/configurations.html#view-mode) setting now has a new possible value: `embedded` - The [view_mode](https://conversejs.org/docs/html/configurations.html#view-mode) setting now has a new possible value: `embedded`
### LibreJS
- Add LibreJS support
### Translation updates ### Translation updates
- Chinese (Traditional), French, German, Portuguese (Brazil), Russian, Ukrainian - Chinese (Traditional), French, German, Portuguese (Brazil), Russian, Ukrainian

View File

@ -59,7 +59,7 @@
<a href="/docs/html/index.html">Documentation</a> <a href="/docs/html/index.html">Documentation</a>
</li> </li>
<li> <li>
<a href="jslicenses-converse.html" rel="jslicense">Page JS Licences</a> <a href="jslicenses.html" rel="jslicense">Licences</a>
</li> </li>
<li> <li>
<a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank" rel="noopener">Download</a> <a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank" rel="noopener">Download</a>

View File

@ -1,74 +1,133 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang=en> <html lang=en>
<head> <head>
</head> <title>Converse.js</title>
<body> <meta charset="utf-8">
<table id="jslicense-labels1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<tr> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<td> <meta name="description" content="Converse.js: An XMPP chat client which can be integrated into any website" />
<a href="https://cdn.conversejs.org/3.3.1/dist/converse.min.js">converse.min.js</a> <meta name="author" content="JC Brand" />
</td> <meta name="keywords" content="xmpp chat webchat converse.js" />
<td> <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a> <link type="text/css" rel="stylesheet" media="screen" href="css/bootstrap.min.css" />
<br /> <link type="text/css" rel="stylesheet" media="screen" href="css/font-awesome.min.css" />
<a href="magnet:?xt=urn:btih:e95b018ef3580986a04669f1b5879592219e2a7a&amp;dn=public-domain.txt">Public-Domain</a> <link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
<br /> <script type="text/javascript" src="analytics.js"></script>
<a href="http://www.jclark.com/xml/copying.txt">Expat</a> <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
</td> <script src="src/website.js"></script>
<td> <![if gte IE 11]>
<a href="https://github.com/jcbrand/converse.js/blob/master/src/converse.js">converse.js</a> <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
<br /> <script src="dist/converse.js"></script>
<a href="https://github.com/jcbrand/converse.js/blob/master/3rdparty/bigint.js">bigint.js</a> <![endif]>
<br /> </head>
<a href="https://github.com/jcbrand/converse.js/blob/master/3rdparty/lodash.fp.js">lodash.fp.js</a>
</td> <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
</tr> <nav class="navbar navbar-custom navbar-fixed-top" role="navigation">
<tr> <div class="container">
<td> <div class="navbar-header">
<a href="https://stats.opkode.com/piwik.js">piwik.js</a> <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
</td> <i class="fa fa-bars"></i>
<td> </button>
<a href="http://opensource.org/licenses/BSD-3-Clause">BSD-3-Clause</a> <a class="navbar-brand" href="/"><i class="fa fa-play-circle"></i> <span class="light">Home</span></a>
<a href="http://www.jclark.com/xml/copying.txt">Expat</a> </div>
</td> <!-- Collect the nav links, forms, and other content for toggling -->
<td> <div class="collapse navbar-collapse navbar-right navbar-main-collapse">
<a href="https://stats.opkode.com/piwik.js">piwik.js</a> <ul class="nav navbar-nav">
<a href="https://github.com/bestiejs/json3">json3</a> <li>
</td> <a href="/docs/html/manual.html">User Manual</a>
</tr> </li>
<tr> <li>
<td> <a href="/docs/html/index.html">Documentation</a>
<a href="https://conversejs.org/analytics.js">analytics.js</a> </li>
</td> <li>
<td> <a href="jslicenses.html" rel="jslicense">Licences</a>
<a href="http://www.mozilla.org/MPL/2.0">MPL-2.0</a> </li>
</td> <li>
<td> <a href="https://github.com/jcbrand/converse.js/releases" class="button" target="_blank" rel="noopener">Download</a>
<a href="https://conversejs.org/analytics.js">analytics.js</a> </li>
</td> </ul>
</tr> </div>
<tr> <!-- /.navbar-collapse -->
<td> </div>
<a href="https://inverse.chat/inverse-analytics.js">inverse-analytics.js</a> <!-- /.container -->
</td> </nav>
<td>
<a href="http://www.mozilla.org/MPL/2.0">MPL-2.0</a> <section class="intro" class="container">
</td> <div class="row">
<td> <h1 class="brand-heading"><i class="icon-conversejs"></i> converse</h1>
<a href="https://inverse.chat/inverse-analytics.js">inverse-analytics.js</a> <div class="col-md-8 col-md-offset-2">
</td> <p class="intro-text">JavaScript Licences</p>
<tr/> </div>
<tr> <div class="col-md-8 col-md-offset-2">
<td> <table id="jslicense-labels1" style="width: 100%">
<a href="https://conversejs.org/src/website.js">website.js</a> <tr>
</td> <td>
<td> <a href="https://cdn.conversejs.org/3.3.1/dist/converse.min.js">converse.min.js</a>
<a href="http://www.mozilla.org/MPL/2.0">MPL-2.0</a> </td>
</td> <td>
<td> <a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a>
<a href="https://github.com/jcbrand/converse.js/blob/master/src/website.js">website.js</a> <br />
</td> <a href="magnet:?xt=urn:btih:e95b018ef3580986a04669f1b5879592219e2a7a&amp;dn=public-domain.txt">Public-Domain</a>
</tr> <br />
</table> <a href="http://www.jclark.com/xml/copying.txt">Expat</a>
</body> </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> </html>