Skip to content

C
converse.js
Commit 588b015e authored by JC Brand's avatar JC Brand
Browse files
Options

Release v4.0.5

parent 084b8e93
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
CHANGES.md
View file @ 588b015e
# Changelog # Changelog
## 4.0.5 (Unreleased) ## 4.0.5 (2018-11-15)
- Error `FATAL: TypeError: Cannot read property 'extend' of undefined` when using `embedded` view mode. - Error `FATAL: TypeError: Cannot read property 'extend' of undefined` when using `embedded` view mode.
- Default paths in converse-notifications.js are now relative - Default paths in converse-notifications.js are now relative
......
COPYRIGHT
View file @ 588b015e
...@@ -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.4 * Version: 4.0.5
* *
* Copyright: JC Brand 2013-2018 * Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies. * Except for 3rd party dependencies.
......
Makefile
View file @ 588b015e
...@@ -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.4 -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.0.5 -c
.PHONY: pot .PHONY: pot
pot: dist/converse-no-dependencies-es2015.js pot: dist/converse-no-dependencies-es2015.js
...@@ -84,6 +84,8 @@ po2json: ...@@ -84,6 +84,8 @@ po2json:
.PHONY: release .PHONY: release
release: release:
$(SED) -ri s/_converse.VERSION_NAME = "v[0-9]\+\.[0-9]\+\.[0-9]\+";/ _converse.VERSION_NAME = "$(VERSION)";/ src/headless/converse-core.js
$(SED) -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ COPYRIGHT $(SED) -ri s/Version:\ [0-9]\+\.[0-9]\+\.[0-9]\+/Version:\ $(VERSION)/ COPYRIGHT
$(SED) -ri s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot $(SED) -ri s/Project-Id-Version:\ Converse\.js\ [0-9]\+\.[0-9]\+\.[0-9]\+/Project-Id-Version:\ Converse.js\ $(VERSION)/ locale/converse.pot
$(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json $(SED) -ri s/\"version\":\ \"[0-9]\+\.[0-9]\+\.[0-9]\+\"/\"version\":\ \"$(VERSION)\"/ package.json
......
RELEASE.md
View file @ 588b015e
# 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.2 2. Decide on a version number, e.g. 4.0.6
3. Run `make release VERSION=4.0.2` 3. Run `make release VERSION=4.0.6`
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.2"` 6. `git commit -am "New release 4.0.6"`
7. `git tag -s v4.0.2 7. `git tag -s v4.0.6
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.2` directory for the CDN. 10. Create `4.0.6` 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
......
docs/source/conf.py
View file @ 588b015e
...@@ -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.4' version = '4.0.5'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '4.0.4' release = '4.0.5'
# 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.
......
docs/source/quickstart.rst
View file @ 588b015e
...@@ -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.4/dist/converse.min.js * https://cdn.conversejs.org/4.0.5/dist/converse.min.js
* https://cdn.conversejs.org/4.0.4/css/converse.min.css * https://cdn.conversejs.org/4.0.5/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.4/css/converse.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/4.0.5/css/converse.min.css">
<script src="https://cdn.conversejs.org/4.0.4/dist/converse.min.js" charset="utf-8"></script> <script src="https://cdn.conversejs.org/4.0.5/dist/converse.min.js" charset="utf-8"></script>
Option 2: Building the files yourself Option 2: Building the files yourself
......
package-lock.json
View file @ 588b015e
{ {
"name": "converse.js", "name": "converse.js",
"version": "4.0.4", "version": "4.0.5",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
......
package.json
View file @ 588b015e
{ {
"name": "converse.js", "name": "converse.js",
"version": "4.0.4", "version": "4.0.5",
"description": "Browser based XMPP chat client", "description": "Browser based XMPP chat client",
"main": "dist/converse.js", "main": "dist/converse.js",
"directories": { "directories": {
......
src/headless/package.json
View file @ 588b015e
{ {
"name": "@converse/headless", "name": "@converse/headless",
"version": "4.0.4", "version": "4.0.5",
"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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7