diff --git a/CHANGES.md b/CHANGES.md index 1994f452b..fd62a5e55 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -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 diff --git a/COPYRIGHT b/COPYRIGHT index d0f9f3591..9fe32e540 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -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. diff --git a/Makefile b/Makefile index 2b80491b4..782b12916 100644 --- a/Makefile +++ b/Makefile @@ -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 $$?; diff --git a/RELEASE.md b/RELEASE.md index e4690775d..10fbffb55 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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` diff --git a/docs/source/conf.py b/docs/source/conf.py index 77042d2f0..6c556e4a9 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -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. diff --git a/docs/source/quickstart.rst b/docs/source/quickstart.rst index 32822a5d5..6c9038ac6 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.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 ** 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 56ceeacae..3f3590fae 100644 --- a/jslicenses.html +++ b/jslicenses.html @@ -11,17 +11,17 @@ - - + + - + - + @@ -66,7 +66,7 @@
- converse.min.js + converse.min.js MPL-2.0 diff --git a/manifest.json b/manifest.json index f40cebe95..bd13948af 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "short_name": "Converse", "name": "Converse Chat", "description": "Messaging Freedom", - "version": "10.1.1", + "version": "10.1.2", "categories": ["social"], "icons": [ { diff --git a/mobile.html b/mobile.html index 8f0761eff..9c8634969 100644 --- a/mobile.html +++ b/mobile.html @@ -19,9 +19,9 @@ - + - + diff --git a/package-lock.json b/package-lock.json index 1e9b483ad..3158eaac7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index 58776074c..8e5141fbc 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/src/headless/core.js b/src/headless/core.js index a5bfe9b09..3f179248c 100644 --- a/src/headless/core.js +++ b/src/headless/core.js @@ -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); diff --git a/src/headless/package.json b/src/headless/package.json index ca3c1c7e4..bf85bc3a2 100644 --- a/src/headless/package.json +++ b/src/headless/package.json @@ -1,6 +1,6 @@ { "name": "@converse/headless", - "version": "10.1.1", + "version": "10.1.2", "description": "Converse.js Headless build", "author": { "name": "JC Brand",