mirror of
https://github.com/vector-im/element-web.git
synced 2024-09-10 07:05:14 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
42c2692d28
4 changed files with 34 additions and 5 deletions
29
CHANGELOG.md
29
CHANGELOG.md
|
@ -1,3 +1,32 @@
|
|||
Changes in [1.0.4](https://github.com/vector-im/riot-web/releases/tag/v1.0.4) (2019-03-18)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4-rc.1...v1.0.4)
|
||||
|
||||
* No changes since rc.1
|
||||
|
||||
Changes in [1.0.4-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.4-rc.1) (2019-03-13)
|
||||
====================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.3...v1.0.4-rc.1)
|
||||
|
||||
* Update from Weblate
|
||||
[\#9152](https://github.com/vector-im/riot-web/pull/9152)
|
||||
* Use modern Yarn version on Travis CI
|
||||
[\#9151](https://github.com/vector-im/riot-web/pull/9151)
|
||||
* Switch to `yarn` for dependency management
|
||||
[\#9132](https://github.com/vector-im/riot-web/pull/9132)
|
||||
* Update from Weblate
|
||||
[\#9104](https://github.com/vector-im/riot-web/pull/9104)
|
||||
* Don't copy the 32 bit linux deb
|
||||
[\#9075](https://github.com/vector-im/riot-web/pull/9075)
|
||||
* Change olm dependency to normal dep
|
||||
[\#9068](https://github.com/vector-im/riot-web/pull/9068)
|
||||
* Add modular.im hosting link to electron app config
|
||||
[\#9047](https://github.com/vector-im/riot-web/pull/9047)
|
||||
* Nudge karma to 3.1.2
|
||||
[\#8991](https://github.com/vector-im/riot-web/pull/8991)
|
||||
* Add support for localConfig at $appData/config.json.
|
||||
[\#8983](https://github.com/vector-im/riot-web/pull/8983)
|
||||
|
||||
Changes in [1.0.3](https://github.com/vector-im/riot-web/releases/tag/v1.0.3) (2019-03-06)
|
||||
==========================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.2...v1.0.3)
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"dependencies": {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "electron_app/src/electron-main.js",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
|
@ -70,8 +70,8 @@
|
|||
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
|
||||
"gfm.css": "^1.1.2",
|
||||
"highlight.js": "^9.13.1",
|
||||
"matrix-js-sdk": "1.0.1",
|
||||
"matrix-react-sdk": "1.0.3",
|
||||
"matrix-js-sdk": "1.0.2",
|
||||
"matrix-react-sdk": "1.0.4",
|
||||
"modernizr": "^3.6.0",
|
||||
"olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz",
|
||||
"prop-types": "^15.6.2",
|
||||
|
|
|
@ -41,7 +41,7 @@ tag="v${release}"
|
|||
echo "electron yarn version"
|
||||
|
||||
cd electron_app
|
||||
yarn version --no-git-tag-version "$release"
|
||||
yarn version --no-git-tag-version --new-version "$release"
|
||||
git commit package.json -m "$tag"
|
||||
|
||||
cd ..
|
||||
|
|
Loading…
Reference in a new issue