Skip to content

Commit

Permalink
Merge tag 'v1.10.14' into rebase/element-web-1.10.14 (with conflicts)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
estellecomment committed Jun 13, 2022
2 parents 373b339 + b7b5408 commit 1243cf7
Show file tree
Hide file tree
Showing 96 changed files with 3,189 additions and 2,220 deletions.
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@ insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.{yml,yaml}]
indent_size = 2

[package.json]
indent_size = 2
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
src/vector/modernizr.js
# Legacy skinning file that some people might still have
src/component-index.js
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ module.exports = {

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

// Ban matrix-js-sdk/src imports in favour of matrix-js-sdk/src/matrix imports to prevent unleashing hell.
"no-restricted-imports": ["error", {
Expand Down
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build and Package
on:
pull_request: { }
push:
branches: [ master ]
# develop pushes and repository_dispatch handled in build_develop.yaml
env:
# These must be set for fetchdep.sh to get the right branch
REPOSITORY: ${{ github.repository }}
PR_NUMBER: ${{ github.event.pull_request.number }}
jobs:
build:
name: "Build"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Dependencies
run: "./scripts/layered.sh"

- name: Build & Package
run: "./scripts/ci_package.sh"
31 changes: 31 additions & 0 deletions .github/workflows/build_develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Separate to the main build workflow for access to develop
# environment secrets, largely similar to build.yaml.
name: Build and Package develop
on:
push:
branches: [ develop ]
repository_dispatch:
types: [ element-web-notify ]
jobs:
build:
name: "Build & Upload source maps to Sentry"
runs-on: ubuntu-latest
environment: develop
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Dependencies
run: "./scripts/layered.sh"

- name: Build, Package & Upload sourcemaps
run: "./scripts/ci_package.sh"
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
SENTRY_URL: ${{ secrets.SENTRY_URL }}
SENTRY_ORG: sentry
SENTRY_PROJECT: riot-web
12 changes: 0 additions & 12 deletions .github/workflows/preview_changelog.yaml

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Pull Request
on:
pull_request_target:
types: [ opened, edited, labeled, unlabeled, synchronize ]
concurrency: ${{ github.workflow }}-${{ github.event.pull_request.head.ref }}
jobs:
changelog:
name: Preview Changelog
if: github.event.action != 'synchronize'
runs-on: ubuntu-latest
steps:
- uses: matrix-org/allchange@main
with:
ghToken: ${{ secrets.GITHUB_TOKEN }}

enforce-label:
name: Enforce Labels
runs-on: ubuntu-latest
permissions:
pull-requests: read
steps:
- uses: yogevbd/[email protected]
with:
REQUIRED_LABELS_ANY: "T-Defect,T-Enhancement,T-Task"
BANNED_LABELS: "X-Blocked"
BANNED_LABELS_DESCRIPTION: "Preventing merge whilst PR is marked blocked!"
26 changes: 0 additions & 26 deletions .github/workflows/sentry-sourcemaps.yaml

This file was deleted.

37 changes: 37 additions & 0 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: SonarQube
on:
workflow_run:
workflows: [ "Tests" ]
types:
- completed
concurrency:
group: ${{ github.workflow }}-${{ github.event.workflow_run.head_branch }}
cancel-in-progress: true
jobs:
prdetails:
name: ℹ️ PR Details
if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event == 'pull_request'
uses: matrix-org/matrix-js-sdk/.github/workflows/pr_details.yml@develop
with:
owner: ${{ github.event.workflow_run.head_repository.owner.login }}
branch: ${{ github.event.workflow_run.head_branch }}

sonarqube:
name: 🩻 SonarQube
needs: prdetails
# Only wait for prdetails if it isn't skipped
if: |
always() &&
(needs.prdetails.result == 'success' || needs.prdetails.result == 'skipped') &&
github.event.workflow_run.conclusion == 'success'
uses: matrix-org/matrix-js-sdk/.github/workflows/sonarcloud.yml@develop
with:
repo: ${{ github.event.workflow_run.head_repository.full_name }}
pr_id: ${{ needs.prdetails.outputs.pr_id }}
head_branch: ${{ needs.prdetails.outputs.head_branch || github.event.workflow_run.head_branch }}
base_branch: ${{ needs.prdetails.outputs.base_branch }}
revision: ${{ github.event.workflow_run.head_sha }}
coverage_workflow_name: tests.yml
coverage_run_id: ${{ github.event.workflow_run.id }}
secrets:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
65 changes: 65 additions & 0 deletions .github/workflows/static_analysis.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: Static Analysis
on:
pull_request: { }
push:
branches: [ develop, master ]
repository_dispatch:
types: [ element-web-notify ]
env:
# These must be set for fetchdep.sh to get the right branch
REPOSITORY: ${{ github.repository }}
PR_NUMBER: ${{ github.event.pull_request.number }}
jobs:
ts_lint:
name: "Typescript Syntax Check"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Dependencies
run: "./scripts/layered.sh"

- name: Typecheck
run: "yarn run lint:types"

i18n_lint:
name: "i18n Check"
uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop

js_lint:
name: "ESLint"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
cache: 'yarn'

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

- name: Run Linter
run: "yarn run lint:js"

style_lint:
name: "Style Lint"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v3
with:
cache: 'yarn'

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

- name: Run Linter
run: "yarn run lint:style"
37 changes: 37 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Tests
on:
pull_request: { }
push:
branches: [ develop, master ]
repository_dispatch:
types: [ element-web-notify ]
env:
# These must be set for fetchdep.sh to get the right branch
REPOSITORY: ${{ github.repository }}
PR_NUMBER: ${{ github.event.pull_request.number }}
jobs:
jest:
name: Jest
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Yarn cache
uses: actions/setup-node@v3
with:
cache: 'yarn'

- name: Install Dependencies
run: "./scripts/layered.sh"

- name: Run tests with coverage
run: "yarn coverage --ci"

- name: Upload Artifact
uses: actions/upload-artifact@v2
with:
name: coverage
path: |
coverage
!coverage/lcov-report
2 changes: 1 addition & 1 deletion .github/workflows/triage-incoming.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Move new issues into Issue triage board

on:
issues:
types: [opened]
types: [ opened ]

jobs:
automate-project-columns:
Expand Down
Loading

0 comments on commit 1243cf7

Please sign in to comment.