forked from element-hq/element-desktop
-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Device manager - hide unverified security recommendation when only current session is unverified ([\#9228](matrix-org/matrix-react-sdk#9228)). Contributed by @kerryarchibald. * Device manager - scroll to filtered list from security recommendations ([\#9227](matrix-org/matrix-react-sdk#9227)). Contributed by @kerryarchibald. * Device manager - updated dropdown style in filtered device list ([\#9226](matrix-org/matrix-react-sdk#9226)). Contributed by @kerryarchibald. * Device manager - device type and verification icons on device tile ([\#9197](matrix-org/matrix-react-sdk#9197)). Contributed by @kerryarchibald. * Description of DM room with more than two other people is now being displayed correctly ([\#9231](matrix-org/matrix-react-sdk#9231)). Fixes element-hq/element-web#23094. * Fix voice messages with multiple composers ([\#9208](matrix-org/matrix-react-sdk#9208)). Fixes element-hq/element-web#23023. Contributed by @grimhilt. * Fix suggested rooms going missing ([\#9236](matrix-org/matrix-react-sdk#9236)). Fixes element-hq/element-web#23190. * Fix tooltip infinitely recursing ([\#9235](matrix-org/matrix-react-sdk#9235)). Fixes matrix-org/element-web-rageshakes#15107, matrix-org/element-web-rageshakes#15093 matrix-org/element-web-rageshakes#15092 and matrix-org/element-web-rageshakes#15077. * Fix plain text export saving ([\#9230](matrix-org/matrix-react-sdk#9230)). Contributed by @jryans. * Add missing space in SecurityRoomSettingsTab ([\#9222](matrix-org/matrix-react-sdk#9222)). Contributed by @gefgu. * Make use of js-sdk roomNameGenerator to handle i18n for generated room names ([\#9209](matrix-org/matrix-react-sdk#9209)). Fixes element-hq/element-web#21369. * Fix progress bar regression throughout the app ([\#9219](matrix-org/matrix-react-sdk#9219)). Fixes element-hq/element-web#23121. * Reuse empty string & space string logic for event types in devtools ([\#9218](matrix-org/matrix-react-sdk#9218)). Fixes element-hq/element-web#23115.
- Loading branch information
Showing
10 changed files
with
2,605 additions
and
291 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| name: Backport | ||
| on: | ||
| pull_request_target: | ||
| types: | ||
| - closed | ||
| - labeled | ||
| branches: | ||
| - develop | ||
|
|
||
| jobs: | ||
| backport: | ||
| name: Backport | ||
| runs-on: ubuntu-latest | ||
| # Only react to merged PRs for security reasons. | ||
| # See https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#pull_request_target. | ||
| if: > | ||
| github.event.pull_request.merged | ||
| && ( | ||
| github.event.action == 'closed' | ||
| || ( | ||
| github.event.action == 'labeled' | ||
| && contains(github.event.label.name, 'backport') | ||
| ) | ||
| ) | ||
| steps: | ||
| - uses: tibdex/backport@v2 | ||
| with: | ||
| labels_template: "<%= JSON.stringify(labels) %>" | ||
| # We can't use GITHUB_TOKEN here or CI won't run on the new PR | ||
| github_token: ${{ secrets.ELEMENT_BOT_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,3 +41,38 @@ jobs: | |
|
|
||
| - name: Run Linter | ||
| run: "yarn run lint:js" | ||
|
|
||
| tsc-strict: | ||
| name: Typescript Strict Error Checker | ||
| if: github.event_name == 'pull_request' | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| pull-requests: read | ||
| checks: write | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Get diff lines | ||
| id: diff | ||
| uses: Equip-Collaboration/[email protected] | ||
| with: | ||
| include: '["\\.tsx?$"]' | ||
|
|
||
| - name: Detecting files changed | ||
| id: files | ||
| uses: futuratrepadeira/[email protected] | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| pattern: '^.*\.tsx?$' | ||
|
|
||
| - uses: t3chguy/typescript-check-action@main | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| use-check: false | ||
| check-fail-mode: added | ||
| output-behaviour: annotate | ||
| ts-extra-args: '--strict' | ||
| files-changed: ${{ steps.files.outputs.files_updated }} | ||
| files-added: ${{ steps.files.outputs.files_created }} | ||
| files-deleted: ${{ steps.files.outputs.files_deleted }} | ||
| line-numbers: ${{ steps.diff.outputs.lineNumbers }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,3 +14,5 @@ | |
| .vscode | ||
| .vscode/ | ||
| .DS_Store | ||
| /test_artifacts/ | ||
| /coverage/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| module.exports = { | ||
| presets: [ | ||
| ['@babel/preset-env', { targets: { node: 'current' } }], | ||
| '@babel/preset-typescript', | ||
| ], | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,9 @@ | ||
| #!/bin/bash | ||
| # | ||
| # Script to perform a release of element-desktop. | ||
| # | ||
| # Requires githib-changelog-generator; to install, do | ||
| # pip install git+https://github.com/matrix-org/github-changelog-generator.git | ||
|
|
||
| set -e | ||
|
|
||
| cd `dirname $0` | ||
| cd "$(dirname "$0")" | ||
|
|
||
| ./node_modules/matrix-js-sdk/release.sh -n "$@" | ||
| ./node_modules/matrix-js-sdk/release.sh "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* | ||
| Copyright 2022 The Matrix.org Foundation C.I.C. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import * as os from "os"; | ||
| import * as fs from "fs"; | ||
| import * as path from "path"; | ||
| import "expect-playwright"; | ||
| import { _electron as electron } from "playwright"; | ||
| import { ElectronApplication, Page } from "playwright-core"; | ||
|
|
||
| describe("App launch", () => { | ||
| const artifactsPath = path.join(process.cwd(), "test_artifacts"); | ||
| fs.mkdirSync(artifactsPath); | ||
|
|
||
| const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "element-desktop-tests")); | ||
| console.log("Using temp profile directory: ", tmpDir); | ||
|
|
||
| let app: ElectronApplication; | ||
| let window: Page; | ||
|
|
||
| beforeAll(async () => { | ||
| const args = ["--profile-dir", tmpDir]; | ||
|
|
||
| const executablePath = process.env["ELEMENT_DESKTOP_EXECUTABLE"]; | ||
| if (!executablePath) { | ||
| // Unpackaged mode testing | ||
| args.unshift("./lib/electron-main.js"); | ||
| } | ||
|
|
||
| app = await electron.launch({ | ||
| executablePath, | ||
| args, | ||
| recordVideo: { | ||
| dir: artifactsPath, | ||
| } | ||
| }); | ||
| window = await app.firstWindow(); | ||
| }); | ||
|
|
||
| afterAll(async () => { | ||
| await app?.close(); | ||
| fs.rmSync(tmpDir, { recursive: true }); | ||
| }); | ||
|
|
||
| it("should launch and render the welcome view successfully", async () => { | ||
| await window.locator("#matrixchat").waitFor(); | ||
| await window.locator(".mx_Welcome").waitFor(); | ||
| await expect(window).toMatchURL("vector://vector/webapp/#/welcome"); | ||
| await window.screenshot({ path: path.join(artifactsPath, "welcome.png") }); | ||
| }, 30000); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.