diff --git a/CHANGES.md b/CHANGES.md index a74deb0c04..31b4af3a75 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changelog -## 7.0.3 (Unreleased) +## 7.0.3 (2020-12-02) - Bugfix: `null` inserted by emoji picker and can't switch between skintones diff --git a/COPYRIGHT b/COPYRIGHT index 3a931632f6..0cfafd50d9 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ * * An XMPP chat client that runs in the browser. * - * Version: 7.0.2 + * Version: 7.0.3 * * Copyright: JC Brand 2013-2018 * Except for 3rd party dependencies. diff --git a/Makefile b/Makefile index aa617e3c5c..b74afcf27a 100644 --- a/Makefile +++ b/Makefile @@ -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.2 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.3 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 92a6f9ea10..1802423312 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -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.2` +3. Run `make release VERSION=7.0.3` 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.2"` -7. `git tag -s v7.0.2 -m "Release 7.0.2"` +6. `git commit -am "Release 7.0.3"` +7. `git tag -s v7.0.3 -m "Release 7.0.3"` 8. Run `git push && git push --tags` 9. Update https://conversejs.org * `cd /home/conversejs/converse.js` - * `git clone --branch v7.0.2 git@github.com:conversejs/converse.js.git 7.0.2` - * `cd 7.0.2 && ASSET_PATH=https://cdn.conversejs.org/7.0.2/dist/ make dist && make doc` + * `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` * `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.3` +14. Decide on next release number and run `make postrelease VERSION=7.0.4` diff --git a/docs/source/conf.py b/docs/source/conf.py index 64d06718bb..46b50d5319 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -48,9 +48,9 @@ # built documents. # # The short X.Y version. -version = '7.0.2' +version = '7.0.3' # The full version, including alpha/beta/rc tags. -release = '7.0.2' +release = '7.0.3' # 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 1eab1e07ce..6f935b9b59 100644 --- a/docs/source/quickstart.rst +++ b/docs/source/quickstart.rst @@ -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.2/dist/converse.min.js -* https://cdn.conversejs.org/7.0.2/dist/converse.min.css +* https://cdn.conversejs.org/7.0.3/dist/converse.min.js +* https://cdn.conversejs.org/7.0.3/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 4e1ebf2a4f..3606a5d936 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 627de23f26..d080a37b3b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "short_name": "Converse", "name": "Converse Chat", "description": "Messaging Freedom", - "version": "7.0.2", + "version": "7.0.3", "categories": ["social"], "icons": [ { diff --git a/mobile.html b/mobile.html index 7e0721b382..2bd1f59a14 100644 --- a/mobile.html +++ b/mobile.html @@ -18,9 +18,9 @@ - + - + diff --git a/package-lock.json b/package-lock.json index c472550e2b..9ba1c7d0d2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "converse.js", - "version": "7.0.2", + "version": "7.0.3", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -8017,9 +8017,9 @@ } }, "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" + "version": "2.6.12", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz", + "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==" }, "core-js-compat": { "version": "3.6.5", diff --git a/package.json b/package.json index edaad6c860..3f4dcd2718 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "converse.js", - "version": "7.0.2", + "version": "7.0.3", "description": "Browser based XMPP chat client", "browser": "dist/converse.js", "module": "src/converse.js", diff --git a/src/headless/converse-core.js b/src/headless/converse-core.js index 0d400148d1..1c90711d5e 100644 --- a/src/headless/converse-core.js +++ b/src/headless/converse-core.js @@ -268,7 +268,7 @@ export const _converse = { } -_converse.VERSION_NAME = "v7.0.2"; +_converse.VERSION_NAME = "v7.0.3"; Object.assign(_converse, Events); diff --git a/src/headless/package.json b/src/headless/package.json index efd8d5a57d..11e6d533a6 100644 --- a/src/headless/package.json +++ b/src/headless/package.json @@ -1,6 +1,6 @@ { "name": "@converse/headless", - "version": "7.0.2", + "version": "7.0.3", "description": "Converse.js Headless build", "author": "cmrd Senya ", "homepage": "https://conversejs.org",