From 751316f38817797b0f9ef11006745f25e76154ee Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Jul 2019 17:25:05 +0100 Subject: [PATCH 1/8] Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1 --- package.json | 4 ++-- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 37f3e8153b..fdd755fe56 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.0.1", - "matrix-react-sdk": "1.2.2", + "matrix-js-sdk": "2.1.0-rc.1", + "matrix-react-sdk": "1.3.0-rc.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index 0c2f74ee98..4f723a1f8e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4513,16 +4513,16 @@ he@1.2.x: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -highlight.js@9.14.2: - version "9.14.2" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.14.2.tgz#efbfb22dc701406e4da406056ef8c2b70ebe5b26" - integrity sha512-Nc6YNECYpxyJABGYJAyw7dBAYbXEuIzwzkqoJnwbc1nIpCiN+3ioYf0XrBnLiyyG0JLuJhpPtt2iTSbXiKLoyA== - highlight.js@^9.13.1: version "9.15.6" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.6.tgz#72d4d8d779ec066af9a17cb14360c3def0aa57c4" integrity sha512-zozTAWM1D6sozHo8kqhfYgsac+B+q0PmsjXeyDrYIHHcBN0zTVT66+s2GW1GZv7DbyaROdLXKdabwS/WqPyIdQ== +highlight.js@^9.15.8: + version "9.15.8" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.15.8.tgz#f344fda123f36f1a65490e932cf90569e4999971" + integrity sha512-RrapkKQWwE+wKdF73VsOa2RQdIoO3mxwJ4P8mhbI6KYJUraUHRKM5w5zQQKXNk0xNL4UVRdulV9SBJcmzJNzVA== + hmac-drbg@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" @@ -5835,10 +5835,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.0.1.tgz#e9691c7fc142793aa8cd79e92d45698bcc5da8c4" - integrity sha512-+yj9fBdIE65v1+46TL/eLQGohtNZGBEtOD1n3nTAVBMogyVb2bpUWnqTli0ghiOCG9MKq7tWi+G4bDBTABxuxA== +matrix-js-sdk@2.1.0-rc.1: + version "2.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.1.0-rc.1.tgz#0eff1224c6877538df2ccdd8e5b65892473f646f" + integrity sha512-YXybCKTdY8aHKJnr/zl8TR1iEIL890RLrD3Wc3YNWdbIt0ldnrdedreZYMmDhuSVFWbLwx1q8QDHwLZJvUGCdQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5859,10 +5859,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.2.2.tgz#09e9eae3ec3b9ef324934b69275066c667fa8a1b" - integrity sha512-K7cBzturO5+4jWWnqtuqfqHrZXuq6ckyWY/UxbNbCdsvRsO4UZz7tGBy9QSEMKhiHkqkgCaOWfSjgFgjFmCrjQ== +matrix-react-sdk@1.3.0-rc.1: + version "1.3.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.3.0-rc.1.tgz#7ed0dcce4bb5691c24dcf5139713d0101749a4ce" + integrity sha512-eukFfl848vF4G9KyhoXdC8Jci6xNF8/f6GaW2p8Lvl+gPERpVg0sgvaehduKYX00GGAgmA2dWf2MfJb7XTurRw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5883,13 +5883,13 @@ matrix-react-sdk@1.2.2: gemini-scrollbar "github:matrix-org/gemini-scrollbar#b302279" gfm.css "^1.1.1" glob "^5.0.14" - highlight.js "9.14.2" + highlight.js "^9.15.8" is-ip "^2.0.0" isomorphic-fetch "^2.2.1" linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "2.0.1" + matrix-js-sdk "2.1.0-rc.1" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From 1ce8f3844bb0e1149414add81ab3a7faee443839 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Jul 2019 17:47:41 +0100 Subject: [PATCH 2/8] v1.2.3-rc.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 7c348b88c8..fab42f47e0 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.2", + "version": "1.2.3-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 72052b913f70ef2c06e6d44868e134d2cf1c4e3a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Jul 2019 17:48:55 +0100 Subject: [PATCH 3/8] Prepare changelog for v1.2.3-rc.1 --- CHANGELOG.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 411627cdaf..fb84d6816a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +Changes in [1.2.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.3-rc.1) (2019-07-03) +==================================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2...v1.2.3-rc.1) + + * Change update URL to match new host + [\#10247](https://github.com/vector-im/riot-web/pull/10247) + * Update from Weblate + [\#10219](https://github.com/vector-im/riot-web/pull/10219) + * Extract configuration docs to separate file + [\#10195](https://github.com/vector-im/riot-web/pull/10195) + * Add e2e/warning.svg to preload + [\#10197](https://github.com/vector-im/riot-web/pull/10197) + * Fix Electron vector: links + [\#10196](https://github.com/vector-im/riot-web/pull/10196) + * Display a red box of anger for config syntax errors + [\#10193](https://github.com/vector-im/riot-web/pull/10193) + * Move config-getting to VectorBasePlatform + [\#10181](https://github.com/vector-im/riot-web/pull/10181) + * Update from Weblate + [\#10124](https://github.com/vector-im/riot-web/pull/10124) + * Fix default Electron window and tray icons + [\#10097](https://github.com/vector-im/riot-web/pull/10097) + Changes in [1.2.2](https://github.com/vector-im/riot-web/releases/tag/v1.2.2) (2019-06-19) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2-rc.2...v1.2.2) From 6e502478e3e35d326f2b78636810625869c5e1d3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 3 Jul 2019 17:48:55 +0100 Subject: [PATCH 4/8] v1.2.3-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fdd755fe56..b93dc28229 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.2.2", + "version": "1.2.3-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 090b2dbd3049b91d8480f33689d08f9a9e8e67c3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2019 10:58:13 +0100 Subject: [PATCH 5/8] Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 --- package.json | 4 ++-- yarn.lock | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index b93dc28229..27b7270f78 100644 --- a/package.json +++ b/package.json @@ -73,8 +73,8 @@ "gemini-scrollbar": "github:matrix-org/gemini-scrollbar#b302279", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "2.1.0-rc.1", - "matrix-react-sdk": "1.3.0-rc.1", + "matrix-js-sdk": "2.1.0", + "matrix-react-sdk": "1.3.0", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index 4f723a1f8e..3e933ebe25 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5835,10 +5835,10 @@ math-random@^1.0.1: resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== -matrix-js-sdk@2.1.0-rc.1: - version "2.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.1.0-rc.1.tgz#0eff1224c6877538df2ccdd8e5b65892473f646f" - integrity sha512-YXybCKTdY8aHKJnr/zl8TR1iEIL890RLrD3Wc3YNWdbIt0ldnrdedreZYMmDhuSVFWbLwx1q8QDHwLZJvUGCdQ== +matrix-js-sdk@2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-2.1.0.tgz#a8192d700e4d96028cdb64f3453935292e76faaf" + integrity sha512-fVgqxp9rrcGhQ9cnU2WW3KJCOIn/WJu/G2tTgWEtzeDkUl22JXiB6iYfrJO7XF8nm8W5DbJVtxWRRnV8BvWatQ== dependencies: another-json "^0.2.0" babel-runtime "^6.26.0" @@ -5859,10 +5859,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.3.0-rc.1: - version "1.3.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.3.0-rc.1.tgz#7ed0dcce4bb5691c24dcf5139713d0101749a4ce" - integrity sha512-eukFfl848vF4G9KyhoXdC8Jci6xNF8/f6GaW2p8Lvl+gPERpVg0sgvaehduKYX00GGAgmA2dWf2MfJb7XTurRw== +matrix-react-sdk@1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.3.0.tgz#ff4c8caef298a3396bf06329e476148d8325aa8b" + integrity sha512-ZQZuJHI0r9L7GkXtGU2a6HW4LotQwnIFo/K2c6KyCQhbuhX2HdtRdoHOXGxU69VB8VmwltwCKwVWUTiLhIsb5w== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" @@ -5889,7 +5889,7 @@ matrix-react-sdk@1.3.0-rc.1: linkifyjs "^2.1.6" lodash "^4.13.1" lolex "2.3.2" - matrix-js-sdk "2.1.0-rc.1" + matrix-js-sdk "2.1.0" optimist "^0.6.1" pako "^1.0.5" png-chunks-extract "^1.0.0" From a53d7edc7f51a56144a626b1c379cb2e4907d9ce Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2019 11:10:31 +0100 Subject: [PATCH 6/8] v1.2.3 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index fab42f47e0..c95aef3452 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.2.3-rc.1", + "version": "1.2.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From 4a33c0af6e03a7c0523b08af5b3342736eeba9d3 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2019 11:12:03 +0100 Subject: [PATCH 7/8] Prepare changelog for v1.2.3 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fb84d6816a..11ed5aa33e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [1.2.3](https://github.com/vector-im/riot-web/releases/tag/v1.2.3) (2019-07-08) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.3-rc.1...v1.2.3) + + * Upgrade to React SDK 1.3.0 and JS SDK 2.1.0 + * JS SDK 2.1.0 includes a fix for an exception whilst syncing + Changes in [1.2.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v1.2.3-rc.1) (2019-07-03) ==================================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.2.2...v1.2.3-rc.1) From 6546108307e99ddc81f8b30253c9d627d288795f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 8 Jul 2019 11:12:04 +0100 Subject: [PATCH 8/8] v1.2.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 27b7270f78..e72299fda9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.2.3-rc.1", + "version": "1.2.3", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {