PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into develop

Browse source
This commit is contained in:
RiotRobot 2019-11-27 10:54:58 +00:00
commit ff452b9d87
4 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGELOG.md
View file

@ -1,3 +1,12 @@
Changes in [1.5.5](https://github.com/vector-im/riot-web/releases/tag/v1.5.5) (2019-11-27)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4...v1.5.5)
* Upgrade to JS SDK 2.5.4 to relax identity server discovery and E2EE debugging
* Upgrade to React SDK 1.7.4 to fix override behaviour of themes
* Clarify that cross-signing is in development
* Sign all of the Windows executable files
Changes in [1.5.4](https://github.com/vector-im/riot-web/releases/tag/v1.5.4) (2019-11-25) Changes in [1.5.4](https://github.com/vector-im/riot-web/releases/tag/v1.5.4) (2019-11-25)
========================================================================================== ==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.2...v1.5.4) [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.4-rc.2...v1.5.4)

2
electron_app/package.json
View file

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

6
package.json
View file

@ -2,7 +2,7 @@
"name": "riot-web", "name": "riot-web",
"productName": "Riot", "productName": "Riot",
"main": "electron_app/src/electron-main.js", "main": "electron_app/src/electron-main.js",
"version": "1.5.4", "version": "1.5.5",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
@ -73,8 +73,8 @@
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566", "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
"gfm.css": "^1.1.2", "gfm.css": "^1.1.2",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"matrix-js-sdk": "2.4.4", "matrix-js-sdk": "2.4.5",
"matrix-react-sdk": "1.7.3", "matrix-react-sdk": "1.7.4",
"modernizr": "^3.6.0", "modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
"postcss-easings": "^2.0.0", "postcss-easings": "^2.0.0",

18
yarn.lock
View file

@ -6009,10 +6009,10 @@ math-random@^1.0.1:
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
matrix-js-sdk@2.4.4: matrix-js-sdk@2.4.5:
version "2.4.4" version "2.4.5"
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.4.tgz#d5e2d6fbe938c4275a1423a5f09330d33517ce3f" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.4.5.tgz#0a02f0a3e18c59a393b34b8d6ebc54226cce6465"
integrity sha512-wSaRFvhWvwEzVaEkyBGo5ReumvaM5OrC1MJ6SVlyoLwH/WRPEXcUlu+rUNw5TFVEAH4TAVHXf/SVRBiR0j5nSQ== integrity sha512-Mh0fPoiqyXRksFNYS4/2s20xAklmYVIgSms3qFvLhno32LN43NizUoAMBYYGtyjt8BQi+U77lbNL0s5f2V7gPQ==
dependencies: dependencies:
another-json "^0.2.0" another-json "^0.2.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
@ -6033,10 +6033,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0" bluebird "^3.5.0"
expect "^1.20.2" expect "^1.20.2"
matrix-react-sdk@1.7.3: matrix-react-sdk@1.7.4:
version "1.7.3" version "1.7.4"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.3.tgz#f3f64dc77eea64b77ba3d574847bc03146d421a3" resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.7.4.tgz#06c50b20519ec4de3976b9a6b80eca70d8ef9809"
integrity sha512-XSZSj4GWhxhoEoCIHGyMwBKdmcHJrKB9hToHJQTI0OL/x8+ErTLVAgJYW8hvR16l5lXGzSsYWDOfQOTbKK1tLQ== integrity sha512-AHiCr0zSDh2cHQF/CiT9ez7F9B+uFQ+XIfTGFbeI22MfY61Vhye8UIVwP7cOMFJ7Ow+wE6470iiscg+boBbRyg==
dependencies: dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0" babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0" babel-runtime "^6.26.0"
@ -6069,7 +6069,7 @@ matrix-react-sdk@1.7.3:
linkifyjs "^2.1.6" linkifyjs "^2.1.6"
lodash "^4.17.14" lodash "^4.17.14"
lolex "4.2" lolex "4.2"
matrix-js-sdk "2.4.4" matrix-js-sdk "2.4.5"
optimist "^0.6.1" optimist "^0.6.1"
pako "^1.0.5" pako "^1.0.5"
png-chunks-extract "^1.0.0" png-chunks-extract "^1.0.0"