Release 6.0.0

CHANGES.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 6.0.0 (Unreleased)
+## 6.0.0 (2020-01-09)
 
 - [enable_smacks](https://conversejs.org/docs/html/configuration.html#enable-smacks) is not set to `true` by default.
 - Refactor some presence and status handling code from `converse-core` into `@converse/headless/converse-status`.

COPYRIGHT

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

Makefile

@@ -68,7 +68,7 @@ serve_bg: stamp-npm
 dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js stamp-npm @converse/headless
 	npm run nodeps
 
-GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=5.0.4 dist/converse-no-dependencies.js -c
+GETTEXT = $(XGETTEXT) --from-code=UTF-8 --language=JavaScript --keyword=__ --keyword=___ --force-po --output=locale/converse.pot --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=6.0.0 dist/converse-no-dependencies.js -c
 
 .PHONY: pot
 pot: dist/converse-no-dependencies.js

RELEASE.md

@@ -1,19 +1,18 @@
 # Release checklist
 
 1. Run `make check` to check that all tests pass.
-2. Decide on a version number, e.g. 6.0.0
-3. Run `make release VERSION=6.0.0`
-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 6.0.0"`
-7. `git tag -s v6.0.0 -m "Release 6.0.0"`
-8. Run `git push && git push --tags`
-9. Update https://conversejs.org
-10. Create `6.0.0` directory for the CDN.
+2. Run `make release VERSION=6.0.0`
+3. Do a `git diff` to check if things look sane.
+4. Do a quick manual test with the `dist` files (via `index.html`)
+5. `git commit -am "Release 6.0.0"`
+6. `git tag -s v6.0.0 -m "Release 6.0.0"`
+7. Run `git push && git push --tags`
+8. Update https://conversejs.org
+9. Create `6.0.0` directory for the CDN.
     * `cd /home/conversejs/converse.js`
     * `git clone --branch v6.0.0 git@github.com:conversejs/converse.js.git 6.0.0`
     * `cd 6.0.0 && ASSET_PATH=https://cdn.conversejs.org/6.0.0/dist/ make dist`
     * `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist`
-11. Run `npm publish && cd src/headless/ && npm publish`
-12. Update the repository on weblate
-13. Decide on next release number and run `make postrelease VERSION=6.0.1`
+10. Run `npm publish && cd src/headless/ && npm publish`
+11. Update the repository on weblate
+12. Decide on next release number and run `make postrelease VERSION=6.0.1`

demo/anonymous.html

@@ -9,13 +9,13 @@
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="../images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.4/dist/font-awesome.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.4/dist/website.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
     <script type="text/javascript" src="../analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gt IE 11]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.4/dist/converse.min.css" />
-        <script src="https://cdn.conversejs.org/5.0.4/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
+        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
     <![endif]>
 </head>
 

demo/embedded.html

@@ -9,12 +9,12 @@
     <meta name="author" content="JC Brand" />
     <meta name="keywords" content="xmpp chat webchat converse.js" />
     <link rel="shortcut icon" type="image/ico" href="../images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.4/dist/website.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/website.min.css" />
     <script type="text/javascript" src="/analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 11]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.4/dist/converse.min.css" />
-        <script src="https://cdn.conversejs.org/5.0.4/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
+        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
     <![endif]>
     <style>
         .converse-container {

demo/index.html

@@ -14,8 +14,8 @@
     <script type="text/javascript" src="/analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
     <![if gte IE 9]>
-        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.4/dist/converse.min.css" />
-        <script src="https://cdn.conversejs.org/5.0.4/dist/converse.min.js"></script>
+        <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
+        <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
     <![endif]>
 </head>
 

docs/source/conf.py

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

docs/source/quickstart.rst

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

fullscreen.html

@@ -4,13 +4,13 @@
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <title>Converse</title>
-    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/5.0.5/dist/favicon.ico"/>
+    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
     <script type="text/javascript" src="inverse-analytics.js"></script>
     <noscript><p><img src="//stats.opkode.com/piwik.php?idsite=5" style="border:0;" alt="" /></p></noscript>
     <link rel="manifest" href="./manifest.json">
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.5/dist/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
     <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
-    <script src="https://cdn.conversejs.org/5.0.5/dist/converse.min.js"></script>
+    <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
 </head>
 <body class="converse-fullscreen">
 <div id="conversejs-bg"></div>

index.html

@@ -10,17 +10,17 @@
     <meta name="keywords" content="xmpp chat webchat converse.js Converse" />
 
     <!-- These files are NOT needed when using converse.js in your own project. -->
-    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/5.0.5/dist/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.5/dist/website.min.css" />
+    <link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/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>
     <!-- *********************************************************************** -->
 
     <link rel="manifest" href="./manifest.json">
-    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/5.0.5/dist/converse.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
     <script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
-    <script src="https://cdn.conversejs.org/5.0.5/dist/converse.min.js"></script>
+    <script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
 </head>
 
 <body id="page-top" data-spy="scroll" class="converse-website">

jslicenses.html

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

mobile.html

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

src/headless/converse-core.js

@@ -112,7 +112,7 @@ const _converse = {
     'promises': {}
 }
 
-_converse.VERSION_NAME = "v5.0.5dev";
+_converse.VERSION_NAME = "v6.0.0";
 
 Object.assign(_converse, Backbone.Events);
 
@@ -245,7 +245,7 @@ _converse.default_settings = {
     keepalive: true,
     locales: [
         'af', 'ar', 'bg', 'ca', 'cs', 'de', 'eo', 'es', 'eu', 'en', 'fr', 'gl',
-        'he', 'hi', 'hu', 'id', 'it', 'ja', 'nb', 'nl', 'oc',
+        'he', 'hi', 'hu', 'id', 'it', 'ja', 'nb', 'nl', 'mr', 'oc',
         'pl', 'pt', 'pt_BR', 'ro', 'ru', 'tr', 'uk', 'vi', 'zh_CN', 'zh_TW'
     ],
     message_carbons: true,

src/headless/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@converse/headless",
-  "version": "5.0.4",
+  "version": "6.0.0",
   "description": "Converse.js Headless build",
   "author": "cmrd Senya <senya@riseup.net>",
   "homepage": "https://conversejs.org",