Skip to content

Commit

Permalink
Prepare release 8.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbrand committed Sep 3, 2021
1 parent 8f2f3e6 commit c03bc7d
Show file tree
Hide file tree
Showing 51 changed files with 38,814 additions and 34,848 deletions.
4 changes: 2 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 8.0.0 (Unreleased)
## 8.0.0 (2021-09-03)

- Requires Node 12 or above

Expand Down Expand Up @@ -73,7 +73,7 @@ The `api.chatviews` and `api.roomviews` API groupings and methods have been
removed. The original "views" don't really exist anymore, the UI is now composed web
components which should update reactively based on changes made on the models.

## 7.0.6 (unreleased)
## 7.0.6 (2021-06-11)

- #2500: Wrong assignment in OMEMO code

Expand Down
2 changes: 1 addition & 1 deletion COPYRIGHT
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*
* An XMPP chat client that runs in the browser.
*
* Version: 7.0.2
* Version: 8.0.0
*
* Copyright: JC Brand 2013-2018
* Except for 3rd party dependencies.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ po:

.PHONY: release
release:
$(SED) -i '/^_converse.VERSION_NAME =/s/=.*/= "v$(VERSION)";/' src/headless/converse-core.js
$(SED) -i '/^_converse.VERSION_NAME =/s/=.*/= "v$(VERSION)";/' src/headless/core.js
$(SED) -i '/Version:/s/:.*/: $(VERSION)/' COPYRIGHT
$(SED) -i '/Project-Id-Version:/s/:.*/: Converse.js $(VERSION)\n"/' src/i18n/converse.pot
$(SED) -i '/"version":/s/:.*/: "$(VERSION)",/' manifest.json
Expand Down
12 changes: 6 additions & 6 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

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=8.0.1`
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"`
8. Run `git push && git push origin v7.0.2`
6. `git commit -am "Release 8.0.1"`
7. `git tag -s v8.0.1 -m "Release 8.0.1"`
8. Run `git push && git push origin v8.0.1`
9. Update https://conversejs.org
* `cd /home/conversejs/converse.js`
* `git clone --branch v7.0.2 [email protected]: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 v8.0.1 [email protected]:conversejs/converse.js.git 8.0.1`
* `cd 8.0.1 && ASSET_PATH=https://cdn.conversejs.org/8.0.1/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
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
# built documents.
#
# The short X.Y version.
version = '7.0.2'
version = '8.0.0'
# The full version, including alpha/beta/rc tags.
release = '7.0.2'
release = '8.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
8 changes: 4 additions & 4 deletions docs/source/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/8.0.0/dist/converse.min.js
* https://cdn.conversejs.org/8.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/7.0.2/dist/converse.min.css">
<script src="https://cdn.conversejs.org/7.0.2/dist/converse.min.js" charset="utf-8"></script>
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/8.0.0/dist/converse.min.css">
<script src="https://cdn.conversejs.org/8.0.0/dist/converse.min.js" charset="utf-8"></script>


Option 2: Download the builds from Github
Expand Down
10 changes: 5 additions & 5 deletions jslicenses.html
Original file line number Diff line number Diff line change
Expand Up @@ -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/7.0.2/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.2/css/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/8.0.0/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/8.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/7.0.2/css/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/8.0.0/css/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.2/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/8.0.0/dist/converse.min.js"></script>
<![endif]>
</head>

Expand Down Expand Up @@ -66,7 +66,7 @@ <h1 class="brand-heading"><i class="icon-conversejs"></i> converse</h1>
<table id="jslicense-labels1" style="width: 100%">
<tr>
<td>
<a href="https://cdn.conversejs.org/7.0.2/dist/converse.min.js">converse.min.js</a>
<a href="https://cdn.conversejs.org/8.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>
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"short_name": "Converse",
"name": "Converse Chat",
"description": "Messaging Freedom",
"version": "7.0.2",
"version": "8.0.0",
"categories": ["social"],
"icons": [
{
Expand Down
4 changes: 2 additions & 2 deletions mobile.html
Original file line number Diff line number Diff line change
Expand Up @@ -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/7.0.2/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/8.0.0/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/7.0.2/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/8.0.0/dist/converse.min.js"></script>
</head>

<body id="page-top" data-spy="scroll" class="converse-website">
Expand Down
Loading

0 comments on commit c03bc7d

Please sign in to comment.