From d297ee5c7e3f15bfaa5904676da5c8b26f453f0f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 27 Oct 2020 11:13:55 +0000 Subject: [PATCH 1/6] Fix theme variable handling with invalid values --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 6aeba8f7aa..a5a8be36e2 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -70,7 +70,7 @@ let meetApi: any; // JitsiMeetExternalAPI const theme = qsParam('theme', true); if (theme) { - document.body.classList.add(`theme-${theme}`); + document.body.classList.add(`theme-${theme.replace(" ", "_")}`); } // Set this up as early as possible because Element will be hitting it almost immediately. From be1e4552aaf288949e292c84c1b6af09a1176431 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 27 Oct 2020 11:24:52 +0000 Subject: [PATCH 2/6] fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through --- src/vector/jitsi/index.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index a4ae84cacf..2c7e020c96 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -24,7 +24,7 @@ limitations under the License. } $dark-fg: #edf3ff; -$dark-bg: rgba(141, 151, 165, 0.2); +$dark-bg: #363c43; $light-fg: #2e2f32; $light-bg: #fff; body { From 469df236d925411395fdc79b51564a563a87cf02 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:13:31 +0000 Subject: [PATCH 3/6] Upgrade matrix-js-sdk to 9.0.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 8cf8e2e7ca..fac99eaa6b 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", - "matrix-js-sdk": "9.0.0", + "matrix-js-sdk": "9.0.1", "matrix-react-sdk": "3.7.0", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", diff --git a/yarn.lock b/yarn.lock index 0c3643db58..79764e0e24 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7913,6 +7913,21 @@ matrix-js-sdk@9.0.0: request "^2.88.2" unhomoglyph "^1.0.6" +matrix-js-sdk@9.0.1: + version "9.0.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d" + integrity sha512-D2b/pf1/0FTnJoroZhhFCo9WFv+iXELqDgEozo0mBSTbQolIXjHLDQfmhi3p7nDZxxtjWvJjVaiKiVQPjwHCrg== + dependencies: + "@babel/runtime" "^7.11.2" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.4" + loglevel "^1.7.0" + qs "^6.9.4" + request "^2.88.2" + unhomoglyph "^1.0.6" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From f821b7c8bbc16775b5e8ab5062d8595459e2a120 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:13:55 +0000 Subject: [PATCH 4/6] Upgrade matrix-react-sdk to 3.7.1 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index fac99eaa6b..e6822c6439 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ "highlight.js": "^9.13.1", "jsrsasign": "^9.1.5", "matrix-js-sdk": "9.0.1", - "matrix-react-sdk": "3.7.0", + "matrix-react-sdk": "3.7.1", "matrix-widget-api": "^0.1.0-beta.5", "olm": "https://packages.matrix.org/npm/olm/olm-3.2.1.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 79764e0e24..731d02269d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7898,21 +7898,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@9.0.0: - version "9.0.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.0.tgz#97d995fcb4209161a761cf59238caf52ff34882b" - integrity sha512-GEQ51wxnBfY00m39aMWVa2/sZqUFBsRWrsImr+mkXtPYs1OQVXHVipL2B3/rObOO+A+3bo7tfoaTTxhpQl2CaQ== - dependencies: - "@babel/runtime" "^7.11.2" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.4" - loglevel "^1.7.0" - qs "^6.9.4" - request "^2.88.2" - unhomoglyph "^1.0.6" - matrix-js-sdk@9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-9.0.1.tgz#bb84a80db0dec1c21b6867c38bb2aa3f63811d6d" @@ -7936,10 +7921,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.0.tgz#433cb3c074a696a55eca9ed6542e9111687cbd15" - integrity sha512-6cRJF96hAVPxk6I84F4cruag/i2UUkcIfJ7C1SAVUrON3DKw4Q2OTBESak54OzZcxXYxV4Dn7AKxSQdh6oSHEA== +matrix-react-sdk@3.7.1: + version "3.7.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.7.1.tgz#0a2d9c2c7d224297277532bcf78f60984f6bc49e" + integrity sha512-JwCURRs0WBuqVQ5/0fYg19SEb2Dg8y1F93GiiCssAoMW/bbTiMA6B/moLeZDO2mQPlhqwRtAH1aeLvdKrA/q6w== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7966,7 +7951,7 @@ matrix-react-sdk@3.7.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "9.0.0" + matrix-js-sdk "9.0.1" matrix-widget-api "^0.1.0-beta.5" minimist "^1.2.5" pako "^1.0.11" From 9d6bbef04ef735f92b546f385f68ac76d764cc6a Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:18:19 +0000 Subject: [PATCH 5/6] Prepare changelog for v1.7.12 --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03ea686932..5441e8b4df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +Changes in [1.7.12](https://github.com/vector-im/element-web/releases/tag/v1.7.12) (2020-10-28) +=============================================================================================== +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11...v1.7.12) + + * Upgrade to React SDK 3.7.1 and JS SDK 9.0.1 + * [Release] Fix Jitsi regressions with custom themes + [\#15577](https://github.com/vector-im/element-web/pull/15577) + Changes in [1.7.11](https://github.com/vector-im/element-web/releases/tag/v1.7.11) (2020-10-26) =============================================================================================== [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.11-rc.1...v1.7.11) From cc7e64375dcd006497f31241c80dbe9ed26615b6 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Wed, 28 Oct 2020 15:18:19 +0000 Subject: [PATCH 6/6] v1.7.12 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e6822c6439..fea84b01e9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.11", + "version": "1.7.12", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": {