diff --git a/CHANGES.md b/CHANGES.md index d7192a533..0e60dbb3f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,8 +1,9 @@ # Changelog -## 10.1.6 (Unreleased) +## 10.1.6 (2023-08-31) - #3246: Badge color not responsive to dark theme +- Fix a GIF rendering bug that causes a memory overflow ## 10.1.5 (2023-06-29) diff --git a/COPYRIGHT b/COPYRIGHT index 63cbc473d..7c0b4223b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -2,7 +2,7 @@ * * An XMPP chat client that runs in the browser. * - * Version: 10.1.5 + * Version: 10.1.6 * * Copyright: JC Brand 2013-2018 * Except for 3rd party dependencies. diff --git a/Makefile b/Makefile index 5597a28ad..bdce09b68 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.5 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.6 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 052eefd56..c5b649c29 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.5` +3. Run `make version VERSION=10.1.6` 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.5"` -7. `git tag -s v10.1.5 -m "Release 10.1.5"` -8. `git push && git push origin v10.1.5` -9. `make publish BRANCH=v10.1.5` +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` 10. Update release page on Github * Upload tar files 11. Update https://conversejs.org * `cd /home/conversejs/converse.js` - * `make deploy VERSION=10.1.5` + * `make deploy VERSION=10.1.6` 12. Update the repository on weblate -13. Decide on next release number and run `make postrelease VERSION=10.1.6` +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 688c3d3c2..850b6c03c 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.5' +version = '10.1.6' # The full version, including alpha/beta/rc tags. -release = '10.1.5' +release = '10.1.6' # 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 51f3ec6f1..41b7a314d 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.5/dist/converse.min.js -* https://cdn.conversejs.org/10.1.5/dist/converse.min.css +* https://cdn.conversejs.org/10.1.6/dist/converse.min.js +* https://cdn.conversejs.org/10.1.6/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 0dfa0e150..c9b702bf1 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 9c6a911e4..6687535e2 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "short_name": "Converse", "name": "Converse Chat", "description": "Messaging Freedom", - "version": "10.1.5", + "version": "10.1.6", "categories": ["social"], "icons": [ { diff --git a/mobile.html b/mobile.html index 5d8d1fe9c..9a51254b1 100644 --- a/mobile.html +++ b/mobile.html @@ -19,9 +19,9 @@ - + - + diff --git a/package-lock.json b/package-lock.json index bcc78b0b8..29f0140e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "converse.js", - "version": "10.1.5", + "version": "10.1.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "converse.js", - "version": "10.1.5", + "version": "10.1.6", "license": "MPL-2.0", "workspaces": [ "src/headless" @@ -11249,7 +11249,7 @@ }, "src/headless": { "name": "@converse/headless", - "version": "10.1.5", + "version": "10.1.6", "license": "MPL-2.0", "dependencies": { "@converse/openpromise": "^0.0.1", diff --git a/package.json b/package.json index f9948883b..6a18bebd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "converse.js", - "version": "10.1.5", + "version": "10.1.6", "description": "Browser based XMPP chat client", "browser": "dist/converse.js", "module": "src/index.js", diff --git a/src/headless/package.json b/src/headless/package.json index 1d67485de..54d16b4a1 100644 --- a/src/headless/package.json +++ b/src/headless/package.json @@ -1,6 +1,6 @@ { "name": "@converse/headless", - "version": "10.1.5", + "version": "10.1.6", "description": "Converse.js Headless build", "author": "JC Brand ", "contributors": [ diff --git a/src/headless/shared/constants.js b/src/headless/shared/constants.js index ed04561ec..c4d5f24ec 100644 --- a/src/headless/shared/constants.js +++ b/src/headless/shared/constants.js @@ -1,7 +1,7 @@ import { Strophe } from 'strophe.js/src/strophe'; export const BOSH_WAIT = 59; -export const VERSION_NAME = "v10.1.5"; +export const VERSION_NAME = "v10.1.6"; export const STATUS_WEIGHTS = { offline: 6, diff --git a/src/i18n/de/LC_MESSAGES/converse.po b/src/i18n/de/LC_MESSAGES/converse.po index 9cad1efee..56295369e 100644 --- a/src/i18n/de/LC_MESSAGES/converse.po +++ b/src/i18n/de/LC_MESSAGES/converse.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: Converse.js 0.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-06-23 10:10+0200\n" -"PO-Revision-Date: 2023-02-19 20:17+0000\n" -"Last-Translator: nautilusx \n" +"PO-Revision-Date: 2023-08-16 01:15+0000\n" +"Last-Translator: W L \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=n != 1;t st\n" "X-Generator: Weblate 4.16-dev\n" "domain: converse\n" "lang: de\n" @@ -1380,7 +1380,7 @@ msgstr "Benutzername" #: dist/converse-no-dependencies.js:99532 msgid "user@domain" -msgstr "user@domain" +msgstr "nutzer@domain" #: dist/converse-no-dependencies.js:99538 msgid "Disconnected"