Skip to content

Commit 8126c80

Browse files
committed
Merge tag 'v3.63.0' into sc
* Prevent unnecessary m.direct updates ([\matrix-org#9805](matrix-org#9805)). Fixes element-hq/element-web#24059. * Fix checkForPreJoinUISI for thread roots ([\matrix-org#9803](matrix-org#9803)). Fixes element-hq/element-web#24054. * Add inline code formatting to rich text editor ([\matrix-org#9720](matrix-org#9720)). * Add emoji handling for plain text mode of the new rich text editor ([\matrix-org#9727](matrix-org#9727)). * Overlay virtual room call events into main timeline ([\matrix-org#9626](matrix-org#9626)). Fixes element-hq/element-web#22929. * Adds a new section under "Room Settings" > "Roles & Permissions" which adds the possibility to multiselect users from this room and grant them more permissions. ([\matrix-org#9596](matrix-org#9596)). Contributed by @GoodGuyMarco. * Add emoji handling for rich text mode ([\matrix-org#9661](matrix-org#9661)). * Add setting to hide bold notifications ([\matrix-org#9705](matrix-org#9705)). * Further password reset flow enhancements ([\matrix-org#9662](matrix-org#9662)). * Snooze the bulk unverified sessions reminder on dismiss ([\matrix-org#9706](matrix-org#9706)). * Honor advanced audio processing settings when recording voice messages ([\matrix-org#9610](matrix-org#9610)). Contributed by @MrAnno. * Improve the visual balance of bubble layout ([\matrix-org#9704](matrix-org#9704)). * Add config setting to disable bulk unverified sessions nag ([\matrix-org#9657](matrix-org#9657)). * Only display bulk unverified sessions nag when current sessions is verified ([\matrix-org#9656](matrix-org#9656)). * Separate labs and betas more clearly ([\matrix-org#8969](matrix-org#8969)). Fixes element-hq/element-web#22706. * Show user an error if we fail to create a DM for verification. ([\matrix-org#9624](matrix-org#9624)). * Fix issue where thread panel did not update correctly ([\matrix-org#9746](matrix-org#9746)). Fixes element-hq/element-web#23971. * Remove async call to get virtual room from room load ([\matrix-org#9743](matrix-org#9743)). Fixes element-hq/element-web#23968. * Check each thread for unread messages. ([\matrix-org#9723](matrix-org#9723)). * Device manage - handle sessions that don't support encryption ([\matrix-org#9717](matrix-org#9717)). Fixes element-hq/element-web#23722. * Fix hover state for formatting buttons (Rich text editor) (fix element-hq/element-web/issues/23832) ([\matrix-org#9715](matrix-org#9715)). * Don't allow group calls to be unterminated ([\matrix-org#9710](matrix-org#9710)). * Fix replies to emotes not showing as inline ([\matrix-org#9707](matrix-org#9707)). Fixes element-hq/element-web#23903. * Update copy of 'Change layout' button to match Element Call ([\matrix-org#9703](matrix-org#9703)). * Fix call splitbrains when switching between rooms ([\matrix-org#9692](matrix-org#9692)). * bugfix: fix an issue where the Notifier would incorrectly fire for non-timeline events ([\matrix-org#9664](matrix-org#9664)). Fixes element-hq/element-web#17263. * Fix power selector being wrongly disabled for admins themselves ([\matrix-org#9681](matrix-org#9681)). Fixes element-hq/element-web#23882. * Show day counts in call durations ([\matrix-org#9641](matrix-org#9641)).
2 parents 4e56372 + cf36aca commit 8126c80

File tree

1,612 files changed

+57694
-51377
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,612 files changed

+57694
-51377
lines changed

.eslintrc.js

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
module.exports = {
2-
plugins: [
3-
"matrix-org",
4-
],
5-
extends: [
6-
"plugin:matrix-org/babel",
7-
"plugin:matrix-org/react",
8-
"plugin:matrix-org/a11y",
9-
],
2+
plugins: ["matrix-org"],
3+
extends: ["plugin:matrix-org/babel", "plugin:matrix-org/react", "plugin:matrix-org/a11y"],
104
env: {
115
browser: true,
126
node: true,
@@ -19,7 +13,6 @@ module.exports = {
1913
"no-constant-condition": "off",
2014
"prefer-promise-reject-errors": "off",
2115
"no-async-promise-executor": "off",
22-
"quotes": "off",
2316
"no-extra-boolean-cast": "off",
2417

2518
// Bind or arrow functions in props causes performance issues (but we
@@ -41,34 +34,47 @@ module.exports = {
4134
],
4235

4336
// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
44-
"no-restricted-imports": ["error", {
45-
"paths": [{
46-
"name": "matrix-js-sdk",
47-
"message": "Please use matrix-js-sdk/src/matrix instead",
48-
}, {
49-
"name": "matrix-js-sdk/",
50-
"message": "Please use matrix-js-sdk/src/matrix instead",
51-
}, {
52-
"name": "matrix-js-sdk/src",
53-
"message": "Please use matrix-js-sdk/src/matrix instead",
54-
}, {
55-
"name": "matrix-js-sdk/src/",
56-
"message": "Please use matrix-js-sdk/src/matrix instead",
57-
}, {
58-
"name": "matrix-js-sdk/src/index",
59-
"message": "Please use matrix-js-sdk/src/matrix instead",
60-
}, {
61-
"name": "matrix-react-sdk",
62-
"message": "Please use matrix-react-sdk/src/index instead",
63-
}, {
64-
"name": "matrix-react-sdk/",
65-
"message": "Please use matrix-react-sdk/src/index instead",
66-
}],
67-
"patterns": [{
68-
"group": ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
69-
"message": "Please use matrix-js-sdk/src/* instead",
70-
}],
71-
}],
37+
"no-restricted-imports": [
38+
"error",
39+
{
40+
paths: [
41+
{
42+
name: "matrix-js-sdk",
43+
message: "Please use matrix-js-sdk/src/matrix instead",
44+
},
45+
{
46+
name: "matrix-js-sdk/",
47+
message: "Please use matrix-js-sdk/src/matrix instead",
48+
},
49+
{
50+
name: "matrix-js-sdk/src",
51+
message: "Please use matrix-js-sdk/src/matrix instead",
52+
},
53+
{
54+
name: "matrix-js-sdk/src/",
55+
message: "Please use matrix-js-sdk/src/matrix instead",
56+
},
57+
{
58+
name: "matrix-js-sdk/src/index",
59+
message: "Please use matrix-js-sdk/src/matrix instead",
60+
},
61+
{
62+
name: "matrix-react-sdk",
63+
message: "Please use matrix-react-sdk/src/index instead",
64+
},
65+
{
66+
name: "matrix-react-sdk/",
67+
message: "Please use matrix-react-sdk/src/index instead",
68+
},
69+
],
70+
patterns: [
71+
{
72+
group: ["matrix-js-sdk/lib", "matrix-js-sdk/lib/", "matrix-js-sdk/lib/**"],
73+
message: "Please use matrix-js-sdk/src/* instead",
74+
},
75+
],
76+
},
77+
],
7278

7379
// There are too many a11y violations to fix at once
7480
// Turn violated rules off until they are fixed
@@ -91,19 +97,15 @@ module.exports = {
9197
},
9298
overrides: [
9399
{
94-
files: [
95-
"src/**/*.{ts,tsx}",
96-
"test/**/*.{ts,tsx}",
97-
"cypress/**/*.ts",
98-
],
99-
extends: [
100-
"plugin:matrix-org/typescript",
101-
"plugin:matrix-org/react",
102-
],
100+
files: ["src/**/*.{ts,tsx}", "test/**/*.{ts,tsx}", "cypress/**/*.ts"],
101+
extends: ["plugin:matrix-org/typescript", "plugin:matrix-org/react"],
103102
rules: {
103+
// temporary disabled
104+
"@typescript-eslint/explicit-function-return-type": "off",
105+
"@typescript-eslint/explicit-member-accessibility": "off",
106+
104107
// Things we do that break the ideal style
105108
"prefer-promise-reject-errors": "off",
106-
"quotes": "off",
107109
"no-extra-boolean-cast": "off",
108110

109111
// Remove Babel things manually due to override limitations
@@ -117,10 +119,6 @@ module.exports = {
117119
"@typescript-eslint/ban-ts-comment": "off",
118120
// We're okay with assertion errors when we ask for them
119121
"@typescript-eslint/no-non-null-assertion": "off",
120-
121-
// The non-TypeScript rule produces false positives
122-
"func-call-spacing": "off",
123-
"@typescript-eslint/func-call-spacing": ["error"],
124122
},
125123
},
126124
// temporary override for offending icon require files
@@ -153,12 +151,12 @@ module.exports = {
153151
"src/components/views/rooms/MessageComposer.tsx",
154152
"src/components/views/rooms/ReplyPreview.tsx",
155153
"src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx",
156-
"src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx"
154+
"src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx",
157155
],
158156
rules: {
159157
"@typescript-eslint/no-var-requires": "off",
160158
},
161-
}
159+
},
162160
],
163161
settings: {
164162
react: {
@@ -168,7 +166,7 @@ module.exports = {
168166
};
169167

170168
function buildRestrictedPropertiesOptions(properties, message) {
171-
return properties.map(prop => {
169+
return properties.map((prop) => {
172170
let [object, property] = prop.split(".");
173171
if (object === "*") {
174172
object = undefined;

.github/renovate.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [
4-
"github>matrix-org/renovate-config-element-web"
5-
]
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["github>matrix-org/renovate-config-element-web"]
64
}

.github/workflows/backport.yml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
name: Backport
22
on:
3-
pull_request_target:
4-
types:
5-
- closed
6-
- labeled
7-
branches:
8-
- develop
3+
pull_request_target:
4+
types:
5+
- closed
6+
- labeled
7+
branches:
8+
- develop
99

1010
jobs:
11-
backport:
12-
name: Backport
13-
runs-on: ubuntu-latest
14-
# Only react to merged PRs for security reasons.
15-
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
16-
if: >
17-
github.event.pull_request.merged
18-
&& (
19-
github.event.action == 'closed'
20-
|| (
21-
github.event.action == 'labeled'
22-
&& contains(github.event.label.name, 'backport')
23-
)
24-
)
25-
steps:
26-
- uses: tibdex/backport@v2
27-
with:
28-
labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
29-
# We can't use GITHUB_TOKEN here or CI won't run on the new PR
30-
github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}
11+
backport:
12+
name: Backport
13+
runs-on: ubuntu-latest
14+
# Only react to merged PRs for security reasons.
15+
# See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target.
16+
if: >
17+
github.event.pull_request.merged
18+
&& (
19+
github.event.action == 'closed'
20+
|| (
21+
github.event.action == 'labeled'
22+
&& contains(github.event.label.name, 'backport')
23+
)
24+
)
25+
steps:
26+
- uses: tibdex/backport@v2
27+
with:
28+
labels_template: "<%= JSON.stringify([...labels, 'X-Release-Blocker']) %>"
29+
# We can't use GITHUB_TOKEN here or CI won't run on the new PR
30+
github_token: ${{ secrets.ELEMENT_BOT_TOKEN }}

.github/workflows/release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: Release Process
22
on:
3-
release:
4-
types: [ published ]
3+
release:
4+
types: [published]
55
concurrency: ${{ github.workflow }}-${{ github.ref }}
66
jobs:
7-
npm:
8-
name: Publish
9-
uses: matrix-org/matrix-js-sdk/.github/workflows/release-npm.yml@develop
10-
secrets:
11-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
7+
npm:
8+
name: Publish
9+
uses: matrix-org/matrix-js-sdk/.github/workflows/release-npm.yml@develop
10+
secrets:
11+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

0 commit comments

Comments
 (0)