Skip to content

Commit c55223e

Browse files
dbkrdbkr
committed
Merge branch 'master' into develop
2 parents 9cb452a + 164a0e0 commit c55223e

4 files changed

Lines changed: 62 additions & 21 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
1+
Changes in [1.0.6](https://github.com/vector-im/riot-web/releases/tag/v1.0.6) (2019-04-01)
2+
==========================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.6-rc.1...v1.0.6)
4+
5+
* Add "Save image as..." button to context menu on images
6+
[\#9327](https://github.com/vector-im/riot-web/pull/9327)
7+
8+
Changes in [1.0.6-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.0.6-rc.1) (2019-03-27)
9+
====================================================================================================
10+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.5...v1.0.6-rc.1)
11+
12+
* Use `on_logged_in` action in tests
13+
[\#9279](https://github.com/vector-im/riot-web/pull/9279)
14+
* Convert away from `Promise.defer`
15+
[\#9278](https://github.com/vector-im/riot-web/pull/9278)
16+
* update react-sdk version in yarn lockfile
17+
[\#9233](https://github.com/vector-im/riot-web/pull/9233)
18+
* "Render simple counters in room header" details
19+
[\#9154](https://github.com/vector-im/riot-web/pull/9154)
20+
* Use medium agents for the more resource intensive builds
21+
[\#9238](https://github.com/vector-im/riot-web/pull/9238)
22+
* Add log grouping to buildkite
23+
[\#9223](https://github.com/vector-im/riot-web/pull/9223)
24+
* Switch to `git` protocol for CI dependencies
25+
[\#9222](https://github.com/vector-im/riot-web/pull/9222)
26+
* Support CI for matching branches on forks
27+
[\#9212](https://github.com/vector-im/riot-web/pull/9212)
28+
* Update from Weblate
29+
[\#9199](https://github.com/vector-im/riot-web/pull/9199)
30+
* Declare the officially supported browsers in the README
31+
[\#9177](https://github.com/vector-im/riot-web/pull/9177)
32+
* Document some desktop app things
33+
[\#9011](https://github.com/vector-im/riot-web/pull/9011)
34+
* Use Buildkite for CI
35+
[\#9165](https://github.com/vector-im/riot-web/pull/9165)
36+
* Update version number in issue templates
37+
[\#9170](https://github.com/vector-im/riot-web/pull/9170)
38+
* Remove node 8.x from the build matrix
39+
[\#9159](https://github.com/vector-im/riot-web/pull/9159)
40+
* Update Electron help menu link
41+
[\#9157](https://github.com/vector-im/riot-web/pull/9157)
42+
143
Changes in [1.0.5](https://github.com/vector-im/riot-web/releases/tag/v1.0.5) (2019-03-21)
244
==========================================================================================
345
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.0.4...v1.0.5)

‎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.0.5",
5+
"version": "1.0.6",
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.0.5",
5+
"version": "1.0.6",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"repository": {
@@ -70,8 +70,8 @@
7070
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
7171
"gfm.css": "^1.1.2",
7272
"highlight.js": "^9.13.1",
73-
"matrix-js-sdk": "1.0.2",
74-
"matrix-react-sdk": "1.0.5",
73+
"matrix-js-sdk": "1.0.3",
74+
"matrix-react-sdk": "1.0.6",
7575
"modernizr": "^3.6.0",
7676
"olm": "https://matrix.org/packages/npm/olm/olm-3.1.0-pre1.tgz",
7777
"prop-types": "^15.6.2",
@@ -150,7 +150,7 @@
150150
},
151151
"build": {
152152
"appId": "im.riot.app",
153-
"electronVersion": "4.0.8",
153+
"electronVersion": "4.1.3",
154154
"files": [
155155
"node_modules/**",
156156
"src/**",

‎yarn.lock‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5190,7 +5190,7 @@ isstream@~0.1.2:
51905190
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
51915191
integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
51925192

5193-
"jquery@>= 1.4.3", jquery@^3.3.1:
5193+
jquery@^3.3.1:
51945194
version "3.3.1"
51955195
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
51965196
integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==
@@ -5732,10 +5732,10 @@ math-random@^1.0.1:
57325732
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
57335733
integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
57345734

5735-
matrix-js-sdk@1.0.2:
5736-
version "1.0.2"
5737-
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.2.tgz#482d8d2076c7565cf7354722e96c9971e372182a"
5738-
integrity sha512-4WCBJFSoOLelHi7IUAcVxPQF+gTc/i9NUKZ77qwUfcZVED8VKTIyWZnwpeLgocK5gAOJV9fkAyO5mny9SkZaGg==
5735+
matrix-js-sdk@1.0.3, matrix-js-sdk@^1.0.3:
5736+
version "1.0.3"
5737+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.0.3.tgz#d4cc46c4dc80278b78f8e0664741b08fcc395c79"
5738+
integrity sha512-YpF4NvnG2cttRmTPJ9yqs/KwlBXW15O7+nNMs1FKj1CqdW1Phwb0fcqvahjPgmfXyn5DFzU3Deiv9aNgDIlIog==
57395739
dependencies:
57405740
another-json "^0.2.0"
57415741
babel-runtime "^6.26.0"
@@ -5757,10 +5757,10 @@ matrix-mock-request@^1.2.3:
57575757
bluebird "^3.5.0"
57585758
expect "^1.20.2"
57595759

5760-
matrix-react-sdk@1.0.5:
5761-
version "1.0.5"
5762-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.0.5.tgz#92ca4f6780f76e183f47d2f96c79ada76492d77a"
5763-
integrity sha512-aaBmKQO4KM+U9eMhdJgbO/RZtmqayISk+qrcdcXtxDYjn2RZnziTNQ2289xG+dQb7A09Aev3u9rogrD6QCDI3w==
5760+
matrix-react-sdk@^1.0.6:
5761+
version "1.0.6"
5762+
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.0.6.tgz#5477cb6f20a5968394e46f55cd4345436fba6372"
5763+
integrity sha512-qu+BY0I6qu2py8lzOZRPY2xOabXRrU/87dotx6MhyzWFKw+xQav0EggZJeKYtCAvuafS2zpPscTZX0/11Z3MuA==
57645764
dependencies:
57655765
babel-plugin-syntax-dynamic-import "^6.18.0"
57665766
babel-runtime "^6.26.0"
@@ -5786,7 +5786,7 @@ matrix-react-sdk@1.0.5:
57865786
linkifyjs "^2.1.6"
57875787
lodash "^4.13.1"
57885788
lolex "2.3.2"
5789-
matrix-js-sdk "1.0.2"
5789+
matrix-js-sdk "1.0.3"
57905790
optimist "^0.6.1"
57915791
pako "^1.0.5"
57925792
prop-types "^15.5.8"
@@ -5806,7 +5806,7 @@ matrix-react-sdk@1.0.5:
58065806
slate-react "^0.18.10"
58075807
text-encoding-utf-8 "^1.0.1"
58085808
url "^0.11.0"
5809-
velocity-vector "github:vector-im/velocity#059e3b2"
5809+
velocity-animate "^1.5.2"
58105810
whatwg-fetch "^1.1.1"
58115811
zxcvbn "^4.4.2"
58125812

@@ -8995,11 +8995,10 @@ vary@~1.1.2:
89958995
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
89968996
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
89978997

8998-
"velocity-vector@github:vector-im/velocity#059e3b2":
8999-
version "1.2.3"
9000-
resolved "https://codeload.github.com/vector-im/velocity/tar.gz/059e3b2348f1110888d033974d3109fd5a3af00f"
9001-
dependencies:
9002-
jquery ">= 1.4.3"
8998+
velocity-animate@^1.5.2:
8999+
version "1.5.2"
9000+
resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105"
9001+
integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg==
90039002

90049003
verror@1.10.0:
90059004
version "1.10.0"

0 commit comments

Comments
 (0)