Skip to content

Commit 1968a49

Browse files
su-exsu-ex
committed
Merge tag 'v1.11.30' into sc
* Fixes for [CVE-2023-30609](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-30609) / GHSA-xv83-x443-7rmw * Pick sensible default option for phone country dropdown ([\element-hq#10627](matrix-org/matrix-react-sdk#10627)). Fixes element-hq#3528. * Relate field validation tooltip via aria-describedby ([\element-hq#10522](matrix-org/matrix-react-sdk#10522)). Fixes element-hq#24963. * Handle more completion types in rte autocomplete ([\element-hq#10560](matrix-org/matrix-react-sdk#10560)). Contributed by @alunturner. * Show a tile for an unloaded predecessor room if it has via_servers ([\element-hq#10483](matrix-org/matrix-react-sdk#10483)). Contributed by @andybalaam. * Exclude message timestamps from aria live region ([\element-hq#10584](matrix-org/matrix-react-sdk#10584)). Fixes element-hq#5696. * Make composer format bar an aria toolbar ([\element-hq#10583](matrix-org/matrix-react-sdk#10583)). Fixes element-hq#11283. * Improve accessibility of font slider ([\element-hq#10473](matrix-org/matrix-react-sdk#10473)). Fixes element-hq#20168 and element-hq#24962. * fix file size display from kB to KB ([\element-hq#10561](matrix-org/matrix-react-sdk#10561)). Fixes element-hq#24866. Contributed by @NSV1991. * Handle /me in rte ([\element-hq#10558](matrix-org/matrix-react-sdk#10558)). Contributed by @alunturner. * bind html with switch for manage extension setting option ([\element-hq#10553](matrix-org/matrix-react-sdk#10553)). Contributed by @NSV1991. * Handle command completions in RTE ([\element-hq#10521](matrix-org/matrix-react-sdk#10521)). Contributed by @alunturner. * Add room and user avatars to rte ([\element-hq#10497](matrix-org/matrix-react-sdk#10497)). Contributed by @alunturner. * Support for MSC3882 revision 1 ([\element-hq#10443](matrix-org/matrix-react-sdk#10443)). Contributed by @hughns. * Check profiles before starting a DM ([\element-hq#10472](matrix-org/matrix-react-sdk#10472)). Fixes element-hq#24830. * Quick settings: Change the copy / labels on the options ([\element-hq#10427](matrix-org/matrix-react-sdk#10427)). Fixes element-hq#24522. Contributed by @justjanne. * Update rte autocomplete styling ([\element-hq#10503](matrix-org/matrix-react-sdk#10503)). Contributed by @alunturner. * Fix create subspace dialog not working ([\element-hq#10652](matrix-org/matrix-react-sdk#10652)). Fixes element-hq#24882 * Fix multiple accessibility defects identified by AXE ([\element-hq#10606](matrix-org/matrix-react-sdk#10606)). * Fix view source from edit history dialog always showing latest event ([\element-hq#10626](matrix-org/matrix-react-sdk#10626)). Fixes element-hq#21859. * element-hq#21451 Fix WebGL disabled error message ([\element-hq#10589](matrix-org/matrix-react-sdk#10589)). Contributed by @rashmitpankhania. * Properly translate errors in `AddThreepid.ts` so they show up translated to the user but not in our logs ([\element-hq#10432](matrix-org/matrix-react-sdk#10432)). Contributed by @MadLittleMods. * Fix overflow on auth pages ([\element-hq#10605](matrix-org/matrix-react-sdk#10605)). Fixes element-hq#19548. * Fix incorrect avatar background colour when using a custom theme ([\#10598](matrix-org/matrix-react-sdk#10598)). Contributed by @jdauphant. * Remove dependency on `org.matrix.e2e_cross_signing` unstable feature ([\element-hq#10593](matrix-org/matrix-react-sdk#10593)). * Update setting description to match reality ([\element-hq#10600](matrix-org/matrix-react-sdk#10600)). Fixes element-hq#25106. * Fix no identity server in help & about settings ([\element-hq#10563](matrix-org/matrix-react-sdk#10563)). Fixes element-hq#25077. * Fix: Images no longer reserve their space in the timeline correctly ([\element-hq#10571](matrix-org/matrix-react-sdk#10571)). Fixes element-hq#25082. Contributed by @kerryarchibald. * Fix issues with inhibited accessible focus outlines ([\element-hq#10579](matrix-org/matrix-react-sdk#10579)). Fixes element-hq#19742. * Fix read receipts falling from sky ([\element-hq#10576](matrix-org/matrix-react-sdk#10576)). Fixes element-hq#25081. * Fix avatar text issue in rte ([\element-hq#10559](matrix-org/matrix-react-sdk#10559)). Contributed by @alunturner. * fix resizer only work with left mouse click ([\element-hq#10546](matrix-org/matrix-react-sdk#10546)). Contributed by @NSV1991. * Fix send two join requests when joining a room from spotlight search ([\#10534](matrix-org/matrix-react-sdk#10534)). Fixes element-hq#25054. * Highlight event when any version triggered a highlight ([\element-hq#10502](matrix-org/matrix-react-sdk#10502)). Fixes element-hq#24923 and element-hq#24970. Contributed by @kerryarchibald. * Fix spacing of headings of integration manager on General settings tab ([\element-hq#10232](matrix-org/matrix-react-sdk#10232)). Fixes element-hq#24085. Contributed by @luixxiul.
2 parents 5bae12f + f59d4c9 commit 1968a49

File tree

10 files changed

+1128
-948
lines changed

10 files changed

+1128
-948
lines changed

‎.github/workflows/triage-move-review-requests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ jobs:
4343
4444
# If either a reviewer matches a team member, or a team matches our team, say "true"
4545
if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
46-
echo "::set-output name=match::true"
46+
echo "match=true" >> $GITHUB_OUTPUT
4747
elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
48-
echo "::set-output name=match::true"
48+
echo "match=true" >> $GITHUB_OUTPUT
4949
else
50-
echo "::set-output name=match::false"
50+
echo "match=false" >> $GITHUB_OUTPUT
5151
fi
5252
env:
5353
TEAM: "design"
@@ -110,11 +110,11 @@ jobs:
110110
111111
# If either a reviewer matches a team member, or a team matches our team, say "true"
112112
if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) != 0 ]; then
113-
echo "::set-output name=match::true"
113+
echo "match=true" >> $GITHUB_OUTPUT
114114
elif [ $(join /tmp/team.txt /tmp/team_reviewers.txt | wc -l) != 0 ]; then
115-
echo "::set-output name=match::true"
115+
echo "match=true" >> $GITHUB_OUTPUT
116116
else
117-
echo "::set-output name=match::false"
117+
echo "match=false" >> $GITHUB_OUTPUT
118118
fi
119119
env:
120120
TEAM: "product"

‎CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,47 @@
1+
Changes in [1.11.30](https://github.com/vector-im/element-web/releases/tag/v1.11.30) (2023-04-25)
2+
=================================================================================================
3+
4+
## 🔒 Security
5+
* Fixes for [CVE-2023-30609](https://cve.mitre.org/cgi-bin/cvekey.cgi?keyword=CVE-2023-30609) / GHSA-xv83-x443-7rmw
6+
7+
## ✨ Features
8+
* Pick sensible default option for phone country dropdown ([\#10627](https://github.com/matrix-org/matrix-react-sdk/pull/10627)). Fixes #3528.
9+
* Relate field validation tooltip via aria-describedby ([\#10522](https://github.com/matrix-org/matrix-react-sdk/pull/10522)). Fixes #24963.
10+
* Handle more completion types in rte autocomplete ([\#10560](https://github.com/matrix-org/matrix-react-sdk/pull/10560)). Contributed by @alunturner.
11+
* Show a tile for an unloaded predecessor room if it has via_servers ([\#10483](https://github.com/matrix-org/matrix-react-sdk/pull/10483)). Contributed by @andybalaam.
12+
* Exclude message timestamps from aria live region ([\#10584](https://github.com/matrix-org/matrix-react-sdk/pull/10584)). Fixes #5696.
13+
* Make composer format bar an aria toolbar ([\#10583](https://github.com/matrix-org/matrix-react-sdk/pull/10583)). Fixes #11283.
14+
* Improve accessibility of font slider ([\#10473](https://github.com/matrix-org/matrix-react-sdk/pull/10473)). Fixes #20168 and #24962.
15+
* fix file size display from kB to KB ([\#10561](https://github.com/matrix-org/matrix-react-sdk/pull/10561)). Fixes #24866. Contributed by @NSV1991.
16+
* Handle /me in rte ([\#10558](https://github.com/matrix-org/matrix-react-sdk/pull/10558)). Contributed by @alunturner.
17+
* bind html with switch for manage extension setting option ([\#10553](https://github.com/matrix-org/matrix-react-sdk/pull/10553)). Contributed by @NSV1991.
18+
* Handle command completions in RTE ([\#10521](https://github.com/matrix-org/matrix-react-sdk/pull/10521)). Contributed by @alunturner.
19+
* Add room and user avatars to rte ([\#10497](https://github.com/matrix-org/matrix-react-sdk/pull/10497)). Contributed by @alunturner.
20+
* Support for MSC3882 revision 1 ([\#10443](https://github.com/matrix-org/matrix-react-sdk/pull/10443)). Contributed by @hughns.
21+
* Check profiles before starting a DM ([\#10472](https://github.com/matrix-org/matrix-react-sdk/pull/10472)). Fixes #24830.
22+
* Quick settings: Change the copy / labels on the options ([\#10427](https://github.com/matrix-org/matrix-react-sdk/pull/10427)). Fixes #24522. Contributed by @justjanne.
23+
* Update rte autocomplete styling ([\#10503](https://github.com/matrix-org/matrix-react-sdk/pull/10503)). Contributed by @alunturner.
24+
25+
## 🐛 Bug Fixes
26+
* Fix create subspace dialog not working ([\#10652](https://github.com/matrix-org/matrix-react-sdk/pull/10652)). Fixes vector-im/element-web#24882
27+
* Fix multiple accessibility defects identified by AXE ([\#10606](https://github.com/matrix-org/matrix-react-sdk/pull/10606)).
28+
* Fix view source from edit history dialog always showing latest event ([\#10626](https://github.com/matrix-org/matrix-react-sdk/pull/10626)). Fixes #21859.
29+
* #21451 Fix WebGL disabled error message ([\#10589](https://github.com/matrix-org/matrix-react-sdk/pull/10589)). Contributed by @rashmitpankhania.
30+
* Properly translate errors in `AddThreepid.ts` so they show up translated to the user but not in our logs ([\#10432](https://github.com/matrix-org/matrix-react-sdk/pull/10432)). Contributed by @MadLittleMods.
31+
* Fix overflow on auth pages ([\#10605](https://github.com/matrix-org/matrix-react-sdk/pull/10605)). Fixes #19548.
32+
* Fix incorrect avatar background colour when using a custom theme ([\#10598](https://github.com/matrix-org/matrix-react-sdk/pull/10598)). Contributed by @jdauphant.
33+
* Remove dependency on `org.matrix.e2e_cross_signing` unstable feature ([\#10593](https://github.com/matrix-org/matrix-react-sdk/pull/10593)).
34+
* Update setting description to match reality ([\#10600](https://github.com/matrix-org/matrix-react-sdk/pull/10600)). Fixes #25106.
35+
* Fix no identity server in help & about settings ([\#10563](https://github.com/matrix-org/matrix-react-sdk/pull/10563)). Fixes #25077.
36+
* Fix: Images no longer reserve their space in the timeline correctly ([\#10571](https://github.com/matrix-org/matrix-react-sdk/pull/10571)). Fixes #25082. Contributed by @kerryarchibald.
37+
* Fix issues with inhibited accessible focus outlines ([\#10579](https://github.com/matrix-org/matrix-react-sdk/pull/10579)). Fixes #19742.
38+
* Fix read receipts falling from sky ([\#10576](https://github.com/matrix-org/matrix-react-sdk/pull/10576)). Fixes #25081.
39+
* Fix avatar text issue in rte ([\#10559](https://github.com/matrix-org/matrix-react-sdk/pull/10559)). Contributed by @alunturner.
40+
* fix resizer only work with left mouse click ([\#10546](https://github.com/matrix-org/matrix-react-sdk/pull/10546)). Contributed by @NSV1991.
41+
* Fix send two join requests when joining a room from spotlight search ([\#10534](https://github.com/matrix-org/matrix-react-sdk/pull/10534)). Fixes #25054.
42+
* Highlight event when any version triggered a highlight ([\#10502](https://github.com/matrix-org/matrix-react-sdk/pull/10502)). Fixes #24923 and #24970. Contributed by @kerryarchibald.
43+
* Fix spacing of headings of integration manager on General settings tab ([\#10232](https://github.com/matrix-org/matrix-react-sdk/pull/10232)). Fixes #24085. Contributed by @luixxiul.
44+
145
Changes in [1.11.29](https://github.com/vector-im/element-web/releases/tag/v1.11.29) (2023-04-11)
246
=================================================================================================
347

‎jest.config.ts

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*
2+
Copyright 2023 The Matrix.org Foundation C.I.C.
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
*/
16+
17+
import { env } from "process";
18+
19+
import type { Config } from "jest";
20+
21+
const config: Config = {
22+
testEnvironment: "jsdom",
23+
testEnvironmentOptions: {
24+
url: "http://localhost/",
25+
},
26+
testMatch: ["<rootDir>/test/**/*-test.[tj]s?(x)"],
27+
setupFiles: ["jest-canvas-mock"],
28+
setupFilesAfterEnv: ["<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"],
29+
moduleNameMapper: {
30+
"\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
31+
"\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
32+
"\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
33+
"\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
34+
"^react$": "<rootDir>/node_modules/react",
35+
"^react-dom$": "<rootDir>/node_modules/react-dom",
36+
"^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
37+
"^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
38+
"decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
39+
"decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
40+
"waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
41+
"context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
42+
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
43+
"workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
44+
"^!!raw-loader!.*": "jest-raw-loader",
45+
"RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
46+
},
47+
transformIgnorePatterns: ["/node_modules/(?!matrix-js-sdk).+$", "/node_modules/(?!matrix-react-sdk).+$"],
48+
coverageReporters: ["text-summary", "lcov"],
49+
testResultsProcessor: "@casualbot/jest-sonar-reporter",
50+
};
51+
52+
// if we're running under GHA, enable the GHA reporter
53+
if (env["GITHUB_ACTIONS"] !== undefined) {
54+
config.reporters = [["github-actions", { silent: false }], "summary"];
55+
}
56+
57+
export default config;

‎package.json

Lines changed: 11 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.29",
3+
"version": "1.11.30",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -65,16 +65,16 @@
6565
},
6666
"resolutions": {
6767
"@types/react-dom": "17.0.19",
68-
"@types/react": "17.0.53"
68+
"@types/react": "17.0.55"
6969
},
7070
"dependencies": {
7171
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.12.tgz",
7272
"@matrix-org/react-sdk-module-api": "^0.0.4",
7373
"gfm.css": "^1.1.2",
7474
"jsrsasign": "^10.5.25",
7575
"katex": "^0.16.0",
76-
"matrix-js-sdk": "24.1.0",
77-
"matrix-react-sdk": "3.70.0",
76+
"matrix-js-sdk": "25.0.0",
77+
"matrix-react-sdk": "3.71.1",
7878
"matrix-widget-api": "^1.3.1",
7979
"react": "17.0.2",
8080
"react-dom": "17.0.2",
@@ -107,7 +107,7 @@
107107
"@types/jsrsasign": "^10.5.4",
108108
"@types/modernizr": "^3.5.3",
109109
"@types/node": "^16",
110-
"@types/react": "17.0.53",
110+
"@types/react": "17.0.55",
111111
"@types/react-dom": "17.0.19",
112112
"@types/sanitize-html": "^2.3.1",
113113
"@types/ua-parser-js": "^0.7.36",
@@ -117,7 +117,7 @@
117117
"babel-jest": "^29.0.0",
118118
"babel-loader": "^8.2.2",
119119
"chokidar": "^3.5.1",
120-
"concurrently": "^7.0.0",
120+
"concurrently": "^8.0.0",
121121
"cpx": "^1.5.0",
122122
"css-loader": "^4",
123123
"dotenv": "^16.0.2",
@@ -137,7 +137,7 @@
137137
"fs-extra": "^11.0.0",
138138
"html-webpack-plugin": "^4.5.2",
139139
"jest": "^29.0.0",
140-
"jest-canvas-mock": "^2.3.0",
140+
"jest-canvas-mock": "2.4.0",
141141
"jest-environment-jsdom": "^29.0.0",
142142
"jest-mock": "^29.0.0",
143143
"jest-raw-loader": "^1.0.1",
@@ -168,61 +168,20 @@
168168
"simple-proxy-agent": "^1.1.0",
169169
"string-replace-loader": "3",
170170
"style-loader": "2",
171-
"stylelint": "^15.0.0",
172-
"stylelint-config-standard": "^30.0.0",
171+
"stylelint": "^15.3.0",
172+
"stylelint-config-standard": "^32.0.0",
173173
"stylelint-scss": "^4.2.0",
174174
"terser-webpack-plugin": "^4.0.0",
175+
"ts-node": "^10.9.1",
175176
"ts-prune": "^0.10.3",
176-
"typescript": "4.9.5",
177+
"typescript": "5.0.3",
177178
"webpack": "^4.46.0",
178179
"webpack-cli": "^3.3.12",
179180
"webpack-dev-server": "^3.11.2",
180181
"worker-loader": "^3.0.0",
181182
"worklet-loader": "^2.0.0",
182183
"yaml": "^2.0.1"
183184
},
184-
"jest": {
185-
"testEnvironment": "jsdom",
186-
"testEnvironmentOptions": {
187-
"url": "http://localhost/"
188-
},
189-
"testMatch": [
190-
"<rootDir>/test/**/*-test.[tj]s?(x)"
191-
],
192-
"setupFiles": [
193-
"jest-canvas-mock"
194-
],
195-
"setupFilesAfterEnv": [
196-
"<rootDir>/node_modules/matrix-react-sdk/test/setupTests.js"
197-
],
198-
"moduleNameMapper": {
199-
"\\.(css|scss|pcss)$": "<rootDir>/__mocks__/cssMock.js",
200-
"\\.(gif|png|ttf|woff2)$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/imageMock.js",
201-
"\\.svg$": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/svg.js",
202-
"\\$webapp/i18n/languages.json": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/languages.json",
203-
"^react$": "<rootDir>/node_modules/react",
204-
"^react-dom$": "<rootDir>/node_modules/react-dom",
205-
"^matrix-js-sdk$": "<rootDir>/node_modules/matrix-js-sdk/src",
206-
"^matrix-react-sdk$": "<rootDir>/node_modules/matrix-react-sdk/src",
207-
"decoderWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
208-
"decoderWorker\\.min\\.wasm": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
209-
"waveWorker\\.min\\.js": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
210-
"context-filter-polyfill": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js",
211-
"FontManager.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/FontManager.js",
212-
"workers/(.+)\\.worker\\.ts": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/workerMock.js",
213-
"^!!raw-loader!.*": "jest-raw-loader",
214-
"RecorderWorklet": "<rootDir>/node_modules/matrix-react-sdk/__mocks__/empty.js"
215-
},
216-
"transformIgnorePatterns": [
217-
"/node_modules/(?!matrix-js-sdk).+$",
218-
"/node_modules/(?!matrix-react-sdk).+$"
219-
],
220-
"coverageReporters": [
221-
"text-summary",
222-
"lcov"
223-
],
224-
"testResultsProcessor": "@casualbot/jest-sonar-reporter"
225-
},
226185
"@casualbot/jest-sonar-reporter": {
227186
"outputDirectory": "coverage",
228187
"outputName": "jest-sonar-report.xml",

‎src/async-components/structures/CompatibilityView.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
4242
<a
4343
href={iosCustomUrl || "https://apps.apple.com/app/vector/id1083446067"}
4444
target="_blank"
45+
rel="noreferrer noopener"
4546
className="mx_ClearDecoration"
4647
>
4748
<img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
@@ -63,6 +64,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
6364
<a
6465
href={andCustomUrl || "https://play.google.com/store/apps/details?id=im.vector.app"}
6566
target="_blank"
67+
rel="noreferrer noopener"
6668
className="mx_ClearDecoration"
6769
key="android"
6870
>
@@ -76,6 +78,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
7678
<a
7779
href={fdroidCustomUrl || "https://f-droid.org/repository/browse/?fdid=im.vector.app"}
7880
target="_blank"
81+
rel="noreferrer noopener"
7982
className="mx_ClearDecoration"
8083
key="fdroid"
8184
>

‎src/favicon.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export default class Favicon {
152152
this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
153153
this.context.drawImage(this.baseImage, 0, 0, this.canvas.width, this.canvas.height);
154154
this.context.beginPath();
155-
const fontSize = Math.floor(opt.h * (opt.n > 99 ? 0.85 : 1)) + "px";
155+
const fontSize = Math.floor(opt.h * (typeof opt.n === "number" && opt.n > 99 ? 0.85 : 1)) + "px";
156156
this.context.font = `${params.fontWeight} ${fontSize} ${params.fontFamily}`;
157157
this.context.textAlign = "center";
158158

‎src/i18n/strings/my.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"Invalid configuration: no default server specified.": "ဖွဲ့စည်းပုံ မမှန်ပါ။ default ဆာဗာကို သတ်မှတ်ထားခြင်း မရှိပါ။"
3+
}

‎src/i18n/strings/nn.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,8 @@
2525
"Your Element is misconfigured": "Element er feilkonfigurert",
2626
"Failed to start": "Klarte ikkje å starta",
2727
"Open": "Opna",
28-
"Download Completed": "Nedlasting Fullført"
28+
"Download Completed": "Nedlasting Fullført",
29+
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Desentralisertd kryptert chatt &amp; samarbeid som vert drive av $matrixLogo",
30+
"%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s på %(osName)s",
31+
"%(brand)s Desktop: %(platformName)s": "%(brand)s Skrivebord: %(platformName)s"
2932
}

0 commit comments

Comments
 (0)