Skip to content

Commit 0852ccb

Browse files
committed
Merge tag 'v1.11.18' into sc
* Switch threads on for everyone ([\#9879](matrix-org/matrix-react-sdk#9879)). * Make threads use new Unable to Decrypt UI ([\#9876](matrix-org/matrix-react-sdk#9876)). Fixes element-hq/element-web#24060. * Add edit and remove actions to link in RTE ([\#9864](matrix-org/matrix-react-sdk#9864)). * Remove extensible events v1 experimental rendering ([\#9881](matrix-org/matrix-react-sdk#9881)). * Make create poll dialog scale better (PSG-929) ([\#9873](matrix-org/matrix-react-sdk#9873)). Fixes element-hq/element-web#21855. * Change RTE mode icons ([\#9861](matrix-org/matrix-react-sdk#9861)). * Device manager - prune client information events after remote sign out ([\#9874](matrix-org/matrix-react-sdk#9874)). * Check connection before starting broadcast ([\#9857](matrix-org/matrix-react-sdk#9857)). * Enable sent receipt for poll start events (PSG-962) ([\#9870](matrix-org/matrix-react-sdk#9870)). * Change clear notifications to have more readable copy ([\#9867](matrix-org/matrix-react-sdk#9867)). * Combine search results when the query is present in multiple successive messages ([\#9855](matrix-org/matrix-react-sdk#9855)). Fixes element-hq/element-web#3977. Contributed by @grimhilt. * Disable bubbles for broadcasts ([\#9860](matrix-org/matrix-react-sdk#9860)). Fixes element-hq/element-web#24140. * Enable reactions and replies for broadcasts ([\#9856](matrix-org/matrix-react-sdk#9856)). Fixes element-hq/element-web#24042. * Improve switching between rich and plain editing modes ([\#9776](matrix-org/matrix-react-sdk#9776)). * Redesign the picture-in-picture window ([\#9800](matrix-org/matrix-react-sdk#9800)). Fixes element-hq/element-web#23980. * User on-boarding tasks now appear in a static order. ([\#9799](matrix-org/matrix-react-sdk#9799)). Contributed by @GoodGuyMarco. * Device manager - contextual menus ([\#9832](matrix-org/matrix-react-sdk#9832)). * If listening a non-live broadcast and changing the room, the broadcast will be paused ([\#9825](matrix-org/matrix-react-sdk#9825)). Fixes element-hq/element-web#24078. * Consider own broadcasts from other device as a playback ([\#9821](matrix-org/matrix-react-sdk#9821)). Fixes element-hq/element-web#24068. * Add link creation to rich text editor ([\#9775](matrix-org/matrix-react-sdk#9775)). * Add mark as read option in room setting ([\#9798](matrix-org/matrix-react-sdk#9798)). Fixes element-hq/element-web#24053. * Device manager - current device design and copy tweaks ([\#9801](matrix-org/matrix-react-sdk#9801)). * Unify notifications panel event design ([\#9754](matrix-org/matrix-react-sdk#9754)). * Add actions for integration manager to send and read certain events ([\#9740](matrix-org/matrix-react-sdk#9740)). * Device manager - design tweaks ([\#9768](matrix-org/matrix-react-sdk#9768)). * Change room list sorting to activity and unread first by default ([\#9773](matrix-org/matrix-react-sdk#9773)). Fixes element-hq/element-web#24014. * Add a config flag to enable the rust crypto-sdk ([\#9759](matrix-org/matrix-react-sdk#9759)). * Improve decryption error UI by consolidating error messages and providing instructions when possible ([\#9544](matrix-org/matrix-react-sdk#9544)). Contributed by @duxovni. * Honor font settings in Element Call ([\#9751](matrix-org/matrix-react-sdk#9751)). Fixes element-hq/element-web#23661. * Device manager - use deleteAccountData to prune device manager client information events ([\#9734](matrix-org/matrix-react-sdk#9734)). * Display rooms & threads as unread (bold) if threads have unread messages. ([\#9763](matrix-org/matrix-react-sdk#9763)). Fixes element-hq/element-web#23907. * Don't prefer STIXGeneral over the default font ([\#9711](matrix-org/matrix-react-sdk#9711)). Fixes element-hq/element-web#23899. * Use the same avatar colour when creating 1:1 DM rooms ([\#9850](matrix-org/matrix-react-sdk#9850)). Fixes element-hq/element-web#23476. * Fix space lock icon size ([\#9854](matrix-org/matrix-react-sdk#9854)). Fixes element-hq/element-web#24128. * Make calls automatically disconnect if the widget disappears ([\#9862](matrix-org/matrix-react-sdk#9862)). Fixes element-hq/element-web#23664. * Fix emoji in RTE editing ([\#9827](matrix-org/matrix-react-sdk#9827)). * Fix export with attachments on formats txt and json ([\#9851](matrix-org/matrix-react-sdk#9851)). Fixes element-hq/element-web#24130. Contributed by @grimhilt. * Fixed empty `Content-Type` for encrypted uploads ([\#9848](matrix-org/matrix-react-sdk#9848)). Contributed by @K3das. * Fix sign-in instead link on password reset page ([\#9820](matrix-org/matrix-react-sdk#9820)). Fixes element-hq/element-web#24087. * The seekbar now initially shows the current position ([\#9796](matrix-org/matrix-react-sdk#9796)). Fixes element-hq/element-web#24051. * Fix: Editing a poll will silently change it to a closed poll ([\#9809](matrix-org/matrix-react-sdk#9809)). Fixes element-hq/element-web#23176. * Make call tiles look less broken in the right panel ([\#9808](matrix-org/matrix-react-sdk#9808)). Fixes element-hq/element-web#23716. * Prevent unnecessary m.direct updates ([\#9805](matrix-org/matrix-react-sdk#9805)). Fixes element-hq/element-web#24059. * Fix checkForPreJoinUISI for thread roots ([\#9803](matrix-org/matrix-react-sdk#9803)). Fixes element-hq/element-web#24054. * Snap in PiP widget when content changed ([\#9797](matrix-org/matrix-react-sdk#9797)). Fixes element-hq/element-web#24050. * Load RTE components only when RTE labs is enabled ([\#9804](matrix-org/matrix-react-sdk#9804)). * Ensure that events are correctly updated when they are edited. ([\#9789](matrix-org/matrix-react-sdk#9789)). * When stopping a broadcast also stop the playback ([\#9795](matrix-org/matrix-react-sdk#9795)). Fixes element-hq/element-web#24052. * Prevent to start two broadcasts at the same time ([\#9744](matrix-org/matrix-react-sdk#9744)). Fixes element-hq/element-web#23973. * Correctly handle limited sync responses by resetting the thread timeline ([\#3056](matrix-org/matrix-js-sdk#3056)). Fixes element-hq/element-web#23952. * Fix failure to start in firefox private browser ([\#3058](matrix-org/matrix-js-sdk#3058)). Fixes element-hq/element-web#24216.
2 parents 22286e6 + c3781b9 commit 0852ccb

Some content is hidden

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

69 files changed

+2670
-2557
lines changed

.eslintrc.js

+14-16
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module.exports = {
22
plugins: ["matrix-org"],
3-
extends: [
4-
"plugin:matrix-org/javascript",
5-
],
3+
extends: ["plugin:matrix-org/javascript"],
64
parserOptions: {
75
ecmaVersion: 2021,
86
},
@@ -20,19 +18,19 @@ module.exports = {
2018
"prefer-promise-reject-errors": "off",
2119
"no-async-promise-executor": "off",
2220
},
23-
overrides: [{
24-
files: ["{src,scripts,hak}/**/*.{ts,tsx}"],
25-
extends: [
26-
"plugin:matrix-org/typescript",
27-
],
28-
rules: {
29-
// Things we do that break the ideal style
30-
"prefer-promise-reject-errors": "off",
31-
"quotes": "off",
21+
overrides: [
22+
{
23+
files: ["{src,scripts,hak}/**/*.{ts,tsx}"],
24+
extends: ["plugin:matrix-org/typescript"],
25+
rules: {
26+
// Things we do that break the ideal style
27+
"prefer-promise-reject-errors": "off",
28+
"quotes": "off",
3229

33-
"@typescript-eslint/no-explicit-any": "off",
34-
// We're okay with assertion errors when we ask for them
35-
"@typescript-eslint/no-non-null-assertion": "off",
30+
"@typescript-eslint/no-explicit-any": "off",
31+
// We're okay with assertion errors when we ask for them
32+
"@typescript-eslint/no-non-null-assertion": "off",
33+
},
3634
},
37-
}],
35+
],
3836
};

.github/renovate.json

+2-4
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

+26-26
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/build_linux.yaml

+49-49
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,63 @@
22
# Due to this extra care must be taken to only ever run all build_* scripts against the same branch to ensure
33
# the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
44
on:
5-
workflow_call:
6-
inputs:
7-
sqlcipher:
8-
type: string
9-
required: true
10-
description: "How to link sqlcipher, one of 'system' | 'static'"
5+
workflow_call:
6+
inputs:
7+
sqlcipher:
8+
type: string
9+
required: true
10+
description: "How to link sqlcipher, one of 'system' | 'static'"
1111
jobs:
12-
build:
13-
runs-on: ubuntu-latest
14-
steps:
15-
- uses: actions/checkout@v3
12+
build:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v3
1616

17-
- uses: actions/download-artifact@v3
18-
with:
19-
name: webapp
17+
- uses: actions/download-artifact@v3
18+
with:
19+
name: webapp
2020

21-
- name: Cache .hak
22-
id: cache
23-
uses: actions/cache@v3
24-
with:
25-
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
26-
path: |
27-
./.hak
21+
- name: Cache .hak
22+
id: cache
23+
uses: actions/cache@v3
24+
with:
25+
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
26+
path: |
27+
./.hak
2828
29-
- name: Install Rust
30-
if: steps.cache.outputs.cache-hit != 'true'
31-
uses: actions-rs/toolchain@v1
32-
with:
33-
toolchain: stable
29+
- name: Install Rust
30+
if: steps.cache.outputs.cache-hit != 'true'
31+
uses: actions-rs/toolchain@v1
32+
with:
33+
toolchain: stable
3434

35-
- name: Install libsqlcipher-dev
36-
if: steps.cache.outputs.cache-hit != 'true' && inputs.sqlcipher == 'system'
37-
run: sudo apt-get install -y libsqlcipher-dev
35+
- name: Install libsqlcipher-dev
36+
if: steps.cache.outputs.cache-hit != 'true' && inputs.sqlcipher == 'system'
37+
run: sudo apt-get install -y libsqlcipher-dev
3838

39-
- uses: actions/setup-node@v3
40-
with:
41-
cache: "yarn"
39+
- uses: actions/setup-node@v3
40+
with:
41+
cache: "yarn"
4242

43-
# Does not need branch matching as only analyses this layer
44-
- name: Install Deps
45-
run: "yarn install --pure-lockfile"
43+
# Does not need branch matching as only analyses this layer
44+
- name: Install Deps
45+
run: "yarn install --pure-lockfile"
4646

47-
- name: Build Natives
48-
if: steps.cache.outputs.cache-hit != 'true'
49-
run: "yarn build:native"
50-
env:
51-
SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
47+
- name: Build Natives
48+
if: steps.cache.outputs.cache-hit != 'true'
49+
run: "yarn build:native"
50+
env:
51+
SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
5252

53-
- name: Build App
54-
run: "yarn build --publish never -l"
53+
- name: Build App
54+
run: "yarn build --publish never -l"
5555

56-
- name: Install .deb
57-
run: "sudo apt install ./dist/*.deb"
56+
- name: Install .deb
57+
run: "sudo apt install ./dist/*.deb"
5858

59-
- name: Upload Artifacts
60-
uses: actions/upload-artifact@v3
61-
with:
62-
name: linux-sqlcipher-${{ inputs.sqlcipher }}
63-
path: dist
64-
retention-days: 1
59+
- name: Upload Artifacts
60+
uses: actions/upload-artifact@v3
61+
with:
62+
name: linux-sqlcipher-${{ inputs.sqlcipher }}
63+
path: dist
64+
retention-days: 1

.github/workflows/build_macos.yaml

+46-46
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,50 @@
22
# Due to this extra care must be taken to only ever run all build_* scripts against the same branch to ensure
33
# the correct cache scoping, and additional care must be taken to not run untrusted actions on the develop branch.
44
on:
5-
workflow_call:
5+
workflow_call:
66
jobs:
7-
build:
8-
runs-on: macos-latest
9-
steps:
10-
- uses: actions/checkout@v3
11-
12-
- uses: actions/download-artifact@v3
13-
with:
14-
name: webapp
15-
16-
- name: Cache .hak
17-
id: cache
18-
uses: actions/cache@v3
19-
with:
20-
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
21-
path: |
22-
./.hak
23-
24-
- name: Install Rust
25-
if: steps.cache.outputs.cache-hit != 'true'
26-
uses: actions-rs/toolchain@v1
27-
with:
28-
toolchain: stable
29-
target: aarch64-apple-darwin
30-
31-
- uses: actions/setup-node@v3
32-
with:
33-
cache: "yarn"
34-
35-
# Does not need branch matching as only analyses this layer
36-
- name: Install Deps
37-
run: "yarn install --pure-lockfile"
38-
39-
- name: Build Natives
40-
if: steps.cache.outputs.cache-hit != 'true'
41-
run: "yarn build:native:universal"
42-
43-
- name: Build App
44-
run: "yarn build:universal --publish never"
45-
46-
- name: Upload Artifacts
47-
uses: actions/upload-artifact@v3
48-
with:
49-
name: macos
50-
path: dist
51-
retention-days: 1
7+
build:
8+
runs-on: macos-latest
9+
steps:
10+
- uses: actions/checkout@v3
11+
12+
- uses: actions/download-artifact@v3
13+
with:
14+
name: webapp
15+
16+
- name: Cache .hak
17+
id: cache
18+
uses: actions/cache@v3
19+
with:
20+
key: ${{ runner.os }}-${{ hashFiles('hakDependencies.json', 'electronVersion') }}
21+
path: |
22+
./.hak
23+
24+
- name: Install Rust
25+
if: steps.cache.outputs.cache-hit != 'true'
26+
uses: actions-rs/toolchain@v1
27+
with:
28+
toolchain: stable
29+
target: aarch64-apple-darwin
30+
31+
- uses: actions/setup-node@v3
32+
with:
33+
cache: "yarn"
34+
35+
# Does not need branch matching as only analyses this layer
36+
- name: Install Deps
37+
run: "yarn install --pure-lockfile"
38+
39+
- name: Build Natives
40+
if: steps.cache.outputs.cache-hit != 'true'
41+
run: "yarn build:native:universal"
42+
43+
- name: Build App
44+
run: "yarn build:universal --publish never"
45+
46+
- name: Upload Artifacts
47+
uses: actions/upload-artifact@v3
48+
with:
49+
name: macos
50+
path: dist
51+
retention-days: 1

.github/workflows/build_prepare.yaml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
on:
2-
workflow_call:
3-
inputs:
4-
config:
5-
type: string
6-
required: true
7-
description: "The config directory to use"
8-
version:
9-
type: string
10-
required: false
11-
description: "The version tag to fetch, or 'develop', will pick automatically if not passed"
2+
workflow_call:
3+
inputs:
4+
config:
5+
type: string
6+
required: true
7+
description: "The config directory to use"
8+
version:
9+
type: string
10+
required: false
11+
description: "The version tag to fetch, or 'develop', will pick automatically if not passed"
1212
jobs:
13-
prepare:
14-
name: Prepare
15-
runs-on: ubuntu-latest
16-
steps:
17-
- uses: actions/checkout@v3
13+
prepare:
14+
name: Prepare
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v3
1818

19-
- uses: actions/setup-node@v3
20-
with:
21-
cache: "yarn"
19+
- uses: actions/setup-node@v3
20+
with:
21+
cache: "yarn"
2222

23-
- name: Install Deps
24-
run: "yarn install --pure-lockfile"
23+
- name: Install Deps
24+
run: "yarn install --pure-lockfile"
2525

26-
- name: Fetch Element Web
27-
run: yarn run fetch --noverify -d ${{ inputs.config }} ${{ inputs.version }}
26+
- name: Fetch Element Web
27+
run: yarn run fetch --noverify -d ${{ inputs.config }} ${{ inputs.version }}
2828

29-
# We split this out to save the build_* scripts having to do it to make use of `hashFiles` in the cache action
30-
- name: Generate cache hash files
31-
run: |
32-
yarn run --silent electron --version > electronVersion
33-
cat package.json | jq -c .hakDependencies > hakDependencies.json
29+
# We split this out to save the build_* scripts having to do it to make use of `hashFiles` in the cache action
30+
- name: Generate cache hash files
31+
run: |
32+
yarn run --silent electron --version > electronVersion
33+
cat package.json | jq -c .hakDependencies > hakDependencies.json
3434
35-
- uses: actions/upload-artifact@v3
36-
with:
37-
name: webapp
38-
retention-days: 1
39-
path: |
40-
webapp.asar
41-
package.json
42-
electronVersion
43-
hakDependencies.json
35+
- uses: actions/upload-artifact@v3
36+
with:
37+
name: webapp
38+
retention-days: 1
39+
path: |
40+
webapp.asar
41+
package.json
42+
electronVersion
43+
hakDependencies.json

0 commit comments

Comments
 (0)