Commit a2f42d27 authored by JC Brand's avatar JC Brand

New release 4.1.0

parent 79990f7e
# Changelog # Changelog
## 4.0.7 (Unreleased) ## 4.1.0 (2019-01-11)
- Bugfix: MUC commands were being ignored - Bugfix: MUC commands were being ignored
- Bugfix: Multiple rooms shown active in the rooms list - Bugfix: Multiple rooms shown active in the rooms list
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* *
* An XMPP chat client that runs in the browser. * An XMPP chat client that runs in the browser.
* *
* Version: 4.0.6 * Version: 4.1.0
* *
* Copyright: JC Brand 2013-2018 * Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies. * Except for 3rd party dependencies.
......
...@@ -65,7 +65,7 @@ serve_bg: dev ...@@ -65,7 +65,7 @@ serve_bg: dev
######################################################################## ########################################################################
## Translation machinery ## Translation machinery
GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.0.6 -c GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.1.0 -c
.PHONY: pot .PHONY: pot
pot: dist/converse-no-dependencies-es2015.js pot: dist/converse-no-dependencies-es2015.js
...@@ -116,9 +116,9 @@ stamp-npm: $(LERNA) package.json package-lock.json src/headless/package.json ...@@ -116,9 +116,9 @@ stamp-npm: $(LERNA) package.json package-lock.json src/headless/package.json
clean: clean:
rm -rf node_modules stamp-npm rm -rf node_modules stamp-npm
rm dist/*.min.js rm dist/*.min.js
rm css/website.min.css rm css/*.min.css
rm css/converse.min.css
rm css/*.map rm css/*.map
rm css/*.zip
rm *.zip rm *.zip
.PHONY: dev .PHONY: dev
......
# Release checklist # Release checklist
1. Run `make check` to check that all tests pass. 1. Run `make check` to check that all tests pass.
2. Decide on a version number, e.g. 4.0.7 2. Decide on a version number, e.g. 5.0.0
3. Run `make release VERSION=4.0.7` 3. Run `make release VERSION=5.0.0`
4. Do a `git diff` to check if things look sane. 4. Do a `git diff` to check if things look sane.
5. Do a quick manual test with the `dist` files (via `index.html`) 5. Do a quick manual test with the `dist` files (via `index.html`)
6. `git commit -am "New release 4.0.7"` 6. `git commit -am "New release 5.0.0"`
7. `git tag -s v4.0.7 7. `git tag -s v5.0.0
8. Run `git push && git push --tags` 8. Run `git push && git push --tags`
9. Update http://conversejs.org 9. Update http://conversejs.org
10. Create `4.0.7` directory for the CDN. 10. Create `5.0.0` directory for the CDN.
* Create a new version for the CDN by copying * Create a new version for the CDN by copying
* Check out the correct tag * Check out the correct tag
* Update `index.html` to point to that version of the CDN * Update `index.html` to point to that version of the CDN
......
This diff is collapsed.
...@@ -62753,7 +62753,7 @@ const _converse = { ...@@ -62753,7 +62753,7 @@ const _converse = {
'templates': {}, 'templates': {},
'promises': {} 'promises': {}
}; };
_converse.VERSION_NAME = "v4.0.6"; _converse.VERSION_NAME = "v4.1.0";
_lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.extend(_converse, Backbone.Events); // Make converse pluggable _lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.extend(_converse, Backbone.Events); // Make converse pluggable
...@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand' ...@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '4.0.6' version = '4.1.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '4.0.6' release = '4.1.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -26,16 +26,16 @@ might break when a new backwards-incompatible version of Converse is released. ...@@ -26,16 +26,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: To load a specific version of Converse you can put the version in the URL:
* https://cdn.conversejs.org/4.0.6/dist/converse.min.js * https://cdn.conversejs.org/4.1.0/dist/converse.min.js
* https://cdn.conversejs.org/4.0.6/css/converse.min.css * https://cdn.conversejs.org/4.1.0/css/converse.min.css
You can include these two URLs inside the *<head>* element of your website You can include these two URLs inside the *<head>* element of your website
via the *script* and *link* tags: via the *script* and *link* tags:
.. code-block:: html .. code-block:: html
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/4.0.6/css/converse.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/4.1.0/css/converse.min.css">
<script src="https://cdn.conversejs.org/4.0.6/dist/converse.min.js" charset="utf-8"></script> <script src="https://cdn.conversejs.org/4.1.0/dist/converse.min.js" charset="utf-8"></script>
Option 2: Building the files yourself Option 2: Building the files yourself
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<!-- These files are NOT needed when using converse.js in your own project. --> <!-- These files are NOT needed when using converse.js in your own project. -->
<link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/> <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
<link type="text/css" rel="stylesheet" media="screen" href="/css/font-awesome.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="/css/font-awesome.css" />
<link type="text/css" rel="stylesheet" media="screen" href="/css/website.css" /> <link type="text/css" rel="stylesheet" media="screen" href="/css/website.css" />
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript> <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="/src/website.js"></script>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{ {
"name": "converse.js", "name": "converse.js",
"version": "4.0.6", "version": "4.1.0",
"description": "Browser based XMPP chat client", "description": "Browser based XMPP chat client",
"main": "dist/converse.js", "main": "dist/converse.js",
"directories": { "directories": {
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
"jed": "1.1.1", "jed": "1.1.1",
"jquery": "3.2.1", "jquery": "3.2.1",
"jsdoc": "^3.5.5", "jsdoc": "^3.5.5",
"lerna": "^3.10.2", "lerna": "^3.10.5",
"lodash-template-loader": "^2.0.0", "lodash-template-loader": "^2.0.0",
"lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader", "lodash-template-webpack-loader": "jcbrand/lodash-template-webpack-loader",
"long": "^3.1.0", "long": "^3.1.0",
......
...@@ -72,7 +72,7 @@ const _converse = { ...@@ -72,7 +72,7 @@ const _converse = {
'promises': {} 'promises': {}
} }
_converse.VERSION_NAME = "v4.0.6"; _converse.VERSION_NAME = "v4.1.0";
_.extend(_converse, Backbone.Events); _.extend(_converse, Backbone.Events);
......
{ {
"name": "@converse/headless", "name": "@converse/headless",
"version": "4.0.6", "version": "4.1.0",
"description": "Converse.js Headless build", "description": "Converse.js Headless build",
"author": "cmrd Senya <senya@riseup.net>", "author": "cmrd Senya <senya@riseup.net>",
"homepage": "https://github.com/conversejs/converse.js", "homepage": "https://github.com/conversejs/converse.js",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment