Skip to content

Commit 99c7dc3

Browse files
committed
Merge tag 'v1.11.14' into sc
* Loading threads with server-side assistance ([\element-hq#9356](matrix-org/matrix-react-sdk#9356)). Fixes element-hq#21807, element-hq#21799, element-hq#21911, element-hq#22141, element-hq#22157, element-hq#22641, element-hq#22501 element-hq#22438 and element-hq#21678. Contributed by @justjanne. * Make thread replies trigger a room list re-ordering ([\element-hq#9510](matrix-org/matrix-react-sdk#9510)). Fixes element-hq#21700. * Device manager - add extra details to device security and renaming ([\element-hq#9501](matrix-org/matrix-react-sdk#9501)). Contributed by @kerryarchibald. * Add plain text mode to the wysiwyg composer ([\element-hq#9503](matrix-org/matrix-react-sdk#9503)). Contributed by @florianduros. * Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\element-hq#9484](matrix-org/matrix-react-sdk#9484)). * Device manager - add learn more popups to filtered sessions section ([\element-hq#9497](matrix-org/matrix-react-sdk#9497)). Contributed by @kerryarchibald. * Show thread notification if thread timeline is closed ([\element-hq#9495](matrix-org/matrix-react-sdk#9495)). Fixes element-hq#23589. * Add message editing to wysiwyg composer ([\element-hq#9488](matrix-org/matrix-react-sdk#9488)). Contributed by @florianduros. * Device manager - confirm sign out of other sessions ([\element-hq#9487](matrix-org/matrix-react-sdk#9487)). Contributed by @kerryarchibald. * Automatically request logs from other users in a call when submitting logs ([\element-hq#9492](matrix-org/matrix-react-sdk#9492)). * Add thread notification with server assistance (MSC3773) ([\element-hq#9400](matrix-org/matrix-react-sdk#9400)). Fixes element-hq#21114, element-hq#21413, element-hq#21416, element-hq#21433, element-hq#21481, element-hq#21798, element-hq#21823 element-hq#23192 and element-hq#21765. * Support for login + E2EE set up with QR ([\element-hq#9403](matrix-org/matrix-react-sdk#9403)). Contributed by @hughns. * Allow pressing Enter to send messages in new composer ([\element-hq#9451](matrix-org/matrix-react-sdk#9451)). Contributed by @andybalaam. * Fix regressions around media uploads failing and causing soft crashes ([\element-hq#9549](matrix-org/matrix-react-sdk#9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and element-hq#23641. * Fix /myroomavatar slash command ([\element-hq#9536](matrix-org/matrix-react-sdk#9536)). Fixes matrix-org/synapse#14321. * Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\element-hq#23577](element-hq#23577)). * Fix NotificationBadge unsent color ([\element-hq#9522](matrix-org/matrix-react-sdk#9522)). Fixes element-hq#23646. * Fix room list sorted by recent on app startup ([\element-hq#9515](matrix-org/matrix-react-sdk#9515)). Fixes element-hq#23635. * Reset custom power selector when blurred on empty ([\element-hq#9508](matrix-org/matrix-react-sdk#9508)). Fixes element-hq#23481. * Reinstate timeline/redaction callbacks when updating notification state ([\element-hq#9494](matrix-org/matrix-react-sdk#9494)). Fixes element-hq#23554. * Only render NotificationBadge when needed ([\element-hq#9493](matrix-org/matrix-react-sdk#9493)). Fixes element-hq#23584. * Fix embedded Element Call screen sharing ([\element-hq#9485](matrix-org/matrix-react-sdk#9485)). Fixes element-hq#23571. * Send Content-Type: application/json header for integration manager /register API ([\element-hq#9490](matrix-org/matrix-react-sdk#9490)). Fixes element-hq#23580. * Fix joining calls without audio or video inputs ([\element-hq#9486](matrix-org/matrix-react-sdk#9486)). Fixes element-hq#23511. * Ensure spaces in the spotlight dialog have rounded square avatars ([\element-hq#9480](matrix-org/matrix-react-sdk#9480)). Fixes element-hq#23515. * Only show mini avatar uploader in room intro when no avatar yet exists ([\element-hq#9479](matrix-org/matrix-react-sdk#9479)). Fixes element-hq#23552. * Fix threads fallback incorrectly targets root event ([\element-hq#9229](matrix-org/matrix-react-sdk#9229)). Fixes element-hq#23147. * Align video call icon with banner text ([\element-hq#9460](matrix-org/matrix-react-sdk#9460)). * Set relations helper when creating event tile context menu ([\element-hq#9253](matrix-org/matrix-react-sdk#9253)). Fixes element-hq#22018. * Device manager - put client/browser device metadata in correct section ([\element-hq#9447](matrix-org/matrix-react-sdk#9447)). Contributed by @kerryarchibald. * Update the room unread notification counter when the server changes the value without any related read receipt ([\element-hq#9438](matrix-org/matrix-react-sdk#9438)).
2 parents 22c4e82 + 1d8e353 commit 99c7dc3

File tree

10 files changed

+729
-619
lines changed

10 files changed

+729
-619
lines changed

.github/workflows/triage-labelled.yml

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ jobs:
1717
contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
1818
contains(github.event.issue.labels.*.name, 'A-Tags') ||
1919
contains(github.event.issue.labels.*.name, 'A-Video-Rooms') ||
20-
contains(github.event.issue.labels.*.name, 'A-Message-Starring')
20+
contains(github.event.issue.labels.*.name, 'A-Message-Starring') ||
21+
contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
2122
steps:
2223
- uses: actions/github-script@v5
2324
with:
@@ -29,6 +30,23 @@ jobs:
2930
labels: ['Z-Labs']
3031
})
3132
33+
apply_Help-Wanted_label:
34+
name: Add "Help Wanted" label to all "good first issue" and Hacktoberfest
35+
runs-on: ubuntu-latest
36+
if: >
37+
contains(github.event.issue.labels.*.name, 'good first issue') ||
38+
contains(github.event.issue.labels.*.name, 'Hacktoberfest')
39+
steps:
40+
- uses: actions/github-script@v5
41+
with:
42+
script: |
43+
github.rest.issues.addLabels({
44+
issue_number: context.issue.number,
45+
owner: context.repo.owner,
46+
repo: context.repo.repo,
47+
labels: ['Help Wanted']
48+
})
49+
3250
move_needs_info_issues:
3351
name: X-Needs-Info issues to Need info column on triage board
3452
runs-on: ubuntu-latest
@@ -44,7 +62,13 @@ jobs:
4462
name: P1 X-Needs-Design to Design project board
4563
runs-on: ubuntu-latest
4664
if: >
47-
contains(github.event.issue.labels.*.name, 'X-Needs-Design')
65+
contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
66+
(contains(github.event.issue.labels.*.name, 'S-Critical') &&
67+
(contains(github.event.issue.labels.*.name, 'O-Frequent') ||
68+
contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
69+
contains(github.event.issue.labels.*.name, 'S-Major') &&
70+
contains(github.event.issue.labels.*.name, 'O-Frequent') ||
71+
contains(github.event.issue.labels.*.name, 'A11y'))
4872
steps:
4973
- uses: octokit/[email protected]
5074
id: add_to_project
@@ -161,6 +185,7 @@ jobs:
161185
env:
162186
PROJECT_ID: "PN_kwDOAM0swc2KCw"
163187
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
188+
164189
move_message_bubbles_issues:
165190
name: A-Message-Bubbles to Message bubbles board
166191
runs-on: ubuntu-latest
@@ -288,7 +313,7 @@ jobs:
288313
name: Add labelled issues to PS features team 3
289314
runs-on: ubuntu-latest
290315
if: >
291-
contains(github.event.issue.labels.*.name, 'A-Composer-WYSIWYG')
316+
contains(github.event.issue.labels.*.name, 'A-Rich-Text-Editor')
292317
steps:
293318
- uses: octokit/[email protected]
294319
id: add_to_project
@@ -307,3 +332,27 @@ jobs:
307332
env:
308333
PROJECT_ID: "PVT_kwDOAM0swc4AHJKW"
309334
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
335+
336+
voip:
337+
name: Add labelled issues to VoIP project board
338+
runs-on: ubuntu-latest
339+
if: >
340+
contains(github.event.issue.labels.*.name, 'Team: VoIP')
341+
steps:
342+
- uses: octokit/[email protected]
343+
id: add_to_project
344+
with:
345+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
346+
query: |
347+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
348+
addProjectV2ItemById(input: {projectId: $projectid contentId: $contentid}) {
349+
item {
350+
id
351+
}
352+
}
353+
}
354+
projectid: ${{ env.PROJECT_ID }}
355+
contentid: ${{ github.event.issue.node_id }}
356+
env:
357+
PROJECT_ID: "PVT_kwDOAM0swc4ABMIk"
358+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

CHANGELOG.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,41 @@
1+
Changes in [1.11.14](https://github.com/vector-im/element-web/releases/tag/v1.11.14) (2022-11-08)
2+
=================================================================================================
3+
4+
## ✨ Features
5+
* Loading threads with server-side assistance ([\#9356](https://github.com/matrix-org/matrix-react-sdk/pull/9356)). Fixes #21807, #21799, #21911, #22141, #22157, #22641, #22501 #22438 and #21678. Contributed by @justjanne.
6+
* Make thread replies trigger a room list re-ordering ([\#9510](https://github.com/matrix-org/matrix-react-sdk/pull/9510)). Fixes #21700.
7+
* Device manager - add extra details to device security and renaming ([\#9501](https://github.com/matrix-org/matrix-react-sdk/pull/9501)). Contributed by @kerryarchibald.
8+
* Add plain text mode to the wysiwyg composer ([\#9503](https://github.com/matrix-org/matrix-react-sdk/pull/9503)). Contributed by @florianduros.
9+
* Sliding Sync: improve sort order, show subspace rooms, better tombstoned room handling ([\#9484](https://github.com/matrix-org/matrix-react-sdk/pull/9484)).
10+
* Device manager - add learn more popups to filtered sessions section ([\#9497](https://github.com/matrix-org/matrix-react-sdk/pull/9497)). Contributed by @kerryarchibald.
11+
* Show thread notification if thread timeline is closed ([\#9495](https://github.com/matrix-org/matrix-react-sdk/pull/9495)). Fixes #23589.
12+
* Add message editing to wysiwyg composer ([\#9488](https://github.com/matrix-org/matrix-react-sdk/pull/9488)). Contributed by @florianduros.
13+
* Device manager - confirm sign out of other sessions ([\#9487](https://github.com/matrix-org/matrix-react-sdk/pull/9487)). Contributed by @kerryarchibald.
14+
* Automatically request logs from other users in a call when submitting logs ([\#9492](https://github.com/matrix-org/matrix-react-sdk/pull/9492)).
15+
* Add thread notification with server assistance (MSC3773) ([\#9400](https://github.com/matrix-org/matrix-react-sdk/pull/9400)). Fixes #21114, #21413, #21416, #21433, #21481, #21798, #21823 #23192 and #21765.
16+
* Support for login + E2EE set up with QR ([\#9403](https://github.com/matrix-org/matrix-react-sdk/pull/9403)). Contributed by @hughns.
17+
* Allow pressing Enter to send messages in new composer ([\#9451](https://github.com/matrix-org/matrix-react-sdk/pull/9451)). Contributed by @andybalaam.
18+
19+
## 🐛 Bug Fixes
20+
* Fix regressions around media uploads failing and causing soft crashes ([\#9549](https://github.com/matrix-org/matrix-react-sdk/pull/9549)). Fixes matrix-org/element-web-rageshakes#16831, matrix-org/element-web-rageshakes#16824 matrix-org/element-web-rageshakes#16810 and vector-im/element-web#23641.
21+
* Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321.
22+
* Fix config.json failing to load for Jitsi wrapper in non-root deployment ([\#23577](https://github.com/vector-im/element-web/pull/23577)).
23+
* Fix NotificationBadge unsent color ([\#9522](https://github.com/matrix-org/matrix-react-sdk/pull/9522)). Fixes #23646.
24+
* Fix room list sorted by recent on app startup ([\#9515](https://github.com/matrix-org/matrix-react-sdk/pull/9515)). Fixes #23635.
25+
* Reset custom power selector when blurred on empty ([\#9508](https://github.com/matrix-org/matrix-react-sdk/pull/9508)). Fixes #23481.
26+
* Reinstate timeline/redaction callbacks when updating notification state ([\#9494](https://github.com/matrix-org/matrix-react-sdk/pull/9494)). Fixes #23554.
27+
* Only render NotificationBadge when needed ([\#9493](https://github.com/matrix-org/matrix-react-sdk/pull/9493)). Fixes #23584.
28+
* Fix embedded Element Call screen sharing ([\#9485](https://github.com/matrix-org/matrix-react-sdk/pull/9485)). Fixes #23571.
29+
* Send Content-Type: application/json header for integration manager /register API ([\#9490](https://github.com/matrix-org/matrix-react-sdk/pull/9490)). Fixes #23580.
30+
* Fix joining calls without audio or video inputs ([\#9486](https://github.com/matrix-org/matrix-react-sdk/pull/9486)). Fixes #23511.
31+
* Ensure spaces in the spotlight dialog have rounded square avatars ([\#9480](https://github.com/matrix-org/matrix-react-sdk/pull/9480)). Fixes #23515.
32+
* Only show mini avatar uploader in room intro when no avatar yet exists ([\#9479](https://github.com/matrix-org/matrix-react-sdk/pull/9479)). Fixes #23552.
33+
* Fix threads fallback incorrectly targets root event ([\#9229](https://github.com/matrix-org/matrix-react-sdk/pull/9229)). Fixes #23147.
34+
* Align video call icon with banner text ([\#9460](https://github.com/matrix-org/matrix-react-sdk/pull/9460)).
35+
* Set relations helper when creating event tile context menu ([\#9253](https://github.com/matrix-org/matrix-react-sdk/pull/9253)). Fixes #22018.
36+
* Device manager - put client/browser device metadata in correct section ([\#9447](https://github.com/matrix-org/matrix-react-sdk/pull/9447)). Contributed by @kerryarchibald.
37+
* Update the room unread notification counter when the server changes the value without any related read receipt ([\#9438](https://github.com/matrix-org/matrix-react-sdk/pull/9438)).
38+
139
Changes in [1.11.13](https://github.com/vector-im/element-web/releases/tag/v1.11.13) (2022-11-01)
240
=================================================================================================
341

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Builder
2-
FROM node:16-buster as builder
2+
FROM --platform=$BUILDPLATFORM node:16-buster as builder
33

44
# Support custom branches of the react-sdk and js-sdk. This also helps us build
55
# images of element-web develop.

docs/config.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,3 +551,4 @@ The following are undocumented or intended for developer use only.
551551
2. `sync_timeline_limit`
552552
3. `dangerously_allow_unsafe_and_insecure_passwords`
553553
4. `latex_maths_delims`: An optional setting to override the default delimiters used for maths parsing. See https://github.com/matrix-org/matrix-react-sdk/pull/5939 for details. Only used when `feature_latex_maths` is enabled.
554+
5. `voice_broadcast.chunk_length`: Target chunk length in seconds for the Voice Broadcast feature currently under development.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "element-web",
3-
"version": "1.11.13",
3+
"version": "1.11.14",
44
"description": "A feature-rich client for Matrix.org",
55
"author": "New Vector Ltd.",
66
"repository": {
@@ -60,8 +60,8 @@
6060
"gfm.css": "^1.1.2",
6161
"jsrsasign": "^10.5.25",
6262
"katex": "^0.16.0",
63-
"matrix-js-sdk": "21.0.1",
64-
"matrix-react-sdk": "3.59.1",
63+
"matrix-js-sdk": "21.1.0",
64+
"matrix-react-sdk": "3.60.0",
6565
"matrix-widget-api": "^1.1.1",
6666
"prop-types": "^15.7.2",
6767
"react": "17.0.2",

src/i18n/strings/fi.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,8 @@
2727
"Powered by Matrix": "Moottorina Matrix",
2828
"Your browser can't run %(brand)s": "%(brand)s ei toimi selaimessasi",
2929
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s käyttää edistyneitä selaimen ominaisuuksia, joita nykyinen selaimesi ei tue.",
30-
"Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti"
30+
"Use %(brand)s on mobile": "Käytä %(brand)sia mobiilisti",
31+
"Decentralised, encrypted chat & collaboration powered by $matrixLogo": "Hajautettu, salattu keskustelu & yhteistyö, taustavoimana $matrixLogo",
32+
"%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s käyttöjärjestelmällä %(osName)s",
33+
"%(brand)s Desktop: %(platformName)s": "%(brand)sin työpöytäversio: %(platformName)s"
3134
}

src/i18n/strings/nl.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,25 @@
1010
"Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
1111
"The message from the parser is: %(message)s": "De ontleder meldt: %(message)s",
1212
"Invalid JSON": "Ongeldige JSON",
13-
"Go to your browser to complete Sign In": "Ga naar uw browser om de aanmelding te voltooien",
14-
"Unable to load config file: please refresh the page to try again.": "Kan het configuratiebestand niet laden. Herlaad de pagina alstublieft.",
13+
"Go to your browser to complete Sign In": "Ga naar je browser om de aanmelding te voltooien",
14+
"Unable to load config file: please refresh the page to try again.": "Kan het configuratiebestand niet laden. Herlaad de pagina.",
1515
"%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
1616
"%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
1717
"Unsupported browser": "Niet-ondersteunde browser",
1818
"Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Installeer <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of <safariLink>Safari</safariLink> voor de beste gebruikservaring.",
19-
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "U kunt uw huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.",
19+
"You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Je kan je huidige browser blijven gebruiken, maar sommige of alle functies zouden niet kunnen werken en de weergave van het programma kan verkeerd zijn.",
2020
"I understand the risks and wish to continue": "Ik begrijp de risico's en wil verder gaan",
2121
"Go to element.io": "Ga naar element.io",
2222
"Failed to start": "Opstarten mislukt",
2323
"Open": "Openen",
24-
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Element configuratie bevat ongeldige JSON. Gelieve het probleem te corrigeren daarna de pagina te herladen.",
24+
"Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jouw Element configuratie bevat ongeldige JSON. Corrigeer het probleem en herlaad de pagina.",
2525
"Download Completed": "Download voltooid",
26-
"Your Element is misconfigured": "Uw Element is verkeerd geconfigureerd",
27-
"Your browser can't run %(brand)s": "Uw browser kan %(brand)s niet starten",
28-
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
26+
"Your Element is misconfigured": "Jouw Element is verkeerd geconfigureerd",
27+
"Your browser can't run %(brand)s": "Jouw browser kan %(brand)s niet starten",
28+
"%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in je huidige browser.",
2929
"Powered by Matrix": "Mogelijk gemaakt door Matrix",
30-
"Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
31-
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo"
30+
"Use %(brand)s on mobile": "Gebruik %(brand)s op je mobiel",
31+
"Decentralised, encrypted chat &amp; collaboration powered by $matrixLogo": "Gedecentraliseerde, versleutelde chat &amp; samenwerking mogelijk gemaakt door $matrixLogo",
32+
"%(appName)s: %(browserName)s on %(osName)s": "%(appName)s: %(browserName)s op %(osName)s",
33+
"%(brand)s Desktop: %(platformName)s": "%(brand)s Desktop: %(platformName)s"
3234
}

0 commit comments

Comments
 (0)