Skip to content
This repository was archived by the owner on Feb 14, 2026. It is now read-only.

Commit dbc2e90

Browse files
su-exsu-ex
committed
Merge tag 'v1.11.15' into sc
* Switch to notarytool ([\element-hq#440](element-hq#440)). * Make clear notifications work with threads ([\#9575](matrix-org/matrix-react-sdk#9575)). Fixes element-hq/element-web#23751. * Change "None" to "Off" in notification options ([\#9539](matrix-org/matrix-react-sdk#9539)). Contributed by @Arnei. * Advanced audio processing settings ([\#8759](matrix-org/matrix-react-sdk#8759)). Fixes element-hq/element-web#6278. Contributed by @MrAnno. * Add way to create a user notice via config.json ([\#9559](matrix-org/matrix-react-sdk#9559)). * Improve design of the rich text editor ([\#9533](matrix-org/matrix-react-sdk#9533)). * Enable user to zoom beyond image size ([\#5949](matrix-org/matrix-react-sdk#5949)). Contributed by @jaiwanth-v. * Fix: Move "Leave Space" option to the bottom of space context menu ([\#9535](matrix-org/matrix-react-sdk#9535)). Contributed by @hanadi92. * Fix encrypted message search indexing for non-default `--profile` instances. ([\element-hq#433](element-hq#433)). * Make build scripts work on NixOS ([\#23740](element-hq/element-web#23740)). * Fix integration manager `get_open_id_token` action and add E2E tests ([\#9520](matrix-org/matrix-react-sdk#9520)). * Fix links being mangled by markdown processing ([\#9570](matrix-org/matrix-react-sdk#9570)). Fixes element-hq/element-web#23743. * Fix: inline links selecting radio button ([\#9543](matrix-org/matrix-react-sdk#9543)). Contributed by @hanadi92. * fix wrong error message in registration when phone number threepid is in use. ([\#9571](matrix-org/matrix-react-sdk#9571)). Contributed by @bagvand. * Fix missing avatar for show current profiles ([\#9563](matrix-org/matrix-react-sdk#9563)). Fixes element-hq/element-web#23733. * fix read receipts trickling down correctly ([\#9567](matrix-org/matrix-react-sdk#9567)). Fixes element-hq/element-web#23746. * Resilience fix for homeserver without thread notification support ([\#9565](matrix-org/matrix-react-sdk#9565)). * Don't switch to the home page needlessly after leaving a room ([\#9477](matrix-org/matrix-react-sdk#9477)). * Differentiate download and decryption errors when showing images ([\#9562](matrix-org/matrix-react-sdk#9562)). Fixes element-hq/element-web#3892. * Close context menu when a modal is opened to prevent user getting stuck ([\#9560](matrix-org/matrix-react-sdk#9560)). Fixes element-hq/element-web#15610 and element-hq/element-web#10781. * Fix TimelineReset handling when no room associated ([\#9553](matrix-org/matrix-react-sdk#9553)). * Always use current profile on thread events ([\#9524](matrix-org/matrix-react-sdk#9524)). Fixes element-hq/element-web#23648. * Fix `ThreadView` tests not using thread flag ([\#9547](matrix-org/matrix-react-sdk#9547)). * Fix regressions around media uploads failing and causing soft crashes ([\#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/element-web#23641. * Handle deletion of `m.call` events ([\#9540](matrix-org/matrix-react-sdk#9540)). Fixes element-hq/element-web#23663. * Fix /myroomavatar slash command ([\#9536](matrix-org/matrix-react-sdk#9536)). Fixes matrix-org/synapse#14321. * Fix incorrect notification count after leaving a room with notifications ([\#9518](matrix-org/matrix-react-sdk#9518)). Contributed by @Arnei.
2 parents 89af982 + 1bd42c7 commit dbc2e90

File tree

11 files changed

+870
-478
lines changed

11 files changed

+870
-478
lines changed

‎.github/workflows/build_linux.yaml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
sqlcipher:
5+
type: string
6+
required: true
7+
description: "How to link sqlcipher, one of 'system' | 'static'"
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
14+
- uses: actions/download-artifact@v3
15+
with:
16+
name: webapp
17+
18+
- name: Cache .hak
19+
uses: actions/cache@v3
20+
with:
21+
key: ${{ hashFiles('./yarn.lock') }}
22+
path: |
23+
./.hak
24+
25+
- name: Install Rust
26+
uses: actions-rs/toolchain@v1
27+
with:
28+
toolchain: stable
29+
30+
- name: Install libsqlcipher-dev
31+
if: inputs.sqlcipher == 'system'
32+
run: sudo apt-get install -y libsqlcipher-dev
33+
34+
- uses: actions/setup-node@v3
35+
with:
36+
cache: "yarn"
37+
38+
# Does not need branch matching as only analyses this layer
39+
- name: Install Deps
40+
run: "yarn install --pure-lockfile"
41+
42+
- name: Build Natives
43+
run: "yarn build:native"
44+
env:
45+
SQLCIPHER_STATIC: ${{ inputs.sqlcipher == 'static' && '1' || '' }}
46+
47+
- name: Build App
48+
run: "yarn build --publish never -l"
49+
50+
- name: Install .deb
51+
run: "sudo apt install ./dist/*.deb"
52+
53+
- name: Upload Artifacts
54+
uses: actions/upload-artifact@v3
55+
with:
56+
name: linux-sqlcipher-${{ inputs.sqlcipher }}
57+
path: dist
58+
retention-days: 1

‎.github/workflows/build_macos.yaml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
on:
2+
workflow_call:
3+
jobs:
4+
build:
5+
runs-on: macos-latest
6+
steps:
7+
- uses: actions/checkout@v3
8+
9+
- uses: actions/download-artifact@v3
10+
with:
11+
name: webapp
12+
13+
- name: Cache .hak
14+
uses: actions/cache@v3
15+
with:
16+
key: ${{ hashFiles('./yarn.lock') }}
17+
path: |
18+
./.hak
19+
20+
- name: Install Rust
21+
uses: actions-rs/toolchain@v1
22+
with:
23+
toolchain: stable
24+
target: aarch64-apple-darwin
25+
26+
- uses: actions/setup-node@v3
27+
with:
28+
cache: "yarn"
29+
30+
# Does not need branch matching as only analyses this layer
31+
- name: Install Deps
32+
run: "yarn install --pure-lockfile"
33+
34+
- name: Build Natives
35+
run: "yarn build:native:universal"
36+
37+
- name: Build App
38+
run: "yarn build:universal --publish never"
39+
40+
- name: Upload Artifacts
41+
uses: actions/upload-artifact@v3
42+
with:
43+
name: macos
44+
path: dist
45+
retention-days: 1

‎.github/workflows/build_prepare.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
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"
12+
jobs:
13+
prepare:
14+
name: Prepare
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v3
18+
19+
- uses: actions/setup-node@v3
20+
with:
21+
cache: "yarn"
22+
23+
- name: Install Deps
24+
run: "yarn install --pure-lockfile"
25+
26+
- name: Fetch Element Web
27+
run: yarn run fetch --noverify -d ${{ inputs.config }} ${{ inputs.version }}
28+
29+
- uses: actions/upload-artifact@v3
30+
with:
31+
name: webapp
32+
retention-days: 1
33+
path: |
34+
webapp.asar
35+
package.json

‎.github/workflows/build_windows.yaml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
on:
2+
workflow_call:
3+
inputs:
4+
arch:
5+
type: string
6+
required: true
7+
description: "The architecture to build for, one of 'x64' | 'x86'"
8+
jobs:
9+
build:
10+
runs-on: windows-latest
11+
steps:
12+
- uses: kanga333/variable-mapper@master
13+
id: config
14+
with:
15+
key: "${{ inputs.arch }}"
16+
export_to: output
17+
map: |
18+
{
19+
"x64": {
20+
"target": "x86_64-pc-windows-msvc"
21+
},
22+
"x86": {
23+
"target": "i686-pc-windows-msvc",
24+
"build-args": "--ia32"
25+
}
26+
}
27+
28+
- uses: actions/checkout@v3
29+
30+
- uses: actions/download-artifact@v3
31+
with:
32+
name: webapp
33+
34+
- name: Cache .hak
35+
uses: actions/cache@v3
36+
with:
37+
key: ${{ runner.os }}-${{ hashFiles('./yarn.lock') }}
38+
path: |
39+
./.hak
40+
41+
- name: Set up build tools
42+
uses: ilammy/msvc-dev-cmd@v1
43+
with:
44+
arch: ${{ inputs.arch }}
45+
46+
# ActiveTCL package on choco is from 2015,
47+
# this one is newer but includes more than we need
48+
- name: Choco install tclsh
49+
shell: pwsh
50+
run: |
51+
choco install -y magicsplat-tcl-tk --no-progress
52+
echo "${HOME}/AppData/Local/Apps/Tcl86/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
53+
54+
- name: Choco install NetWide Assembler
55+
shell: pwsh
56+
run: |
57+
choco install -y nasm --no-progress
58+
echo "C:/Program Files/NASM" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
59+
60+
- name: Install Rust
61+
uses: actions-rs/toolchain@v1
62+
with:
63+
toolchain: stable
64+
target: ${{ steps.config.outputs.target }}
65+
66+
- uses: actions/setup-node@v3
67+
with:
68+
cache: "yarn"
69+
70+
# Does not need branch matching as only analyses this layer
71+
- name: Install Deps
72+
run: "yarn install --pure-lockfile"
73+
74+
- name: Build Natives
75+
run: |
76+
refreshenv
77+
yarn build:native --target ${{ steps.config.outputs.target }}
78+
79+
- name: Build App
80+
run: "yarn build --publish never -w ${{ steps.config.outputs.build-args }}"
81+
82+
- name: Upload Artifacts
83+
uses: actions/upload-artifact@v3
84+
with:
85+
name: win-${{ inputs.arch }}
86+
path: dist
87+
retention-days: 1

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
Changes in [1.11.15](https://github.com/vector-im/element-desktop/releases/tag/v1.11.15) (2022-11-22)
2+
=====================================================================================================
3+
4+
## ✨ Features
5+
* Switch to notarytool ([\#440](https://github.com/vector-im/element-desktop/pull/440)).
6+
* Make clear notifications work with threads ([\#9575](https://github.com/matrix-org/matrix-react-sdk/pull/9575)). Fixes vector-im/element-web#23751.
7+
* Change "None" to "Off" in notification options ([\#9539](https://github.com/matrix-org/matrix-react-sdk/pull/9539)). Contributed by @Arnei.
8+
* Advanced audio processing settings ([\#8759](https://github.com/matrix-org/matrix-react-sdk/pull/8759)). Fixes vector-im/element-web#6278. Contributed by @MrAnno.
9+
* Add way to create a user notice via config.json ([\#9559](https://github.com/matrix-org/matrix-react-sdk/pull/9559)).
10+
* Improve design of the rich text editor ([\#9533](https://github.com/matrix-org/matrix-react-sdk/pull/9533)).
11+
* Enable user to zoom beyond image size ([\#5949](https://github.com/matrix-org/matrix-react-sdk/pull/5949)). Contributed by @jaiwanth-v.
12+
* Fix: Move "Leave Space" option to the bottom of space context menu ([\#9535](https://github.com/matrix-org/matrix-react-sdk/pull/9535)). Contributed by @hanadi92.
13+
14+
## 🐛 Bug Fixes
15+
* Fix encrypted message search indexing for non-default `--profile` instances. ([\#433](https://github.com/vector-im/element-desktop/pull/433)).
16+
* Make build scripts work on NixOS ([\#23740](https://github.com/vector-im/element-web/pull/23740)).
17+
* Fix integration manager `get_open_id_token` action and add E2E tests ([\#9520](https://github.com/matrix-org/matrix-react-sdk/pull/9520)).
18+
* Fix links being mangled by markdown processing ([\#9570](https://github.com/matrix-org/matrix-react-sdk/pull/9570)). Fixes vector-im/element-web#23743.
19+
* Fix: inline links selecting radio button ([\#9543](https://github.com/matrix-org/matrix-react-sdk/pull/9543)). Contributed by @hanadi92.
20+
* fix wrong error message in registration when phone number threepid is in use. ([\#9571](https://github.com/matrix-org/matrix-react-sdk/pull/9571)). Contributed by @bagvand.
21+
* Fix missing avatar for show current profiles ([\#9563](https://github.com/matrix-org/matrix-react-sdk/pull/9563)). Fixes vector-im/element-web#23733.
22+
* fix read receipts trickling down correctly ([\#9567](https://github.com/matrix-org/matrix-react-sdk/pull/9567)). Fixes vector-im/element-web#23746.
23+
* Resilience fix for homeserver without thread notification support ([\#9565](https://github.com/matrix-org/matrix-react-sdk/pull/9565)).
24+
* Don't switch to the home page needlessly after leaving a room ([\#9477](https://github.com/matrix-org/matrix-react-sdk/pull/9477)).
25+
* Differentiate download and decryption errors when showing images ([\#9562](https://github.com/matrix-org/matrix-react-sdk/pull/9562)). Fixes vector-im/element-web#3892.
26+
* Close context menu when a modal is opened to prevent user getting stuck ([\#9560](https://github.com/matrix-org/matrix-react-sdk/pull/9560)). Fixes vector-im/element-web#15610 and vector-im/element-web#10781.
27+
* Fix TimelineReset handling when no room associated ([\#9553](https://github.com/matrix-org/matrix-react-sdk/pull/9553)).
28+
* Always use current profile on thread events ([\#9524](https://github.com/matrix-org/matrix-react-sdk/pull/9524)). Fixes vector-im/element-web#23648.
29+
* Fix `ThreadView` tests not using thread flag ([\#9547](https://github.com/matrix-org/matrix-react-sdk/pull/9547)).
30+
* 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.
31+
* Handle deletion of `m.call` events ([\#9540](https://github.com/matrix-org/matrix-react-sdk/pull/9540)). Fixes vector-im/element-web#23663.
32+
* Fix /myroomavatar slash command ([\#9536](https://github.com/matrix-org/matrix-react-sdk/pull/9536)). Fixes matrix-org/synapse#14321.
33+
* Fix incorrect notification count after leaving a room with notifications ([\#9518](https://github.com/matrix-org/matrix-react-sdk/pull/9518)). Contributed by @Arnei.
34+
135
Changes in [1.11.14](https://github.com/vector-im/element-desktop/releases/tag/v1.11.14) (2022-11-08)
236
=====================================================================================================
337

‎element.io/nightly/control.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ License: Apache-2.0
33
Vendor: support@element.io
44
Architecture: amd64
55
Maintainer: support@element.io
6-
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
6+
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
77
Recommends: libappindicator3-1, libsqlcipher0
88
Section: net
99
Priority: extra

‎element.io/release/control.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ License: Apache-2.0
33
Vendor: support@element.io
44
Architecture: amd64
55
Maintainer: support@element.io
6-
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0
6+
Depends: libgtk-3-0, libnotify4, libnss3, libxss1, libxtst6, xdg-utils, libatspi2.0-0, libuuid1, libsecret-1-0, libasound2, libgbm1
77
Recommends: libappindicator3-1, libsqlcipher0
88
Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)
99
Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)

‎scripts/fetch-package.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const { setPackageVersion } = require('./set-version.js');
1414

1515
const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
1616
const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
17-
const DEVELOP_TGZ_URL = "https://vector-im.github.io/element-web/develop.tar.gz";
17+
const DEVELOP_TGZ_URL = "https://develop.element.io/develop.tar.gz";
1818
const ASAR_PATH = 'webapp.asar';
1919

2020
async function downloadToFile(url, filename) {

‎src/seshat.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ try {
4747
}
4848
}
4949

50-
const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
51-
5250
let eventIndex: SeshatType | null = null;
5351

5452
const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
@@ -80,6 +78,9 @@ const deleteContents = async (p: string): Promise<void> => {
8078
ipcMain.on('seshat', async function(_ev: IpcMainEvent, payload): Promise<void> {
8179
if (!global.mainWindow) return;
8280

81+
// We do this here to ensure we get the path after --profile has been resolved
82+
const eventStorePath = path.join(app.getPath('userData'), 'EventStore');
83+
8384
const sendError = (id, e) => {
8485
const error = {
8586
message: e.message,

‎test/launch-test.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ describe("App launch", () => {
4848
}
4949
});
5050
window = await app.firstWindow();
51-
});
51+
}, 30000);
5252

5353
afterAll(async () => {
54-
await app?.close();
54+
await app?.close().catch(e => {
55+
console.error(e);
56+
});
5557
fs.rmSync(tmpDir, { recursive: true });
56-
});
58+
}, 30000);
5759

5860
it("should launch and render the welcome view successfully", async () => {
5961
await window.locator("#matrixchat").waitFor();

0 commit comments

Comments
 (0)