Release 10.1.2

This commit is contained in:
JC Brand 2023-02-17 11:56:30 +01:00
parent 5e3139f563
commit 7dcdaa705e
13 changed files with 29 additions and 29 deletions

View File

@ -1,6 +1,6 @@
# Changelog
## 10.1.2 (Unreleased)
## 10.1.2 (2023-02-17)
- #1490: Busy-loop when fetching registration form fails
- #1556: Can't switch to registration form afrer logout

View File

@ -2,7 +2,7 @@
*
* An XMPP chat client that runs in the browser.
*
* Version: 10.1.1
* Version: 10.1.2
*
* Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies.

View File

@ -66,7 +66,7 @@ serve_bg: node_modules
dist/converse-no-dependencies.js: src webpack/webpack.common.js webpack/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=10.1.1 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=10.1.2 dist/converse-no-dependencies.js -c
src/i18n/converse.pot: dist/converse-no-dependencies.js
$(GETTEXT) 2>&1 > /dev/null; exit $$?;

View File

@ -2,16 +2,16 @@
1. Check that weblate translations are all merged in
2. Run `make check` to check that all tests pass.
3. Run `make release VERSION=10.1.1`
3. Run `make release VERSION=10.1.2`
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 10.1.1"`
7. `git tag -s v10.1.1 -m "Release 10.1.1"`
8. Run `git push && git push origin v10.1.1`
6. `git commit -am "Release 10.1.2"`
7. `git tag -s v10.1.2 -m "Release 10.1.2"`
8. Run `git push && git push origin v10.1.2`
9. Update https://conversejs.org
* `cd /home/conversejs/converse.js`
* `git clone --branch v10.1.1 git@github.com:conversejs/converse.js.git 10.1.1`
* `cd 10.1.1 && nvm install && ASSET_PATH=https://cdn.conversejs.org/10.1.1/dist/ make dist && make doc`
* `git clone --branch v10.1.2 git@github.com:conversejs/converse.js.git 10.1.2`
* `cd 10.1.2 && nvm install && ASSET_PATH=https://cdn.conversejs.org/10.1.2/dist/ make dist && make doc`
* `cd .. && git pull && nvm install && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist && make doc`
10. Update release page on Github
11. Run `npm publish && cd src/headless/ && npm publish`

View File

@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
# built documents.
#
# The short X.Y version.
version = '10.1.1'
version = '10.1.2'
# The full version, including alpha/beta/rc tags.
release = '10.1.1'
release = '10.1.2'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View File

@ -56,16 +56,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/10.1.1/dist/converse.min.js
* https://cdn.conversejs.org/10.1.1/dist/converse.min.css
* https://cdn.conversejs.org/10.1.2/dist/converse.min.js
* https://cdn.conversejs.org/10.1.2/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/10.1.1/dist/converse.min.css">
<script src="https://cdn.conversejs.org/10.1.1/dist/converse.min.js" charset="utf-8"></script>
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/10.1.2/dist/converse.min.css">
<script src="https://cdn.conversejs.org/10.1.2/dist/converse.min.js" charset="utf-8"></script>
Option 2: Download the builds from Github

View File

@ -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/10.1.1/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.1/css/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.2/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.2/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/10.1.1/css/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.2/css/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/10.1.1/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/10.1.2/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/10.1.1/dist/converse.min.js">converse.min.js</a>
<a href="https://cdn.conversejs.org/10.1.2/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>

View File

@ -2,7 +2,7 @@
"short_name": "Converse",
"name": "Converse Chat",
"description": "Messaging Freedom",
"version": "10.1.1",
"version": "10.1.2",
"categories": ["social"],
"icons": [
{

View File

@ -19,9 +19,9 @@
<script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** -->
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.1/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.2/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/10.1.1/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/10.1.2/dist/converse.min.js"></script>
</head>
<body id="page-top" data-spy="scroll" class="converse-website">

6
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "converse.js",
"version": "10.1.1",
"version": "10.1.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "converse.js",
"version": "10.1.1",
"version": "10.1.2",
"license": "MPL-2.0",
"workspaces": [
"src/headless"
@ -16832,7 +16832,7 @@
},
"src/headless": {
"name": "@converse/headless",
"version": "10.1.1",
"version": "10.1.2",
"license": "MPL-2.0",
"dependencies": {
"@converse/openpromise": "^0.0.1",

View File

@ -1,6 +1,6 @@
{
"name": "converse.js",
"version": "10.1.1",
"version": "10.1.2",
"description": "Browser based XMPP chat client",
"browser": "dist/converse.js",
"module": "src/converse.js",

View File

@ -79,7 +79,7 @@ Strophe.addNamespace('VCARDUPDATE', 'vcard-temp:x:update');
Strophe.addNamespace('XFORM', 'jabber:x:data');
Strophe.addNamespace('XHTML', 'http://www.w3.org/1999/xhtml');
_converse.VERSION_NAME = "v10.1.1";
_converse.VERSION_NAME = "v10.1.2";
Object.assign(_converse, Events);

View File

@ -1,6 +1,6 @@
{
"name": "@converse/headless",
"version": "10.1.1",
"version": "10.1.2",
"description": "Converse.js Headless build",
"author": {
"name": "JC Brand",