Skip to content

Commit 357cad8

Browse files
jcbrandjcbrand
committed
Release 7.0.0
1 parent 74ee783 commit 357cad8

File tree

49 files changed

+24146
-23694
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+24146
-23694
lines changed

‎CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Changelog
22

3-
## 7.0.0 (Unreleased)
3+
## 7.0.0 (2020-11-18)
44

55
*Note for plugin authors:*
66
configuration settings should now be accessed via `_converse.api.settings.get` and not directly on the `_converse` object.

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
*
33
* An XMPP chat client that runs in the browser.
44
*
5-
* Version: 6.0.0
5+
* Version: 7.0.0
66
*
77
* Copyright: JC Brand 2013-2018
88
* Except for 3rd party dependencies.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ serve_bg: node_modules
6868
dist/converse-no-dependencies.js: src webpack.common.js webpack.nodeps.js @converse/headless node_modules
6969
npm run nodeps
7070

71-
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=6.0.0 dist/converse-no-dependencies.js -c
71+
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=7.0.0 dist/converse-no-dependencies.js -c
7272

7373
src/i18n/converse.pot: dist/converse-no-dependencies.js
7474
$(GETTEXT) 2>&1 > /dev/null; exit $$?;

‎RELEASE.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
# Release checklist
22

33
1. Run `make check` to check that all tests pass.
4-
2. Run `make release VERSION=6.0.1`
4+
2. Run `make release VERSION=7.0.0`
55
3. Do a `git diff` to check if things look sane.
66
4. Do a quick manual test with the `dist` files (via `index.html`)
7-
5. `git commit -am "Release 6.0.1"`
8-
6. `git tag -s v6.0.1 -m "Release 6.0.1"`
7+
5. `git commit -am "Release 7.0.0"`
8+
6. `git tag -s v7.0.0 -m "Release 7.0.0"`
99
7. Run `git push && git push --tags`
1010
8. Update https://conversejs.org
1111
* `cd /home/conversejs/converse.js`
12-
* `git clone --branch v6.0.1 git@github.com:conversejs/converse.js.git 6.0.1`
13-
* `cd 6.0.1 && ASSET_PATH=https://cdn.conversejs.org/6.0.1/dist/ make dist`
12+
* `git clone --branch v7.0.0 git@github.com:conversejs/converse.js.git 7.0.0`
13+
* `cd 7.0.0 && ASSET_PATH=https://cdn.conversejs.org/7.0.0/dist/ make dist`
1414
* `cd .. && git pull && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist`
1515
9. Update release page on Github
1616
11. Run `npm publish && cd src/headless/ && npm publish`
1717
12. Update the repository on weblate
18-
13. Decide on next release number and run `make postrelease VERSION=6.0.2`
18+
13. Decide on next release number and run `make postrelease VERSION=7.0.1`

‎docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
# built documents.
4949
#
5050
# The short X.Y version.
51-
version = '6.0.0'
51+
version = '7.0.0'
5252
# The full version, including alpha/beta/rc tags.
53-
release = '6.0.0'
53+
release = '7.0.0'
5454

5555
# The language for content autogenerated by Sphinx. Refer to documentation
5656
# for a list of supported languages.

‎docs/source/quickstart.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ might break when a new backwards-incompatible version of Converse is released.
5555

5656
To load a specific version of Converse you can put the version in the URL:
5757

58-
* https://cdn.conversejs.org/6.0.0/dist/converse.min.js
59-
* https://cdn.conversejs.org/6.0.0/dist/converse.min.css
58+
* https://cdn.conversejs.org/7.0.0/dist/converse.min.js
59+
* https://cdn.conversejs.org/7.0.0/dist/converse.min.css
6060

6161
You can include these two URLs inside the *<head>* element of your website
6262
via the *script* and *link* tags:
6363

6464
.. code-block:: html
6565

66-
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css">
67-
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js" charset="utf-8"></script>
66+
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/7.0.0/dist/converse.min.css">
67+
<script src="https://cdn.conversejs.org/7.0.0/dist/converse.min.js" charset="utf-8"></script>
6868

6969

7070
Option 2: Download the builds from Github

‎fullscreen.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<meta name="description" content="Converse XMPP/Jabber Chat"/>
88
<meta name="author" content="JC Brand" />
99
<meta name="keywords" content="xmpp chat webchat converse.js" />
10-
<link rel="shortcut icon" type="image/ico" href="https://cdn.conversejs.org/6.0.0/dist/favicon.ico"/>
10+
<link rel="shortcut icon" type="image/ico" href="/dist/favicon.ico"/>
1111
<script type="text/javascript" src="inverse-analytics.js"></script>
1212
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=5" style="border:0;" alt="" /></p></noscript>
1313
<link rel="manifest" href="./manifest.json">
14-
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
14+
<link type="text/css" rel="stylesheet" media="screen" href="/dist/converse.min.css" />
1515
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
16-
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
16+
<script src="/dist/converse.min.js"></script>
1717
</head>
1818
<body class="converse-fullscreen">
1919
<noscript>You need to enable JavaScript to run the Converse.js chat app.</noscript>

‎jslicenses.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111

1212
<!-- These files are NOT needed when using converse.js in your own project. -->
1313
<link rel="shortcut icon" type="image/ico" href="images/favicon.ico"/>
14-
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/font-awesome.min.css" />
15-
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/website.min.css" />
14+
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/css/font-awesome.min.css" />
15+
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/css/website.min.css" />
1616
<noscript><p><img src="//stats.opkode.com/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
1717
<script type="text/javascript" src="/src/website.js"></script>
1818
<script type="text/javascript" src="analytics.js"></script>
1919
<!-- *********************************************************************** -->
2020

2121
<![if gte IE 11]>
22-
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/css/converse.min.css" />
22+
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/css/converse.min.css" />
2323
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
24-
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
24+
<script src="https://cdn.conversejs.org/7.0.0/dist/converse.min.js"></script>
2525
<![endif]>
2626
</head>
2727

@@ -66,7 +66,7 @@ <h1 class="brand-heading"><i class="icon-conversejs"></i> converse</h1>
6666
<table id="jslicense-labels1" style="width: 100%">
6767
<tr>
6868
<td>
69-
<a href="https://cdn.conversejs.org/6.0.0/dist/converse.min.js">converse.min.js</a>
69+
<a href="https://cdn.conversejs.org/7.0.0/dist/converse.min.js">converse.min.js</a>
7070
</td>
7171
<td>
7272
<a href="https://www.mozilla.org/en-US/MPL/2.0/">MPL-2.0</a>

‎mobile.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<script type="text/javascript" src="analytics.js"></script>
1919
<!-- *********************************************************************** -->
2020

21-
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/6.0.0/dist/converse.min.css" />
21+
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/7.0.0/dist/converse.min.css" />
2222
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
23-
<script src="https://cdn.conversejs.org/6.0.0/dist/converse.min.js"></script>
23+
<script src="https://cdn.conversejs.org/7.0.0/dist/converse.min.js"></script>
2424
</head>
2525

2626
<body id="page-top" data-spy="scroll" class="converse-website">

‎package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)