Commit 57eafb8e authored by JC Brand's avatar JC Brand

Release 7.0.4

parent 742408f8
......@@ -2,7 +2,7 @@
*
* An XMPP chat client that runs in the browser.
*
* Version: 7.0.3
* Version: 7.0.4
*
* Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies.
......
......@@ -68,7 +68,7 @@ serve_bg: node_modules
dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js @converse/headless node_modules
npm run nodeps
GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=src/i18n/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=7.0.3 dist/converse-no-dependencies.js -c
GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --keyword=i18n_ --force-po --output=src/i18n/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=7.0.4 dist/converse-no-dependencies.js -c
src/i18n/converse.pot: dist/converse-no-dependencies.js
$(GETTEXT) 2>&1 > /dev/null; exit $$?;
......
......@@ -2,19 +2,19 @@
1. Check that weblate translations are all merged in
2. Run `make check` to check that all tests pass.
3. Run `make release VERSION=7.0.3`
3. Run `make release VERSION=7.0.4`
4. Do a `git diff` to check if things look sane.
5. Do a quick manual test with the `dist` files (via `index.html`)
6. `git commit -am "Release 7.0.3"`
7. `git tag -s v7.0.3 -m "Release 7.0.3"`
6. `git commit -am "Release 7.0.4"`
7. `git tag -s v7.0.4 -m "Release 7.0.4"`
8. Run `git push && git push --tags`
9. Update https://conversejs.org
* `cd /home/conversejs/converse.js`
* `git clone --branch v7.0.3 git@github.com:conversejs/converse.js.git 7.0.3`
* `cd 7.0.3 && ASSET_PATH=https://cdn.conversejs.org/7.0.3/dist/ make dist && make doc`
* `git clone --branch v7.0.4 git@github.com:conversejs/converse.js.git 7.0.4`
* `cd 7.0.4 && ASSET_PATH=https://cdn.conversejs.org/7.0.4/dist/ make dist && make doc`
* `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist && make doc`
10. Update release page on Github
11. Run `npm pack && cd src/headless && npm pack` to generate tarballs. Then upload them to the Github release page
12. Run `npm publish && cd src/headless/ && npm publish`
13. Update the repository on weblate
14. Decide on next release number and run `make postrelease VERSION=7.0.4`
14. Decide on next release number and run `make postrelease VERSION=7.0.5`
......@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
# built documents.
#
# The short X.Y version.
version = '7.0.3'
version = '7.0.4'
# The full version, including alpha/beta/rc tags.
release = '7.0.3'
release = '7.0.4'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -55,16 +55,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/7.0.3/dist/converse.min.js
* https://cdn.conversejs.org/7.0.3/dist/converse.min.css
* https://cdn.conversejs.org/7.0.4/dist/converse.min.js
* https://cdn.conversejs.org/7.0.4/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/7.0.3/dist/converse.min.css">
<script src="https://cdn.conversejs.org/7.0.3/dist/converse.min.js" charset="utf-8"></script>
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/7.0.4/dist/converse.min.css">
<script src="https://cdn.conversejs.org/7.0.4/dist/converse.min.js" charset="utf-8"></script>
Option 2: Download the builds from Github
......
......@@ -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="/dist/favicon.ico"/>
<link rel="shortcut icon" type="image/ico" href="./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="/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="./dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="/dist/converse.min.js"></script>
<script src="./dist/converse.min.js"></script>
</head>
<body class="converse-fullscreen">
<noscript>You need to enable JavaScript to run the Converse.js chat app.</noscript>
......
......@@ -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/7.0.3/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.3/css/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.4/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.4/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/7.0.3/css/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.4/css/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.3/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.4/dist/converse.min.js"></script>
<![endif]>
</head>
......@@ -66,7 +66,7 @@
<table id="jslicense-labels1" style="width: 100%">
<tr>
<td>
<a href="https://cdn.conversejs.org/7.0.3/dist/converse.min.js">converse.min.js</a>
<a href="https://cdn.conversejs.org/7.0.4/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>
......
......@@ -2,7 +2,7 @@
"short_name": "Converse",
"name": "Converse Chat",
"description": "Messaging Freedom",
"version": "7.0.3",
"version": "7.0.4",
"categories": ["social"],
"icons": [
{
......
......@@ -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/7.0.3/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.4/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.3/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.4/dist/converse.min.js"></script>
</head>
<body id="page-top" data-spy="scroll" class="converse-website">
......
{
"name": "converse.js",
"version": "7.0.3",
"version": "7.0.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "converse.js",
"version": "7.0.3",
"version": "7.0.4",
"description": "Browser based XMPP chat client",
"browser": "dist/converse.js",
"module": "src/converse.js",
......
......@@ -268,7 +268,7 @@ export const _converse = {
}
_converse.VERSION_NAME = "v7.0.3";
_converse.VERSION_NAME = "v7.0.4";
Object.assign(_converse, Events);
......
{
"name": "@converse/headless",
"version": "7.0.3",
"version": "7.0.4",
"description": "Converse.js Headless build",
"author": "cmrd Senya <senya@riseup.net>",
"homepage": "https://conversejs.org",
......
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