Skip to content

Commit d88f9ed

Browse files
RiotRobotRiotRobot
committed
Merge branch 'master' into develop
2 parents 48c8f16 + 6e68c10 commit d88f9ed

5 files changed

Lines changed: 18 additions & 8 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Changes in [1.5.12](https://github.com/vector-im/riot-web/releases/tag/v1.5.12) (2020-03-04)
2+
============================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11...v1.5.12)
4+
5+
* Upgrade to React SDK 2.2.1
6+
* Revert to Electron 7.1.12 to fix Arch Linux tray icon
7+
* Fix image download links so they open in a new tab
8+
19
Changes in [1.5.11](https://github.com/vector-im/riot-web/releases/tag/v1.5.11) (2020-03-02)
210
============================================================================================
311
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.5.11-rc.1...v1.5.11)

‎electron_app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "src/electron-main.js",
5-
"version": "1.5.11",
5+
"version": "1.5.12",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"dependencies": {

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "riot-web",
33
"productName": "Riot",
44
"main": "electron_app/src/electron-main.js",
5-
"version": "1.5.11",
5+
"version": "1.5.12",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"repository": {
@@ -66,8 +66,8 @@
6666
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#91e1e566",
6767
"gfm.css": "^1.1.2",
6868
"highlight.js": "^9.13.1",
69-
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
70-
"matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
69+
"matrix-js-sdk": "5.1.0",
70+
"matrix-react-sdk": "2.2.1",
7171
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
7272
"postcss-easings": "^2.0.0",
7373
"prop-types": "^15.7.2",
@@ -153,7 +153,7 @@
153153
},
154154
"build": {
155155
"appId": "im.riot.app",
156-
"electronVersion": "8.0.2",
156+
"electronVersion": "7.1.12",
157157
"files": [
158158
"node_modules/**",
159159
"src/**"

‎release.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ cd `dirname $0`
2020

2121
for i in matrix-js-sdk matrix-react-sdk
2222
do
23+
echo "Checking version of $i..."
2324
depver=`cat package.json | jq -r .dependencies[\"$i\"]`
2425
latestver=`yarn info -s $i dist-tags.next`
2526
if [ "$depver" != "$latestver" ]

‎yarn.lock‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7519,9 +7519,10 @@ matrix-mock-request@^1.2.3:
75197519
bluebird "^3.5.0"
75207520
expect "^1.20.2"
75217521

7522-
"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
7523-
version "2.2.0"
7524-
resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/00dc187f7165a0659ce1ae5bbd3fd491ba5650db"
7522+
matrix-react-sdk@2.2.1:
7523+
version "2.2.1"
7524+
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-2.2.1.tgz#1f443d35bdcc46c7ef3dc3066adda59f7f43b348"
7525+
integrity sha512-zIgf/i9z2x+KHf0caQtFVc3JEFiIFd9MH36XnqXaPYyRSuS0zWRLY/tFTR51pMblMIb3DskTYlf9q7JLDAP/+A==
75257526
dependencies:
75267527
"@babel/runtime" "^7.8.3"
75277528
blueimp-canvas-to-blob "^3.5.0"

0 commit comments

Comments
 (0)