gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
RiotRobot 2019-10-18 15:01:21 +01:00
parent 8e81685a9f 46b75e8c3c
commit 36c07a1c3a
4 changed files with 48 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CHANGELOG.md
View File

@ -1,3 +1,38 @@
Changes in [1.5.0](https://github.com/vector-im/riot-web/releases/tag/v1.5.0) (2019-10-18)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.0-rc.1...v1.5.0)
* Upgrade to JS SDK v2.4.2 and React SDK v1.7.0
* Port Windows signing and macOS notarization to release
[\#11158](https://github.com/vector-im/riot-web/pull/11158)
* Sign main Windows executable
[\#11126](https://github.com/vector-im/riot-web/pull/11126)
* Notarise the macOS app
[\#11119](https://github.com/vector-im/riot-web/pull/11119)
Changes in [1.5.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.0-rc.1) (2019-10-09)
====================================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.2...v1.5.0-rc.1)
* Update from Weblate
[\#11104](https://github.com/vector-im/riot-web/pull/11104)
* Bump Olm to 3.1.4 for olm_session_describe
[\#11103](https://github.com/vector-im/riot-web/pull/11103)
* Enable Webpack production mode for start:js:prod
[\#11098](https://github.com/vector-im/riot-web/pull/11098)
* add settingDefaults to sample config
[\#9919](https://github.com/vector-im/riot-web/pull/9919)
* Add config.json copy instruction to 'Development' as well
[\#11062](https://github.com/vector-im/riot-web/pull/11062)
* Revert "Run yarn upgrade"
[\#11055](https://github.com/vector-im/riot-web/pull/11055)
* Run yarn upgrade
[\#11050](https://github.com/vector-im/riot-web/pull/11050)
* Request persistent storage on Electron
[\#11052](https://github.com/vector-im/riot-web/pull/11052)
* Remove docs for CIDER feature
[\#11047](https://github.com/vector-im/riot-web/pull/11047)
Changes in [1.4.2](https://github.com/vector-im/riot-web/releases/tag/v1.4.2) (2019-10-04)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.4.2-rc.1...v1.4.2)

2
electron_app/package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.4.2",
"version": "1.5.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {

6
package.json
View File

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.4.2",
"version": "1.5.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -74,8 +74,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
"matrix-js-sdk": "2.4.2",
"matrix-react-sdk": "1.7.0",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"prop-types": "^15.7.2",

16
yarn.lock
View File

@ -5955,9 +5955,10 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
version "2.4.1"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e024d047e358cf26caa47542c8f6d9a469a11cb2"
matrix-js-sdk@2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.2.tgz#e9c3c929469e0d885463d22f927f7ac38ad5f209"
integrity sha512-DkkUk6IX56Pkz9S7RYLn2XeTRVMrLiFOAavZvzWHs/m+k8JFtjDmJ8JVJLDA12+kL9h6rXYDN80/99RfFZH3hA==
dependencies:
another-json "^0.2.0"
babel-runtime "^6.26.0"
@ -5978,9 +5979,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
version "1.6.2"
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/dc9018dc116299c2a8ae177b7fe6910458f14078"
matrix-react-sdk@1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.0.tgz#122de621da6657cada90119fb40bd8685fe0ea45"
integrity sha512-NrvgA4yujSADHbkg4ZS9xEDzU+riEgQKX7XFNk1XaweZltjkl8WbYte3l3PkEKlB3yFhZ8i232eCz5RosVDDjA==
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"
@ -6011,7 +6013,7 @@ matrix-mock-request@^1.2.3:
linkifyjs "^2.1.6"
lodash "^4.17.14"
lolex "4.2"
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
matrix-js-sdk "2.4.2"
optimist "^0.6.1"
pako "^1.0.5"
png-chunks-extract "^1.0.0"