Skip to content

Commit 1243cf7

Browse files
Merge tag 'v1.10.14' into rebase/element-web-1.10.14 (with conflicts)
* Make Lao translation available ([\#22358](element-hq/element-web#22358)). Fixes #22327. * Option to disable hardware acceleration on Element Desktop ([\#22295](element-hq/element-web#22295)). Contributed by @novocaine. * Configure custom home.html via `.well-known/matrix/client["io.element.embedded_pages"]["home_url"]` for all your element-web/desktop users ([\#7790](matrix-org/matrix-react-sdk#7790)). Contributed by @johannes-krude. * Live location sharing - open location in OpenStreetMap ([\#8695](matrix-org/matrix-react-sdk#8695)). Contributed by @kerryarchibald. * Show a dialog when Jitsi encounters an error ([\#8701](matrix-org/matrix-react-sdk#8701)). Fixes #22284. * Add support for setting the `avatar_url` of widgets by integration managers. ([\#8550](matrix-org/matrix-react-sdk#8550)). Contributed by @Fox32. * Add an option to ignore (block) a user when reporting their events ([\#8471](matrix-org/matrix-react-sdk#8471)). * Add the option to disable hardware acceleration ([\#8655](matrix-org/matrix-react-sdk#8655)). Contributed by @novocaine. * Slightly better presentation of read receipts to screen reader users ([\#8662](matrix-org/matrix-react-sdk#8662)). Fixes #22293. Contributed by @pvagner. * Add jump to related event context menu item ([\#6775](matrix-org/matrix-react-sdk#6775)). Fixes #19883. * Add public room directory hook ([\#8626](matrix-org/matrix-react-sdk#8626)). * Stop Jitsi if we time out while connecting to a video room ([\#22301](element-hq/element-web#22301)). Fixes #22283. * Remove inline margin from UTD error message inside a reply tile on ThreadView ([\#8708](matrix-org/matrix-react-sdk#8708)). Fixes #22376. Contributed by @luixxiul. * Move unread notification dots of the threads list to the expected position ([\#8700](matrix-org/matrix-react-sdk#8700)). Fixes #22350. Contributed by @luixxiul. * Prevent overflow of grid items on a bubble with UTD generally ([\#8697](matrix-org/matrix-react-sdk#8697)). Contributed by @luixxiul. * Create 'Unable To Decrypt' grid layout for hidden events on a bubble layout ([\#8704](matrix-org/matrix-react-sdk#8704)). Fixes #22365. Contributed by @luixxiul. * Fix - AccessibleButton does not set disabled attribute ([\#8682](matrix-org/matrix-react-sdk#8682)). Contributed by @kerryarchibald. * Fix font not resetting when logging out ([\#8670](matrix-org/matrix-react-sdk#8670)). Fixes #17228. * Fix local aliases section of room settings not working for some homeservers (ie ([\#8698](matrix-org/matrix-react-sdk#8698)). Fixes #22337. * Align EventTile_line with display name on message bubble ([\#8692](matrix-org/matrix-react-sdk#8692)). Fixes #22343. Contributed by @luixxiul. * Convert references to direct chat -> direct message ([\#8694](matrix-org/matrix-react-sdk#8694)). Contributed by @novocaine. * Improve combining diacritics for U+20D0 to U+20F0 in Chrome ([\#8687](matrix-org/matrix-react-sdk#8687)). * Make the empty thread panel fill BaseCard ([\#8690](matrix-org/matrix-react-sdk#8690)). Fixes #22338. Contributed by @luixxiul. * Fix edge case around composer handling gendered facepalm emoji ([\#8686](matrix-org/matrix-react-sdk#8686)). * Fix a grid blowout due to nowrap displayName on a bubble with UTD ([\#8688](matrix-org/matrix-react-sdk#8688)). Fixes #21914. Contributed by @luixxiul. * Apply the same max-width to image tile on the thread timeline as message bubble ([\#8669](matrix-org/matrix-react-sdk#8669)). Fixes #22313. Contributed by @luixxiul. * Fix dropdown button size for picture-in-picture CallView ([\#8680](matrix-org/matrix-react-sdk#8680)). Fixes #22316. Contributed by @luixxiul. * Live location sharing - fix square border for image-less avatar (PSF-1052) ([\#8679](matrix-org/matrix-react-sdk#8679)). Contributed by @kerryarchibald. * Stop connecting to a video room if the widget messaging disappears ([\#8660](matrix-org/matrix-react-sdk#8660)). * Fix file button and audio player overflowing from message bubble ([\#8666](matrix-org/matrix-react-sdk#8666)). Fixes #22308. Contributed by @luixxiul. * Don't show broken composer format bar when selection is whitespace ([\#8673](matrix-org/matrix-react-sdk#8673)). Fixes #10788. * Fix media upload http 413 handling ([\#8674](matrix-org/matrix-react-sdk#8674)). * Fix emoji picker for editing thread responses ([\#8671](matrix-org/matrix-react-sdk#8671)). Fixes matrix-org/element-web-rageshakes#13129. * Map attribution while sharing live location is now visible ([\#8621](matrix-org/matrix-react-sdk#8621)). Fixes #22236. Contributed by @weeman1337. * Fix info tile overlapping the time stamp on TimelineCard ([\#8639](matrix-org/matrix-react-sdk#8639)). Fixes #22256. Contributed by @luixxiul. * Fix position of wide images on IRC / modern layout ([\#8667](matrix-org/matrix-react-sdk#8667)). Fixes #22309. Contributed by @luixxiul. * Fix other user's displayName being wrapped on the bubble message layout ([\#8456](matrix-org/matrix-react-sdk#8456)). Fixes #22004. Contributed by @luixxiul. * Set spacing declarations to elements in mx_EventTile_mediaLine ([\#8665](matrix-org/matrix-react-sdk#8665)). Fixes #22307. Contributed by @luixxiul. * Fix wide image overflowing from the thumbnail container ([\#8663](matrix-org/matrix-react-sdk#8663)). Fixes #22303. Contributed by @luixxiul. * Fix styles of "Show all" link button on ReactionsRow ([\#8658](matrix-org/matrix-react-sdk#8658)). Fixes #22300. Contributed by @luixxiul. * Automatically log in after registration ([\#8654](matrix-org/matrix-react-sdk#8654)). Fixes #19305. Contributed by @justjanne. * Fix offline status in window title not working reliably ([\#8656](matrix-org/matrix-react-sdk#8656)). * Align input area with event body's first letter in a thread on IRC/modern layout ([\#8636](matrix-org/matrix-react-sdk#8636)). Fixes #22252. Contributed by @luixxiul. * Fix crash on null idp for SSO buttons ([\#8650](matrix-org/matrix-react-sdk#8650)). Contributed by @hughns. * Don't open the regular browser or our context menu on right-clicking the `Options` button in the message action bar ([\#8648](matrix-org/matrix-react-sdk#8648)). Fixes #22279. * Show notifications even when Element is focused ([\#8590](matrix-org/matrix-react-sdk#8590)). Contributed by @sumnerevans. * Remove padding from the buttons on edit message composer of a event tile on a thread ([\#8632](matrix-org/matrix-react-sdk#8632)). Contributed by @luixxiul. * ensure metaspace changes correctly notify listeners ([\#8611](matrix-org/matrix-react-sdk#8611)). Fixes #21006. Contributed by @justjanne. * Hide image banner on stickers, they have a tooltip already ([\#8641](matrix-org/matrix-react-sdk#8641)). Fixes #22244. * Adjust EditMessageComposer style declarations ([\#8631](matrix-org/matrix-react-sdk#8631)). Fixes #22231. Contributed by @luixxiul.
2 parents 373b339 + b7b5408 commit 1243cf7

File tree

96 files changed

+3189
-2220
lines changed

Some content is hidden

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

96 files changed

+3189
-2220
lines changed

.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,9 @@ insert_final_newline = true
2121
indent_style = space
2222
indent_size = 4
2323
trim_trailing_whitespace = true
24+
25+
[*.{yml,yaml}]
26+
indent_size = 2
27+
28+
[package.json]
29+
indent_size = 2

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
src/vector/modernizr.js
2+
# Legacy skinning file that some people might still have
23
src/component-index.js

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ module.exports = {
3030

3131
// We disable this while we're transitioning
3232
"@typescript-eslint/no-explicit-any": "off",
33+
// We're okay with assertion errors when we ask for them
34+
"@typescript-eslint/no-non-null-assertion": "off",
3335

3436
// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
3537
"no-restricted-imports": ["error", {

.github/workflows/build.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Build and Package
2+
on:
3+
pull_request: { }
4+
push:
5+
branches: [ master ]
6+
# develop pushes and repository_dispatch handled in build_develop.yaml
7+
env:
8+
# These must be set for fetchdep.sh to get the right branch
9+
REPOSITORY: ${{ github.repository }}
10+
PR_NUMBER: ${{ github.event.pull_request.number }}
11+
jobs:
12+
build:
13+
name: "Build"
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
18+
- uses: actions/setup-node@v3
19+
with:
20+
cache: 'yarn'
21+
22+
- name: Install Dependencies
23+
run: "./scripts/layered.sh"
24+
25+
- name: Build & Package
26+
run: "./scripts/ci_package.sh"

.github/workflows/build_develop.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Separate to the main build workflow for access to develop
2+
# environment secrets, largely similar to build.yaml.
3+
name: Build and Package develop
4+
on:
5+
push:
6+
branches: [ develop ]
7+
repository_dispatch:
8+
types: [ element-web-notify ]
9+
jobs:
10+
build:
11+
name: "Build & Upload source maps to Sentry"
12+
runs-on: ubuntu-latest
13+
environment: develop
14+
steps:
15+
- uses: actions/checkout@v2
16+
17+
- uses: actions/setup-node@v3
18+
with:
19+
cache: 'yarn'
20+
21+
- name: Install Dependencies
22+
run: "./scripts/layered.sh"
23+
24+
- name: Build, Package & Upload sourcemaps
25+
run: "./scripts/ci_package.sh"
26+
env:
27+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
28+
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
29+
SENTRY_URL: ${{ secrets.SENTRY_URL }}
30+
SENTRY_ORG: sentry
31+
SENTRY_PROJECT: riot-web

.github/workflows/preview_changelog.yaml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/workflows/pull_request.yaml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Pull Request
2+
on:
3+
pull_request_target:
4+
types: [ opened, edited, labeled, unlabeled, synchronize ]
5+
concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
6+
jobs:
7+
changelog:
8+
name: Preview Changelog
9+
if: github.event.action != 'synchronize'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: matrix-org/allchange@main
13+
with:
14+
ghToken: ${{ secrets.GITHUB_TOKEN }}
15+
16+
enforce-label:
17+
name: Enforce Labels
18+
runs-on: ubuntu-latest
19+
permissions:
20+
pull-requests: read
21+
steps:
22+
- uses: yogevbd/[email protected]
23+
with:
24+
REQUIRED_LABELS_ANY: "T-Defect,T-Enhancement,T-Task"
25+
BANNED_LABELS: "X-Blocked"
26+
BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!"

.github/workflows/sentry-sourcemaps.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/sonarqube.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: SonarQube
2+
on:
3+
workflow_run:
4+
workflows: [ "Tests" ]
5+
types:
6+
- completed
7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
9+
cancel-in-progress: true
10+
jobs:
11+
prdetails:
12+
name: ℹ️ PR Details
13+
if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
14+
uses: matrix-org/matrix-js-sdk/.github/workflows/pr_details.yml@develop
15+
with:
16+
owner: ${{ github.event.workflow_run.head_repository.owner.login }}
17+
branch: ${{ github.event.workflow_run.head_branch }}
18+
19+
sonarqube:
20+
name: 🩻 SonarQube
21+
needs: prdetails
22+
# Only wait for prdetails if it isn't skipped
23+
if: |
24+
always() &&
25+
(needs.prdetails.result == 'success' || needs.prdetails.result == 'skipped') &&
26+
github.event.workflow_run.conclusion == 'success'
27+
uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
28+
with:
29+
repo: ${{ github.event.workflow_run.head_repository.full_name }}
30+
pr_id: ${{ needs.prdetails.outputs.pr_id }}
31+
head_branch: ${{ needs.prdetails.outputs.head_branch || github.event.workflow_run.head_branch }}
32+
base_branch: ${{ needs.prdetails.outputs.base_branch }}
33+
revision: ${{ github.event.workflow_run.head_sha }}
34+
coverage_workflow_name: tests.yml
35+
coverage_run_id: ${{ github.event.workflow_run.id }}
36+
secrets:
37+
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
name: Static Analysis
2+
on:
3+
pull_request: { }
4+
push:
5+
branches: [ develop, master ]
6+
repository_dispatch:
7+
types: [ element-web-notify ]
8+
env:
9+
# These must be set for fetchdep.sh to get the right branch
10+
REPOSITORY: ${{ github.repository }}
11+
PR_NUMBER: ${{ github.event.pull_request.number }}
12+
jobs:
13+
ts_lint:
14+
name: "Typescript Syntax Check"
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v2
18+
19+
- uses: actions/setup-node@v3
20+
with:
21+
cache: 'yarn'
22+
23+
- name: Install Dependencies
24+
run: "./scripts/layered.sh"
25+
26+
- name: Typecheck
27+
run: "yarn run lint:types"
28+
29+
i18n_lint:
30+
name: "i18n Check"
31+
uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
32+
33+
js_lint:
34+
name: "ESLint"
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: actions/checkout@v2
38+
39+
- uses: actions/setup-node@v3
40+
with:
41+
cache: 'yarn'
42+
43+
# Does not need branch matching as only analyses this layer
44+
- name: Install Deps
45+
run: "yarn install --pure-lockfile"
46+
47+
- name: Run Linter
48+
run: "yarn run lint:js"
49+
50+
style_lint:
51+
name: "Style Lint"
52+
runs-on: ubuntu-latest
53+
steps:
54+
- uses: actions/checkout@v2
55+
56+
- uses: actions/setup-node@v3
57+
with:
58+
cache: 'yarn'
59+
60+
# Does not need branch matching as only analyses this layer
61+
- name: Install Deps
62+
run: "yarn install --pure-lockfile"
63+
64+
- name: Run Linter
65+
run: "yarn run lint:style"

.github/workflows/tests.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Tests
2+
on:
3+
pull_request: { }
4+
push:
5+
branches: [ develop, master ]
6+
repository_dispatch:
7+
types: [ element-web-notify ]
8+
env:
9+
# These must be set for fetchdep.sh to get the right branch
10+
REPOSITORY: ${{ github.repository }}
11+
PR_NUMBER: ${{ github.event.pull_request.number }}
12+
jobs:
13+
jest:
14+
name: Jest
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout code
18+
uses: actions/checkout@v2
19+
20+
- name: Yarn cache
21+
uses: actions/setup-node@v3
22+
with:
23+
cache: 'yarn'
24+
25+
- name: Install Dependencies
26+
run: "./scripts/layered.sh"
27+
28+
- name: Run tests with coverage
29+
run: "yarn coverage --ci"
30+
31+
- name: Upload Artifact
32+
uses: actions/upload-artifact@v2
33+
with:
34+
name: coverage
35+
path: |
36+
coverage
37+
!coverage/lcov-report

.github/workflows/triage-incoming.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Move new issues into Issue triage board
22

33
on:
44
issues:
5-
types: [opened]
5+
types: [ opened ]
66

77
jobs:
88
automate-project-columns:

0 commit comments

Comments
 (0)