Skip to content

Commit fcf8e24

Browse files
RiotRobotRiotRobot
committed
Merge branch 'master' into develop
2 parents 53d8341 + 2af3d20 commit fcf8e24

File tree

4 files changed

+53
-26
lines changed

4 files changed

+53
-26
lines changed

‎CHANGELOG.md‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
Changes in [1.2.0](https://github.com/vector-im/riot-web/releases/tag/v1.2.0) (2019-05-29)
2+
==========================================================================================
3+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.0-rc.1...v1.2.0)
4+
5+
* Upgrade to JS SDK v1.2.0 and React SDK v1.2.0 to fix some regressions
6+
7+
Changes in [1.2.0-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.0-rc.1) (2019-05-23)
8+
====================================================================================================
9+
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.2...v1.2.0-rc.1)
10+
11+
* Update from Weblate
12+
[\#9802](https://github.com/vector-im/riot-web/pull/9802)
13+
* remove emojione
14+
[\#9766](https://github.com/vector-im/riot-web/pull/9766)
15+
* Make Dockerfile work for develop and other branches
16+
[\#9736](https://github.com/vector-im/riot-web/pull/9736)
17+
* add description of new labs feature for message editing
18+
[\#9728](https://github.com/vector-im/riot-web/pull/9728)
19+
* Remove karma junit output
20+
[\#9628](https://github.com/vector-im/riot-web/pull/9628)
21+
* yarn upgrade
22+
[\#9626](https://github.com/vector-im/riot-web/pull/9626)
23+
* Respond quickly to buildkite pokes
24+
[\#9617](https://github.com/vector-im/riot-web/pull/9617)
25+
* Delay creating the `Favico` instance
26+
[\#9616](https://github.com/vector-im/riot-web/pull/9616)
27+
* Add reactions feature to config sample
28+
[\#9598](https://github.com/vector-im/riot-web/pull/9598)
29+
130
Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15)
231
==========================================================================================
332
[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2)

‎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.1.2",
5+
"version": "1.2.0",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"dependencies": {

‎package.json‎

Lines changed: 3 additions & 3 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.1.2",
5+
"version": "1.2.0",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "New Vector Ltd.",
88
"repository": {
@@ -73,8 +73,8 @@
7373
"gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279",
7474
"gfm.css": "^1.1.2",
7575
"highlight.js": "^9.13.1",
76-
"matrix-js-sdk": "1.1.0",
77-
"matrix-react-sdk": "1.1.2",
76+
"matrix-js-sdk": "1.2.0",
77+
"matrix-react-sdk": "1.2.0",
7878
"modernizr": "^3.6.0",
7979
"olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz",
8080
"prop-types": "^15.6.2",

‎yarn.lock‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1519,13 +1519,6 @@ balanced-match@^1.0.0:
15191519
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
15201520
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
15211521

1522-
base-x@3.0.4:
1523-
version "3.0.4"
1524-
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.4.tgz#94c1788736da065edb1d68808869e357c977fa77"
1525-
integrity sha512-UYOadoSIkEI/VrRGSG6qp93rp2WdokiAiNYDfGW5qURAY8GiAQkvMbwNNSDYiVJopqv4gCna7xqf4rrNGp+5AA==
1526-
dependencies:
1527-
safe-buffer "^5.0.1"
1528-
15291522
base-x@^3.0.2:
15301523
version "3.0.5"
15311524
resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.5.tgz#d3ada59afed05b921ab581ec3112e6444ba0795a"
@@ -3130,10 +3123,15 @@ emoji-regex@^7.0.1:
31303123
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
31313124
integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
31323125

3133-
emojione@2.2.7:
3134-
version "2.2.7"
3135-
resolved "https://registry.yarnpkg.com/emojione/-/emojione-2.2.7.tgz#46457cf6b9b2f8da13ae8a2e4e547de06ee15e96"
3136-
integrity sha1-RkV89rmy+NoTroouTlR94G7hXpY=
3126+
emojibase-data@^4.0.0:
3127+
version "4.0.0"
3128+
resolved "https://registry.yarnpkg.com/emojibase-data/-/emojibase-data-4.0.0.tgz#3feb3e5bb5e5f2b6373b183b0f038c60889a9e29"
3129+
integrity sha512-Yi4A1IxB7iZ+09Wqr2BEpHSQfugc5I8G+wckDOhCia0F7oOdErf/85jCwbpRQy7xtBbvlyS3xQrYedSeQot5Og==
3130+
3131+
emojibase-regex@^3.0.0:
3132+
version "3.0.0"
3133+
resolved "https://registry.yarnpkg.com/emojibase-regex/-/emojibase-regex-3.0.0.tgz#fc7a17aa20584df5a73619f06ac236b8a5bb452d"
3134+
integrity sha512-iNDkbtn8UxKTxjIlvHLqfXovZaIulnuuyo2/emU+ZlPr2OmzxGfiDI+iIQ3WWqdlA6lgjrPNWgpbytt4lnJYrg==
31373135

31383136
emojis-list@^2.0.0:
31393137
version "2.1.0"
@@ -5730,14 +5728,13 @@ math-random@^1.0.1:
57305728
resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c"
57315729
integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==
57325730

5733-
matrix-js-sdk@1.1.0:
5734-
version "1.1.0"
5735-
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.1.0.tgz#f0db49de2aa0b0d50c1fe49da538beb4926ce59c"
5736-
integrity sha512-ECoMN6DkwPdKiMa/jSoMkSDngFCo6x7oH84rLd1NtD7lBPl3Ejj6ARa0iIELE7u0OUO6J0FzdWh7Hd0ZnVTmww==
5731+
matrix-js-sdk@1.2.0:
5732+
version "1.2.0"
5733+
resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-1.2.0.tgz#1e18f7bead2b31f1b6886299f3198f545eb7d19e"
5734+
integrity sha512-XqxIm30/ePPQxMpoSZ6560nVZN296E7DI4twGKspII+Pvc0u7p+UHTh3OXwTtPOj3eVo0ptKv3kn/a5SmYzXmQ==
57375735
dependencies:
57385736
another-json "^0.2.0"
57395737
babel-runtime "^6.26.0"
5740-
base-x "3.0.4"
57415738
bluebird "^3.5.0"
57425739
browser-request "^0.3.3"
57435740
bs58 "^4.0.1"
@@ -5755,10 +5752,10 @@ matrix-mock-request@^1.2.3:
57555752
bluebird "^3.5.0"
57565753
expect "^1.20.2"
57575754

5758-
matrix-react-sdk@1.1.2:
5759-
version "1.1.2"
5760-
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.2.tgz#bff86db4fc521deb3076467707dcc338bbff0542"
5761-
integrity sha512-MKALTgxSULFSJZagts9+oMu/SZFNHHfZcMKgDWJELdgTIcHUg/rIOFt2y1ghkbpWJjC2wGM8J5E0TAsL0aeWcQ==
5755+
matrix-react-sdk@1.2.0:
5756+
version "1.2.0"
5757+
resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.0.tgz#8c8c204607763932c99851b2f24b27d3e27b66a5"
5758+
integrity sha512-FXUluS8gNUjHEeTFNOkpD5LgQTZM/UBxNPBYiqyVzEOWpJBVy49kJaVvEU/uzLCpHk3mde30PmTl9khAf2yVNQ==
57625759
dependencies:
57635760
babel-plugin-syntax-dynamic-import "^6.18.0"
57645761
babel-runtime "^6.26.0"
@@ -5769,7 +5766,8 @@ matrix-react-sdk@1.1.2:
57695766
classnames "^2.1.2"
57705767
commonmark "^0.28.1"
57715768
counterpart "^0.18.0"
5772-
emojione "2.2.7"
5769+
emojibase-data "^4.0.0"
5770+
emojibase-regex "^3.0.0"
57735771
file-saver "^1.3.3"
57745772
filesize "3.5.6"
57755773
flux "2.1.1"
@@ -5784,7 +5782,7 @@ matrix-react-sdk@1.1.2:
57845782
linkifyjs "^2.1.6"
57855783
lodash "^4.13.1"
57865784
lolex "2.3.2"
5787-
matrix-js-sdk "1.1.0"
5785+
matrix-js-sdk "1.2.0"
57885786
optimist "^0.6.1"
57895787
pako "^1.0.5"
57905788
png-chunks-extract "^1.0.0"

0 commit comments

Comments
 (0)