Browse Source

Merge branch 'master' into develop

pull/9736/head
David Baker 3 years ago
parent
commit
05a2cb1020
  1. 6
      CHANGELOG.md
  2. 2
      electron_app/package.json
  3. 4
      package.json
  4. 8
      yarn.lock

6
CHANGELOG.md

@ -1,3 +1,9 @@
Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)
* react-sdk v1.1.2 to fix single sign-on and GIF autoplaying
Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14)
==========================================================================================
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1)

2
electron_app/package.json

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

4
package.json

@ -2,7 +2,7 @@
"name": "riot-web",
"productName": "Riot",
"main": "electron_app/src/electron-main.js",
"version": "1.1.1",
"version": "1.1.2",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@ -74,7 +74,7 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"matrix-js-sdk": "1.1.0",
"matrix-react-sdk": "1.1.1",
"matrix-react-sdk": "1.1.2",
"modernizr": "^3.6.0",
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
"prop-types": "^15.6.2",

8
yarn.lock

@ -5769,10 +5769,10 @@ matrix-mock-request@^1.2.3:
bluebird "^3.5.0"
expect "^1.20.2"
matrix-react-sdk@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.1.tgz#7a6d22cb0fb5265de0ffef51f1c0a0c1427db67b"
integrity sha512-vVPy9ChMLlfdGRGmAgtwLtyfw/Gt/03E/1X9Y5jnHZ+inMZgJgY5RZkCzUdC3afQYtd3dimzqoaYLSa+HQ1RWw==
matrix-react-sdk@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.2.tgz#bff86db4fc521deb3076467707dcc338bbff0542"
integrity sha512-MKALTgxSULFSJZagts9+oMu/SZFNHHfZcMKgDWJELdgTIcHUg/rIOFt2y1ghkbpWJjC2wGM8J5E0TAsL0aeWcQ==
dependencies:
babel-plugin-syntax-dynamic-import "^6.18.0"
babel-runtime "^6.26.0"

Loading…
Cancel
Save