Commit 85375842 authored by JC Brand's avatar JC Brand

Release 7.0.1

parent 93d03106
# Changelog # Changelog
## 7.0.1 (Unreleased) ## 7.0.1 (2020-11-19)
- #2328: Honor `use_system_emojis` in emoji-picker - #2328: Honor `use_system_emojis` in emoji-picker
- Not all *.js files were included in the 7.0.0 package, causing:
`Module not found: Error: Can't resolve 'templates/*.js'`
## 7.0.0 (2020-11-18) ## 7.0.0 (2020-11-18)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* *
* An XMPP chat client that runs in the browser. * An XMPP chat client that runs in the browser.
* *
* Version: 7.0.0 * Version: 7.0.1
* *
* Copyright: JC Brand 2013-2018 * Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies. * Except for 3rd party dependencies.
......
...@@ -68,7 +68,7 @@ serve_bg: node_modules ...@@ -68,7 +68,7 @@ serve_bg: node_modules
dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js @converse/headless node_modules dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js @converse/headless node_modules
npm run nodeps 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.0 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.1 dist/converse-no-dependencies.js -c
src/i18n/converse.pot: dist/converse-no-dependencies.js src/i18n/converse.pot: dist/converse-no-dependencies.js
$(GETTEXT) 2>&1 > /dev/null; exit $$?; $(GETTEXT) 2>&1 > /dev/null; exit $$?;
......
...@@ -2,19 +2,19 @@ ...@@ -2,19 +2,19 @@
1. Check that weblate translations are all merged in 1. Check that weblate translations are all merged in
2. Run `make check` to check that all tests pass. 2. Run `make check` to check that all tests pass.
3. Run `make release VERSION=7.0.0` 3. Run `make release VERSION=7.0.1`
4. Do a `git diff` to check if things look sane. 4. Do a `git diff` to check if things look sane.
5. Do a quick manual test with the `dist` files (via `index.html`) 5. Do a quick manual test with the `dist` files (via `index.html`)
6. `git commit -am "Release 7.0.0"` 6. `git commit -am "Release 7.0.1"`
7. `git tag -s v7.0.0 -m "Release 7.0.0"` 7. `git tag -s v7.0.1 -m "Release 7.0.1"`
8. Run `git push && git push --tags` 8. Run `git push && git push --tags`
9. Update https://conversejs.org 9. Update https://conversejs.org
* `cd /home/conversejs/converse.js` * `cd /home/conversejs/converse.js`
* `git clone --branch v7.0.0 git@github.com:conversejs/converse.js.git 7.0.0` * `git clone --branch v7.0.1 git@github.com:conversejs/converse.js.git 7.0.1`
* `cd 7.0.0 && ASSET_PATH=https://cdn.conversejs.org/7.0.0/dist/ make dist && make doc` * `cd 7.0.1 && ASSET_PATH=https://cdn.conversejs.org/7.0.1/dist/ make dist && make doc`
* `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/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 10. Update release page on Github
11. Run `npm pack` to generate tarballs and upload them to the Github release page 11. Run `npm pack` to generate tarballs and upload them to the Github release page
12. Run `npm publish && cd src/headless/ && npm publish` 12. Run `npm publish && cd src/headless/ && npm publish`
13. Update the repository on weblate 13. Update the repository on weblate
14. Decide on next release number and run `make postrelease VERSION=7.0.1` 14. Decide on next release number and run `make postrelease VERSION=7.0.2`
...@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand' ...@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '7.0.0' version = '7.0.1'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '7.0.0' release = '7.0.1'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -55,16 +55,16 @@ might break when a new backwards-incompatible version of Converse is released. ...@@ -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: To load a specific version of Converse you can put the version in the URL:
* https://cdn.conversejs.org/7.0.0/dist/converse.min.js * https://cdn.conversejs.org/7.0.1/dist/converse.min.js
* https://cdn.conversejs.org/7.0.0/dist/converse.min.css * https://cdn.conversejs.org/7.0.1/dist/converse.min.css
You can include these two URLs inside the *<head>* element of your website You can include these two URLs inside the *<head>* element of your website
via the *script* and *link* tags: via the *script* and *link* tags:
.. code-block:: html .. code-block:: html
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/7.0.0/dist/converse.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/7.0.1/dist/converse.min.css">
<script src="https://cdn.conversejs.org/7.0.0/dist/converse.min.js" charset="utf-8"></script> <script src="https://cdn.conversejs.org/7.0.1/dist/converse.min.js" charset="utf-8"></script>
Option 2: Download the builds from Github Option 2: Download the builds from Github
......
...@@ -11,17 +11,17 @@ ...@@ -11,17 +11,17 @@
<!-- These files are NOT needed when using converse.js in your own project. --> <!-- 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 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.0/css/font-awesome.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.1/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/css/website.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.1/css/website.min.css" />
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <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="/src/website.js"></script>
<script type="text/javascript" src="analytics.js"></script> <script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** --> <!-- *********************************************************************** -->
<![if gte IE 11]> <![if gte IE 11]>
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/css/converse.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.1/css/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script> <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.0/dist/converse.min.js"></script> <script src="https://cdn.conversejs.org/7.0.1/dist/converse.min.js"></script>
<![endif]> <![endif]>
</head> </head>
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<table id="jslicense-labels1" style="width: 100%"> <table id="jslicense-labels1" style="width: 100%">
<tr> <tr>
<td> <td>
<a href="https://cdn.conversejs.org/7.0.0/dist/converse.min.js">converse.min.js</a> <a href="https://cdn.conversejs.org/7.0.1/dist/converse.min.js">converse.min.js</a>
</td> </td>
<td> <td>
<a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a> <a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"short_name": "Converse", "short_name": "Converse",
"name": "Converse Chat", "name": "Converse Chat",
"description": "Messaging Freedom", "description": "Messaging Freedom",
"version": "7.0.0", "version": "7.0.1",
"categories": ["social"], "categories": ["social"],
"icons": [ "icons": [
{ {
......
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
<script type="text/javascript" src="analytics.js"></script> <script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** --> <!-- *********************************************************************** -->
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/dist/converse.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.1/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script> <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.0/dist/converse.min.js"></script> <script src="https://cdn.conversejs.org/7.0.1/dist/converse.min.js"></script>
</head> </head>
<body id="page-top" data-spy="scroll" class="converse-website"> <body id="page-top" data-spy="scroll" class="converse-website">
......
{ {
"name": "converse.js", "name": "converse.js",
"version": "7.0.0", "version": "7.0.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
......
{ {
"name": "converse.js", "name": "converse.js",
"version": "7.0.0", "version": "7.0.1",
"description": "Browser based XMPP chat client", "description": "Browser based XMPP chat client",
"browser": "dist/converse.js", "browser": "dist/converse.js",
"module": "src/converse.js", "module": "src/converse.js",
......
...@@ -268,7 +268,7 @@ export const _converse = { ...@@ -268,7 +268,7 @@ export const _converse = {
} }
_converse.VERSION_NAME = "v7.0.1dev"; _converse.VERSION_NAME = "v7.0.1";
Object.assign(_converse, Events); Object.assign(_converse, Events);
......
{ {
"name": "@converse/headless", "name": "@converse/headless",
"version": "7.0.0", "version": "7.0.1",
"description": "Converse.js Headless build", "description": "Converse.js Headless build",
"author": "cmrd Senya <senya@riseup.net>", "author": "cmrd Senya <senya@riseup.net>",
"homepage": "https://conversejs.org", "homepage": "https://conversejs.org",
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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