From f8935e0b721a08bad8e019f05607a20d5878470c Mon Sep 17 00:00:00 2001 From: JC Brand Date: Fri, 15 Mar 2024 08:02:41 +0200 Subject: [PATCH] Release 10.1.7 --- CHANGES.md | 2 +- COPYRIGHT | 2 +- Makefile | 2 +- RELEASE.md | 12 ++++++------ docs/source/conf.py | 4 ++-- docs/source/quickstart.rst | 8 ++++---- jslicenses.html | 10 +++++----- manifest.json | 2 +- mobile.html | 4 ++-- package-lock.json | 2 +- src/headless/package.json | 2 +- src/headless/shared/constants.js | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7525a7b448..a08017ec4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changelog -## 10.1.7 (Unreleased) +## 10.1.7 (2024-03-15) - Update to Strophe 2.0.0. Fixes login issue with newer versions of Ejabberd diff --git a/COPYRIGHT b/COPYRIGHT index 7c0b4223b9..dc06e1486b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ * * An XMPP chat client that runs in the browser. * - * Version: 10.1.6 + * Version: 10.1.7 * * Copyright: JC Brand 2013-2018 * Except for 3rd party dependencies. diff --git a/Makefile b/Makefile index bdce09b688..0f3eb4820e 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ certs: ######################################################################## ## Translation machinery -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.6 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.7 dist/converse-no-dependencies.js -c src/i18n/converse.pot: dist/converse-no-dependencies.js $(GETTEXT) 2>&1 > /dev/null; exit $$?; diff --git a/RELEASE.md b/RELEASE.md index c5b649c29b..165d420eb0 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -2,17 +2,17 @@ 1. Merge weblate translations: https://hosted.weblate.org/projects/conversejs/translations/#repository 2. Run `make check` to check that all tests pass. -3. Run `make version VERSION=10.1.6` +3. Run `make version VERSION=10.1.7` 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.6"` -7. `git tag -s v10.1.6 -m "Release 10.1.6"` -8. `git push && git push origin v10.1.6` -9. `make publish BRANCH=v10.1.6` +6. `git commit -am "Release 10.1.7"` +7. `git tag -s v10.1.7 -m "Release 10.1.7"` +8. `git push && git push origin v10.1.7` +9. `make publish BRANCH=v10.1.7` 10. Update release page on Github * Upload tar files 11. Update https://conversejs.org * `cd /home/conversejs/converse.js` - * `make deploy VERSION=10.1.6` + * `make deploy VERSION=10.1.7` 12. Update the repository on weblate 13. Decide on next release number and run `make postrelease VERSION=10.1.7` diff --git a/docs/source/conf.py b/docs/source/conf.py index 850b6c03c9..ba4e65699d 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '10.1.6' +version = '10.1.7' # The full version, including alpha/beta/rc tags. -release = '10.1.6' +release = '10.1.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst index 41b7a314de..68c1d6a9ac 100644 --- a/docs/source/quickstart.rst +++ b/docs/source/quickstart.rst @@ -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.6/dist/converse.min.js -* https://cdn.conversejs.org/10.1.6/dist/converse.min.css +* https://cdn.conversejs.org/10.1.7/dist/converse.min.js +* https://cdn.conversejs.org/10.1.7/dist/converse.min.css You can include these two URLs inside the ** element of your website via the *script* and *link* tags: .. code-block:: html - - + + Option 2: Download the builds from Github diff --git a/jslicenses.html b/jslicenses.html index c9b702bf10..5f701eda95 100644 --- a/jslicenses.html +++ b/jslicenses.html @@ -11,17 +11,17 @@ - - + + - + - + @@ -66,7 +66,7 @@

converse

- converse.min.js + converse.min.js MPL-2.0 diff --git a/manifest.json b/manifest.json index 6687535e24..07b1c76dca 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "short_name": "Converse", "name": "Converse Chat", "description": "Messaging Freedom", - "version": "10.1.6", + "version": "10.1.7", "categories": ["social"], "icons": [ { diff --git a/mobile.html b/mobile.html index 9a51254b1b..75d2bc2e83 100644 --- a/mobile.html +++ b/mobile.html @@ -19,9 +19,9 @@ - + - + diff --git a/package-lock.json b/package-lock.json index ac1d360859..d844ab039c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11425,7 +11425,7 @@ }, "src/headless": { "name": "@converse/headless", - "version": "10.1.6", + "version": "10.1.7", "license": "MPL-2.0", "dependencies": { "@converse/openpromise": "^0.0.1", diff --git a/src/headless/package.json b/src/headless/package.json index 8b1959cfd3..417433af62 100644 --- a/src/headless/package.json +++ b/src/headless/package.json @@ -1,6 +1,6 @@ { "name": "@converse/headless", - "version": "10.1.6", + "version": "10.1.7", "description": "Converse.js Headless build", "author": "JC Brand ", "contributors": [ diff --git a/src/headless/shared/constants.js b/src/headless/shared/constants.js index 18a323049f..7a84e7ebdc 100644 --- a/src/headless/shared/constants.js +++ b/src/headless/shared/constants.js @@ -1,7 +1,7 @@ import { Strophe } from 'strophe.js'; export const BOSH_WAIT = 59; -export const VERSION_NAME = "v10.1.6"; +export const VERSION_NAME = "v10.1.7"; export const STATUS_WEIGHTS = { offline: 6,