Compare commits

...

7 Commits

Author SHA1 Message Date
RiotRobot cc7e64375d v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot 9d6bbef04e Prepare changelog for v1.7.12 2020-10-28 15:18:19 +00:00
RiotRobot f821b7c8bb Upgrade matrix-react-sdk to 3.7.1 2020-10-28 15:13:55 +00:00
RiotRobot 469df236d9 Upgrade matrix-js-sdk to 9.0.1 2020-10-28 15:13:31 +00:00
Michael Telatynski ce44cbb2dc Merge pull request #15577 from vector-im/t3chguy/fix/jitsi-cherry-pick
[Release] Fix Jitsi regressions with custom themes
2020-10-27 12:05:09 +00:00
Michael Telatynski be1e4552aa fix the Jitsi bg colour to not be transparent as the app colours may be anything and bleed through 2020-10-27 11:48:03 +00:00
Michael Telatynski d297ee5c7e Fix theme variable handling with invalid values 2020-10-27 11:48:03 +00:00
5 changed files with 22 additions and 14 deletions
+8
View File
@@ -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)
+3 -3
View File
@@ -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": {
@@ -60,8 +60,8 @@
"gfm.css": "^1.1.2",
"highlight.js": "^9.13.1",
"jsrsasign": "^9.1.5",
"matrix-js-sdk": "9.0.0",
"matrix-react-sdk": "3.7.0",
"matrix-js-sdk": "9.0.1",
"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",
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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.
+9 -9
View File
@@ -7898,10 +7898,10 @@ 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==
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"
@@ -7921,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"
@@ -7951,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"