Skip to content

Commit c04e25a

Browse files
estellecommentestellecomment
committed
Merge tag 'v1.11.46' into upgrade/element-web-v1.11.46 (patches not fixed yet)
* Use .well-known to discover a default rendezvous server for use with Sign in with QR ([\#11655](matrix-org/matrix-react-sdk#11655)). Contributed by @hughns. * Message layout will update according to the selected style ([\#10170](matrix-org/matrix-react-sdk#10170)). Fixes #21782. Contributed by @manancodes. * Implement MSC4039: Add an MSC for a new Widget API action to upload files into the media repository ([\#11311](matrix-org/matrix-react-sdk#11311)). Contributed by @dhenneke. * Render space pills with square corners to match new avatar ([\#11632](matrix-org/matrix-react-sdk#11632)). Fixes #26056. * Linkify room topic ([\#11631](matrix-org/matrix-react-sdk#11631)). Fixes #26185. * Show knock rooms in the list ([\#11573](matrix-org/matrix-react-sdk#11573)). Contributed by @maheichyk. * Bump matrix-web-i18n dependency to 3.1.3 ([\#26287](element-hq/element-web#26287)) * Fix: Avatar shrinks with long names ([\#11698](matrix-org/matrix-react-sdk#11698)). Fixes #26252. Contributed by @manancodes. * Update custom translations to support nested fields in structured JSON ([\#11685](matrix-org/matrix-react-sdk#11685)). * Fix: Edited message remove button is hard to reach. ([\#11674](matrix-org/matrix-react-sdk#11674)). Fixes #24917. Contributed by @manancodes. * Fix: Theme selector radio button not aligned in center with the text ([\#11676](matrix-org/matrix-react-sdk#11676)). Fixes #25460. Contributed by @manancodes. * Fix: Unread notification dot aligned ([\#11658](matrix-org/matrix-react-sdk#11658)). Fixes #25285. Contributed by @manancodes. * Fix: sync intentional mentions push rules with legacy rules ([\#11667](matrix-org/matrix-react-sdk#11667)). Fixes #26227. Contributed by @kerryarchibald. * Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](matrix-org/matrix-react-sdk#11634)). Fixes #26209. * Fix: Alignment Fixed ([\#11648](matrix-org/matrix-react-sdk#11648)). Fixes #26169. Contributed by @manancodes. * Fix: onFinished added which closes the menu ([\#11647](matrix-org/matrix-react-sdk#11647)). Fixes #25556. Contributed by @manancodes. * Don't start key backups when opening settings ([\#11640](matrix-org/matrix-react-sdk#11640)). * Fix add to space avatar text centering ([\#11643](matrix-org/matrix-react-sdk#11643)). Fixes #26154. * fix avatar styling in lightbox ([\#11641](matrix-org/matrix-react-sdk#11641)). Fixes #26196.
2 parents bce8b4e + d072737 commit c04e25a

File tree

14 files changed

+339
-36
lines changed

14 files changed

+339
-36
lines changed

‎.github/workflows/dockerhub.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ jobs:
1818
fetch-depth: 0 # needed for docker-package to be able to calculate the version
1919

2020
- name: Set up QEMU
21-
uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7 # v2
21+
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
2222

2323
- name: Set up Docker Buildx
24-
uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55 # v2
24+
uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3
2525
with:
2626
install: true
2727

2828
- name: Login to Docker Hub
29-
uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
29+
uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3
3030
with:
3131
username: ${{ secrets.DOCKERHUB_USERNAME }}
3232
password: ${{ secrets.DOCKERHUB_TOKEN }}
3333

3434
- name: Docker meta
3535
id: meta
36-
uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175 # v4
36+
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5
3737
with:
3838
images: |
3939
vectorim/element-web
@@ -44,7 +44,7 @@ jobs:
4444
latest=${{ contains(github.ref_name, '-rc.') && 'false' || 'auto' }}
4545
4646
- name: Build and push
47-
uses: docker/build-push-action@2eb1c1961a95fc15694676618e422e8ba1d63825 # v4
47+
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5
4848
with:
4949
context: .
5050
push: true

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Get number of CPU cores
3333
id: cpu-cores
34-
uses: SimenB/github-actions-cpu-cores@410541432439795d30db6501fb1d8178eb41e502 # v1
34+
uses: SimenB/github-actions-cpu-cores@97ba232459a8e02ff6121db9362b09661c875ab8 # v2
3535

3636
- name: Run tests with coverage
3737
run: "yarn coverage --ci"

‎CHANGELOG.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
Changes in [1.11.46](https://github.com/vector-im/element-web/releases/tag/v1.11.46) (2023-10-10)
2+
=================================================================================================
3+
4+
## ✨ Features
5+
* Use .well-known to discover a default rendezvous server for use with Sign in with QR ([\#11655](https://github.com/matrix-org/matrix-react-sdk/pull/11655)). Contributed by @hughns.
6+
* Message layout will update according to the selected style ([\#10170](https://github.com/matrix-org/matrix-react-sdk/pull/10170)). Fixes #21782. Contributed by @manancodes.
7+
* Implement MSC4039: Add an MSC for a new Widget API action to upload files into the media repository ([\#11311](https://github.com/matrix-org/matrix-react-sdk/pull/11311)). Contributed by @dhenneke.
8+
* Render space pills with square corners to match new avatar ([\#11632](https://github.com/matrix-org/matrix-react-sdk/pull/11632)). Fixes #26056.
9+
* Linkify room topic ([\#11631](https://github.com/matrix-org/matrix-react-sdk/pull/11631)). Fixes #26185.
10+
* Show knock rooms in the list ([\#11573](https://github.com/matrix-org/matrix-react-sdk/pull/11573)). Contributed by @maheichyk.
11+
12+
## 🐛 Bug Fixes
13+
* Bump matrix-web-i18n dependency to 3.1.3 ([\#26287](https://github.com/vector-im/element-web/pull/26287))
14+
* Fix: Avatar shrinks with long names ([\#11698](https://github.com/matrix-org/matrix-react-sdk/pull/11698)). Fixes #26252. Contributed by @manancodes.
15+
* Update custom translations to support nested fields in structured JSON ([\#11685](https://github.com/matrix-org/matrix-react-sdk/pull/11685)).
16+
* Fix: Edited message remove button is hard to reach. ([\#11674](https://github.com/matrix-org/matrix-react-sdk/pull/11674)). Fixes #24917. Contributed by @manancodes.
17+
* Fix: Theme selector radio button not aligned in center with the text ([\#11676](https://github.com/matrix-org/matrix-react-sdk/pull/11676)). Fixes #25460. Contributed by @manancodes.
18+
* Fix: Unread notification dot aligned ([\#11658](https://github.com/matrix-org/matrix-react-sdk/pull/11658)). Fixes #25285. Contributed by @manancodes.
19+
* Fix: sync intentional mentions push rules with legacy rules ([\#11667](https://github.com/matrix-org/matrix-react-sdk/pull/11667)). Fixes #26227. Contributed by @kerryarchibald.
20+
* Revert "Fix regression around FacePile with overflow (#11527)" ([\#11634](https://github.com/matrix-org/matrix-react-sdk/pull/11634)). Fixes #26209.
21+
* Fix: Alignment Fixed ([\#11648](https://github.com/matrix-org/matrix-react-sdk/pull/11648)). Fixes #26169. Contributed by @manancodes.
22+
* Fix: onFinished added which closes the menu ([\#11647](https://github.com/matrix-org/matrix-react-sdk/pull/11647)). Fixes #25556. Contributed by @manancodes.
23+
* Don't start key backups when opening settings ([\#11640](https://github.com/matrix-org/matrix-react-sdk/pull/11640)).
24+
* Fix add to space avatar text centering ([\#11643](https://github.com/matrix-org/matrix-react-sdk/pull/11643)). Fixes #26154.
25+
* fix avatar styling in lightbox ([\#11641](https://github.com/matrix-org/matrix-react-sdk/pull/11641)). Fixes #26196.
26+
27+
Changes in [1.11.45](https://github.com/vector-im/element-web/releases/tag/v1.11.45) (2023-09-29)
28+
=================================================================================================
29+
30+
## 🐛 Bug Fixes
31+
* Fix Emoji font on Safari 17 ([\#11673](https://github.com/matrix-org/matrix-react-sdk/pull/11673)).
32+
133
Changes in [1.11.44](https://github.com/vector-im/element-web/releases/tag/v1.11.44) (2023-09-26)
234
=================================================================================================
335

‎docs/labs.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ This setting is (currently) _sticky_ to a user's session: it only takes effect w
134134

135135
Refactors visually the room header and room sidebar
136136

137+
## Enable the notifications panel in the room header (`feature_notifications`)
138+
139+
Unreliable in encrypted rooms.
140+
137141
## Knock rooms (`feature_ask_to_join`) [In Development]
138142

139143
Enables knock feature for rooms. This allows users to ask to join a room.

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "element-web",
33
"productName": "Tchap",
44
"version": "4.3.11",
5-
"version-element-web": "1.11.44",
5+
"version-element-web": "1.11.46",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "DINUM",
88
"repository": {
@@ -89,8 +89,8 @@
8989
"jsrsasign": "^10.5.25",
9090
"katex": "^0.16.0",
9191
"lodash": "^4.17.21",
92-
"matrix-js-sdk": "28.2.0",
93-
"matrix-react-sdk": "3.81.0",
92+
"matrix-js-sdk": "29.0.0",
93+
"matrix-react-sdk": "3.82.0",
9494
"matrix-widget-api": "^1.3.1",
9595
"react": "17.0.2",
9696
"react-dom": "17.0.2",
@@ -183,7 +183,7 @@
183183
"json-loader": "^0.5.7",
184184
"loader-utils": "^3.0.0",
185185
"matrix-mock-request": "^2.5.0",
186-
"matrix-web-i18n": "^3.1.1",
186+
"matrix-web-i18n": "^3.1.3",
187187
"mini-css-extract-plugin": "^1",
188188
"minimist": "^1.2.6",
189189
"mkdirp": "^3.0.0",

‎src/languageHandler.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import type EN from "./i18n/strings/en_EN.json";
3939
* which we know will be injected by webpack.
4040
*/
4141

42-
export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }>;
42+
export type TranslationKey = Leaves<typeof EN & typeof ReactEN, "|", string | { other: string }, 4>;
4343

4444
export class UserFriendlyError extends ReactUserFriendlyError {
4545
public constructor(message: TranslationKey, substitutionVariablesAndCause?: IVariables & ErrorOptions) {

‎test/setup/setupLanguage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ fetchMock.config.overwriteRoutes = false;
2525

2626
export function setupLanguageMock() {
2727
reactSetupLanguageMock();
28-
fetchMock.get("end:en_EN.json", _.merge(en, reactEn), { overwriteRoutes: true });
28+
fetchMock.get("end:en_EN.json", _.merge({}, en, reactEn), { overwriteRoutes: true });
2929
}
3030
setupLanguageMock();

‎test/unit-tests/async-components/structures/ErrorView-test.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ import * as React from "react";
1818
import { render } from "@testing-library/react";
1919

2020
import ErrorView from "../../../../src/async-components/structures/ErrorView";
21+
import { setupLanguageMock } from "../../../setup/setupLanguage";
2122

2223
describe("<ErrorView />", () => {
24+
beforeEach(() => {
25+
setupLanguageMock();
26+
});
27+
2328
it("should match snapshot", () => {
2429
const { asFragment } = render(<ErrorView title="TITLE" messages={["MSG1", "MSG2"]} />);
2530
expect(asFragment()).toMatchSnapshot();

‎test/unit-tests/components/views/auth/VectorAuthFooter-test.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ import * as React from "react";
1818
import { render } from "@testing-library/react";
1919

2020
import VectorAuthFooter from "../../../../../src/components/views/auth/VectorAuthFooter";
21+
import { setupLanguageMock } from "../../../../setup/setupLanguage";
2122

2223
describe("<VectorAuthFooter />", () => {
24+
beforeEach(() => {
25+
setupLanguageMock();
26+
});
27+
2328
it("should match snapshot", () => {
2429
const { asFragment } = render(<VectorAuthFooter />);
2530
expect(asFragment()).toMatchSnapshot();

‎test/unit-tests/components/views/auth/VectorAuthPage-test.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ import * as React from "react";
1818
import { render } from "@testing-library/react";
1919

2020
import VectorAuthPage from "../../../../../src/components/views/auth/VectorAuthPage";
21+
import { setupLanguageMock } from "../../../../setup/setupLanguage";
2122

2223
describe("<VectorAuthPage />", () => {
24+
beforeEach(() => {
25+
setupLanguageMock();
26+
});
27+
2328
it("should match snapshot", () => {
2429
const { asFragment } = render(<VectorAuthPage />);
2530
expect(asFragment()).toMatchSnapshot();

0 commit comments

Comments
 (0)