mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge branch 'master' into develop
This commit is contained in:
commit
d077165858
40
CHANGELOG.md
40
CHANGELOG.md
@ -1,3 +1,43 @@
|
||||
Changes in [1.5.11](https://github.com/vector-im/riot-web/releases/tag/v1.5.11) (2020-03-02)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11-rc.1...v1.5.11)
|
||||
|
||||
* Upgrade to JS SDK 5.1.0 and React SDK 2.2.0
|
||||
* Fix SSO flows for Electron 8.0.2 by disabling will-navigate
|
||||
[\#12585](https://github.com/vector-im/riot-web/pull/12585)
|
||||
|
||||
Changes in [1.5.11-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.5.11-rc.1) (2020-02-26)
|
||||
======================================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.10...v1.5.11-rc.1)
|
||||
|
||||
* Upgrade to JS SDK 5.1.0-rc.1 and React SDK 2.2.0-rc.1
|
||||
* Change Windows signing to warning when missing token
|
||||
[\#12523](https://github.com/vector-im/riot-web/pull/12523)
|
||||
* Modernizr remove t3st/es6/contains
|
||||
[\#12524](https://github.com/vector-im/riot-web/pull/12524)
|
||||
* Switch out any eval-using Modernizr rules
|
||||
[\#12519](https://github.com/vector-im/riot-web/pull/12519)
|
||||
* Update from Weblate
|
||||
[\#12522](https://github.com/vector-im/riot-web/pull/12522)
|
||||
* Notify electron of language changes
|
||||
[\#12487](https://github.com/vector-im/riot-web/pull/12487)
|
||||
* Relax macOS notarisation check to print a warning
|
||||
[\#12503](https://github.com/vector-im/riot-web/pull/12503)
|
||||
* Clarify supported tier means desktop OSes
|
||||
[\#12486](https://github.com/vector-im/riot-web/pull/12486)
|
||||
* Use noreferrer in addition to noopener for edge case browsers
|
||||
[\#12477](https://github.com/vector-im/riot-web/pull/12477)
|
||||
* Document start / end composer shortcuts
|
||||
[\#12466](https://github.com/vector-im/riot-web/pull/12466)
|
||||
* Update from Weblate
|
||||
[\#12480](https://github.com/vector-im/riot-web/pull/12480)
|
||||
* Remove buildkite pipeline
|
||||
[\#12464](https://github.com/vector-im/riot-web/pull/12464)
|
||||
* Remove exec so release script continues
|
||||
[\#12435](https://github.com/vector-im/riot-web/pull/12435)
|
||||
* Use Persistent Storage where possible
|
||||
[\#12425](https://github.com/vector-im/riot-web/pull/12425)
|
||||
|
||||
Changes in [1.5.10](https://github.com/vector-im/riot-web/releases/tag/v1.5.10) (2020-02-19)
|
||||
============================================================================================
|
||||
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.9...v1.5.10)
|
||||
|
@ -2,7 +2,7 @@
|
||||
"name": "riot-web",
|
||||
"productName": "Riot",
|
||||
"main": "src/electron-main.js",
|
||||
"version": "1.5.10",
|
||||
"version": "1.5.11",
|
||||
"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.5.10",
|
||||
"version": "1.5.11",
|
||||
"description": "A feature-rich client for Matrix.org",
|
||||
"author": "New Vector Ltd.",
|
||||
"repository": {
|
||||
@ -66,8 +66,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": "5.1.0",
|
||||
"matrix-react-sdk": "2.2.0",
|
||||
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
|
||||
"postcss-easings": "^2.0.0",
|
||||
"prop-types": "^15.7.2",
|
||||
|
16
yarn.lock
16
yarn.lock
@ -7497,9 +7497,10 @@ mathml-tag-names@^2.1.1:
|
||||
resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
|
||||
integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==
|
||||
|
||||
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop":
|
||||
version "5.0.1"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/ce668d051c8866dbfedae4955e9dbf4b6ac7b81d"
|
||||
matrix-js-sdk@5.1.0:
|
||||
version "5.1.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0.tgz#9b3b02af227ecc2d0cc35fb7312c92b8a6754293"
|
||||
integrity sha512-IGRq5iACiKp3iIxAghwtdBPrbdgORowc0i8YuIMkZZMpRJDXnNaudt2BFwyQdukV7gvzz7F0sfxBUerySfOnKA==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.8.3"
|
||||
another-json "^0.2.0"
|
||||
@ -7519,9 +7520,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 "2.1.1"
|
||||
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/d5177ddc04f7cafc2cbf97779638daa1c8a7b0f9"
|
||||
matrix-react-sdk@2.2.0:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.0.tgz#72f719b4d046a28d44188c03817f5b3b139bb8d4"
|
||||
integrity sha512-hw7ok+yrRTdD3mt8rQc+kCrctzsGDaS1dEYI+HdBhNQxMing1gavZ61UU6kWB5gB1S6swvZ96q07sO14NosgnA==
|
||||
dependencies:
|
||||
"@babel/runtime" "^7.8.3"
|
||||
blueimp-canvas-to-blob "^3.5.0"
|
||||
@ -7549,7 +7551,7 @@ matrix-mock-request@^1.2.3:
|
||||
is-ip "^2.0.0"
|
||||
linkifyjs "^2.1.6"
|
||||
lodash "^4.17.14"
|
||||
matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop"
|
||||
matrix-js-sdk "5.1.0"
|
||||
minimist "^1.2.0"
|
||||
pako "^1.0.5"
|
||||
png-chunks-extract "^1.0.0"
|
||||
|
Loading…
Reference in New Issue
Block a user