Skip to content

Commit

Permalink
Release 10.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jcbrand committed Jan 7, 2023
1 parent 0227b2e commit 078936f
Show file tree
Hide file tree
Showing 54 changed files with 29,010 additions and 26,546 deletions.
3 changes: 2 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# Changelog

## Unreleased
## 10.1.0 (2023-01-07)

- #326: Add the ability to reset your password
- #2759: Don't automatically log in again if the user manually logged out
- #2816: Chat highlight behaves odd
- #2925: File upload is not always enabled
- #3001: Add option to save SCRAM details and to use them to stay logged in upon reload
- Add a "Add to Contacts" button in MUC occupant modals
- Updated tranlsations and new language Uyghur

- New config option [save_scram_keys](https://conversejs.org/docs/html/configuration.html#save-scram-keys)

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: 10.0.0
* Version: 10.1.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 @@ -66,7 +66,7 @@ serve_bg: node_modules
dist/converse-no-dependencies.js: src webpack/webpack.common.js webpack/webpack.nodeps.js @converse/headless node_modules
npm run nodeps

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=10.0.0 dist/converse-no-dependencies.js -c
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=10.1.0 dist/converse-no-dependencies.js -c

src/i18n/converse.pot: dist/converse-no-dependencies.js
$(GETTEXT) 2>&1 > /dev/null; exit $$?;
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=10.0.1`
3. Run `make release VERSION=10.1.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 10.0.1"`
7. `git tag -s v10.0.1 -m "Release 10.0.1"`
8. Run `git push && git push origin v10.0.1`
6. `git commit -am "Release 10.1.0"`
7. `git tag -s v10.1.0 -m "Release 10.1.0"`
8. Run `git push && git push origin v10.1.0`
9. Update https://conversejs.org
* `cd /home/conversejs/converse.js`
* `git clone --branch v10.0.1 [email protected]:conversejs/converse.js.git 10.0.1`
* `cd 10.0.1 && nvm install && ASSET_PATH=https://cdn.conversejs.org/10.0.1/dist/ make dist && make doc`
* `git clone --branch v10.1.0 [email protected]:conversejs/converse.js.git 10.1.0`
* `cd 10.1.0 && nvm install && ASSET_PATH=https://cdn.conversejs.org/10.1.0/dist/ make dist && make doc`
* `cd .. && git pull && nvm install && ASSET_PATH=https://cdn.conversejs.org/dist/ make dist && make doc`
10. Update release page on Github
11. Run `npm publish && cd src/headless/ && npm publish`
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 = '10.0.0'
version = '10.1.0'
# The full version, including alpha/beta/rc tags.
release = '10.0.0'
release = '10.1.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 @@ -56,16 +56,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/10.0.0/dist/converse.min.js
* https://cdn.conversejs.org/10.0.0/dist/converse.min.css
* https://cdn.conversejs.org/10.1.0/dist/converse.min.js
* https://cdn.conversejs.org/10.1.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/10.0.0/dist/converse.min.css">
<script src="https://cdn.conversejs.org/10.0.0/dist/converse.min.js" charset="utf-8"></script>
<link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/10.1.0/dist/converse.min.css">
<script src="https://cdn.conversejs.org/10.1.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/10.0.0/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.0.0/css/website.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.0/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.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/10.0.0/css/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.0/css/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/10.0.0/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/10.1.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/10.0.0/dist/converse.min.js">converse.min.js</a>
<a href="https://cdn.conversejs.org/10.1.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": "10.0.0",
"version": "10.1.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 @@ -19,9 +19,9 @@
<script type="text/javascript" src="analytics.js"></script>
<!-- *********************************************************************** -->

<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.0.0/dist/converse.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="https://cdn.conversejs.org/10.1.0/dist/converse.min.css" />
<script src="https://cdn.conversejs.org/3rdparty/libsignal-protocol.min.js"></script>
<script src="https://cdn.conversejs.org/10.0.0/dist/converse.min.js"></script>
<script src="https://cdn.conversejs.org/10.1.0/dist/converse.min.js"></script>
</head>

<body id="page-top" data-spy="scroll" class="converse-website">
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "converse.js",
"version": "10.0.0",
"version": "10.1.0",
"description": "Browser based XMPP chat client",
"browser": "dist/converse.js",
"module": "src/converse.js",
Expand Down
2 changes: 1 addition & 1 deletion src/headless/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Strophe.addNamespace('VCARDUPDATE', 'vcard-temp:x:update');
Strophe.addNamespace('XFORM', 'jabber:x:data');
Strophe.addNamespace('XHTML', 'http://www.w3.org/1999/xhtml');

_converse.VERSION_NAME = "v10.0.0";
_converse.VERSION_NAME = "v10.1.0";

Object.assign(_converse, Events);

Expand Down
2 changes: 1 addition & 1 deletion src/headless/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@converse/headless",
"version": "10.0.0",
"version": "10.1.0",
"description": "Converse.js Headless build",
"author": "cmrd Senya <[email protected]>",
"homepage": "https://conversejs.org",
Expand Down
Loading

0 comments on commit 078936f

Please sign in to comment.