Skip to content

Commit

Permalink
Release 6.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbrand committed Feb 13, 2020
1 parent 7f69394 commit 6590a0c
Show file tree
Hide file tree
Showing 16 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 6.0.1 (Unreleased)
## 6.0.1 (2020-02-13)

- Bugfix. Handle stanza that clears the MUC subject
- #1313: Stylistic improvements to the send button
Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* An XMPP chat client that runs in the browser.
*
* Version: 6.0.0
* Version: 6.0.1
*
* Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ serve_bg: stamp-npm
dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js stamp-npm @converse/headless
npm run nodeps

GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=6.0.0 dist/converse-no-dependencies.js -c
GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=6.0.1 dist/converse-no-dependencies.js -c

.PHONY: pot
pot: dist/converse-no-dependencies.js
Expand Down
8 changes: 4 additions & 4 deletions demo/anonymous.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<meta name="author" content="JC Brand" />
<meta name="keywords" content="xmpp chat webchat converse.js" />
<link rel="shortcut icon" type="image/ico" href="../images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/website.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>
<![if gt IE 11]>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
<![endif]>
</head>

Expand Down
6 changes: 3 additions & 3 deletions demo/embedded.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<meta name="author" content="JC Brand" />
<meta name="keywords" content="xmpp chat webchat converse.js" />
<link rel="shortcut icon" type="image/ico" href="../images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/website.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>
<![if gte IE 11]>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
<![endif]>
<style>
.converse-container {
Expand Down
4 changes: 2 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<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>
<![if gte IE 9]>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
<![endif]>
</head>

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '6.0.0'
version = '6.0.1'
# The full version, including alpha/beta/rc tags.
release = '6.0.0'
release = '6.0.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 4 additions & 4 deletions docs/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ might break when a new backwards-incompatible version of Converse is released.

To load a specific version of Converse you can put the version in the URL:

* https://cdn.conversejs.org/6.0.0/dist/converse.min.js
* https://cdn.conversejs.org/6.0.0/dist/converse.min.css
* https://cdn.conversejs.org/6.0.1/dist/converse.min.js
* https://cdn.conversejs.org/6.0.1/dist/converse.min.css

You can include these two URLs inside the *<head>* element of your website
via the *script* and *link* tags:

.. code-block:: html

<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css">
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js" charset="utf-8"></script>
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css">
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js" charset="utf-8"></script>


Option 2: Download the builds from Github
Expand Down
6 changes: 3 additions & 3 deletions fullscreen.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<meta name="description" content="Converse XMPP/Jabber Chat"/>
<meta name="author" content="JC Brand" />
<meta name="keywords" content="xmpp chat webchat converse.js" />
<link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
<link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.1/dist/favicon.ico"/>
<script type="text/javascript" src="inverse-analytics.js"></script>
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=5" style="border:0;" alt="" /></p></noscript>
<link rel="manifest" href="./manifest.json">
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
</head>
<body class="converse-fullscreen">
<noscript>You need to enable JavaScript to run the Converse.js chat app.</noscript>
Expand Down
8 changes: 4 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
<meta name="keywords" content="xmpp chat webchat converse.js Converse" />

<!-- These files are NOT needed when using converse.js in your own project. -->
<link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
<link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.1/dist/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/website.min.css" />
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<script type="text/javascript" src="/src/website.js"></script>
<script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** -->

<link rel="manifest" href="./manifest.json">
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
</head>

<body id="page-top" data-spy="scroll" class="converse-website">
Expand Down
10 changes: 5 additions & 5 deletions jslicenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@

<!-- These files are NOT needed when using converse.js in your own project. -->
<link rel="shortcut icon" type="image/ico" href="images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/css/website.min.css" />
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<script type="text/javascript" src="/src/website.js"></script>
<script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** -->

<![if gte IE 11]>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/css/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
<![endif]>
</head>

Expand Down Expand Up @@ -66,7 +66,7 @@ <h1 class="brand-heading"><i class="icon-conversejs"></i> converse</h1>
<table id="jslicense-labels1" style="width: 100%">
<tr>
<td>
<a href="https://cdn.conversejs.org/6.0.0/dist/converse.min.js">converse.min.js</a>
<a href="https://cdn.conversejs.org/6.0.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>
Expand Down
4 changes: 2 additions & 2 deletions mobile.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** -->

<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/6.0.1/dist/converse.min.js"></script>
</head>

<body id="page-top" data-spy="scroll" class="converse-website">
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "converse.js",
"version": "6.0.0",
"version": "6.0.1",
"description": "Browser based XMPP chat client",
"browser": "dist/converse.js",
"module": "src/converse.js",
Expand Down
2 changes: 1 addition & 1 deletion src/headless/converse-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const _converse = {
'promises': {}
}

_converse.VERSION_NAME = "v6.0.1dev";
_converse.VERSION_NAME = "v6.0.1";

Object.assign(_converse, Backbone.Events);

Expand Down
2 changes: 1 addition & 1 deletion src/headless/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@converse/headless",
"version": "6.0.0",
"version": "6.0.1",
"description": "Converse.js Headless build",
"author": "cmrd Senya <[email protected]>",
"homepage": "https://conversejs.org",
Expand Down

0 comments on commit 6590a0c

Please sign in to comment.