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,9 +1,65 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang=en> <html lang=en>
<head> <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> </head>
<body>
<table id="jslicense-labels1"> <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> <tr>
<td> <td>
<a href="https://cdn.conversejs.org/3.3.1/dist/converse.min.js">converse.min.js</a> <a href="https://cdn.conversejs.org/3.3.1/dist/converse.min.js">converse.min.js</a>
@ -70,5 +126,8 @@
</td> </td>
</tr> </tr>
</table> </table>
</div>
</div>
</section>
</body> </body>
</html> </html>