Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase/element web 1.10.14 #62

Merged
merged 129 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
303f06c
Step 2: Remove the decorator
turt2live Mar 2, 2022
1bbecdf
Step 3.1: Stop using `getComponent` in tests
turt2live Mar 2, 2022
585c777
Step 3.2: Stop using `getComponent`
turt2live Mar 2, 2022
3849033
Step 4: Disable/remove bulk of skinner code
turt2live Mar 2, 2022
e1f9e9a
Step 8.1: Remove skin-sdk.js
turt2live Mar 25, 2022
0bcb1d1
Step 10.1: Ensure the js-sdk browser bundle gets pulled
turt2live Mar 25, 2022
5459c1e
Step 10.2: Move hacky welcome page replacement to react-sdk
turt2live Mar 25, 2022
5b592ec
Step 10.3: Use module replacement to achieve component overrides
turt2live Mar 25, 2022
7bd584a
Step 13: Update documentation for skinning
turt2live Mar 28, 2022
9c23f6c
Step 14: Remove reskindex
turt2live Mar 28, 2022
f7dea94
Merge branch 'develop' into travis/remove-skinning
turt2live Apr 1, 2022
d39ae8a
Merge branch 'develop' into travis/remove-skinning
turt2live Apr 5, 2022
98ced97
Merge branch 'develop' into travis/remove-skinning
turt2live Apr 5, 2022
ecf1c41
Merge branch 'travis/remove-skinning' into develop
turt2live Apr 5, 2022
ef1d90a
Handle forced disconnects from Jitsi (#21697)
robintown Apr 6, 2022
cec31d0
Don't label threads issues with Z-Labs (#21707)
kittykat Apr 7, 2022
e641478
Merge branch 'master' into develop
RiotRobot Apr 12, 2022
96d9fac
Reset matrix-js-sdk back to develop branch
RiotRobot Apr 12, 2022
03ab123
Reset matrix-react-sdk back to develop branch
RiotRobot Apr 12, 2022
a0e08bf
Document `feature_message_right_click_context_menu` (#21480)
SimonBrandner Apr 15, 2022
f46a6f2
Translations update from Weblate (#21846)
RiotTranslateBot Apr 19, 2022
3daddf3
Upgrade matrix-js-sdk to 17.1.0-rc.1
RiotRobot Apr 19, 2022
dc649ea
Upgrade matrix-react-sdk to 3.43.0-rc.1
RiotRobot Apr 19, 2022
f579742
Prepare changelog for v1.10.11-rc.1
RiotRobot Apr 19, 2022
2a5486a
v1.10.11-rc.1
RiotRobot Apr 19, 2022
ff89eef
Ensure updated=1 is set as the query string before any # (#21605)
novocaine Apr 20, 2022
b41e215
Show a lobby screen in video rooms (#21746)
robintown Apr 20, 2022
691b8d5
Upgrade dependencies (#21849)
t3chguy Apr 21, 2022
2ffb3a1
Pass the version in the updated param to attempt to cache bust (#21912)
novocaine Apr 25, 2022
9b333e9
Upgrade matrix-js-sdk to 17.1.0
RiotRobot Apr 26, 2022
f2cfb75
Upgrade matrix-react-sdk to 3.43.0
RiotRobot Apr 26, 2022
a797421
Prepare changelog for v1.10.11
RiotRobot Apr 26, 2022
b9668ac
v1.10.11
RiotRobot Apr 26, 2022
c9a0e4d
Merge branch 'release-v1.10.11'
RiotRobot Apr 26, 2022
cc57245
Merge branch 'master' into develop
RiotRobot Apr 26, 2022
c627001
Reset matrix-js-sdk back to develop branch
RiotRobot Apr 26, 2022
7c326f4
Reset matrix-react-sdk back to develop branch
RiotRobot Apr 26, 2022
2c7680b
Add github automation for new labels (#21966)
kittykat Apr 28, 2022
b5336c9
Fix camera getting muted when disconnecting from a video room (#21958)
robintown Apr 29, 2022
f733e2a
Fix Jitsi Meet getting wedged at startup in some cases (#21995)
robintown Apr 30, 2022
850a250
Fix label triage automation (#21999)
robintown Apr 30, 2022
1aafcaf
Translations update from Weblate (#22034)
RiotTranslateBot May 3, 2022
318273a
Upgrade matrix-js-sdk to 17.2.0-rc.1
RiotRobot May 3, 2022
cd0ec54
Upgrade matrix-react-sdk to 3.44.0-rc.1
RiotRobot May 3, 2022
bbe243f
Prepare changelog for v1.10.12-rc.1
RiotRobot May 3, 2022
4ce4ced
v1.10.12-rc.1
RiotRobot May 3, 2022
8bb13e8
Prune i18n files (#22035)
t3chguy May 3, 2022
b98e605
Create dependency upgrade action (#22043)
t3chguy May 4, 2022
092f919
[create-pull-request] automated change
t3chguy May 4, 2022
bf1e8a0
Merge pull request #22048 from vector-im/actions/upgrade-deps
RiotRobot May 4, 2022
abb31c9
Improve wording in the labs docs page (#22053)
kittykat May 4, 2022
9cb0185
Fully close Jitsi conferences on errors (#22060)
robintown May 5, 2022
a885de4
Add 'Choosing an issue to work on' doc (#22092)
andybalaam May 6, 2022
75c291e
Upgrade matrix-react-sdk to 3.44.0-rc.2
RiotRobot May 6, 2022
c85c8e6
Prepare changelog for v1.10.12-rc.2
RiotRobot May 6, 2022
166c72f
v1.10.12-rc.2
RiotRobot May 6, 2022
e749bb3
Remove docs for now-defunct labs flags (#22101)
turt2live May 6, 2022
a94323f
Broken link, no replacement to be found (#17124)
oliver-gramberg May 7, 2022
31b4354
Update config.md (#22115)
Moelf May 8, 2022
1783645
Avoid flashing the 'join conference' button at the user in video room…
robintown May 9, 2022
cdf95ab
Fix video rooms sometimes connecting muted when they shouldn't (#22125)
robintown May 9, 2022
915c839
Point at Settings.tsx for locating available settings (#21978)
Johennes May 10, 2022
c014b51
Upgrade matrix-js-sdk to 17.2.0
RiotRobot May 10, 2022
79f193b
Upgrade matrix-react-sdk to 3.44.0
RiotRobot May 10, 2022
20abdc6
Prepare changelog for v1.10.12
RiotRobot May 10, 2022
f552ad6
v1.10.12
RiotRobot May 10, 2022
3a5091f
Merge branch 'master' into develop
RiotRobot May 10, 2022
d7a6fbc
Reset matrix-js-sdk back to develop branch
RiotRobot May 10, 2022
479d4bf
Reset matrix-react-sdk back to develop branch
RiotRobot May 10, 2022
f2c8e89
Make pull_request.yaml between the layers consistent and fix enforce …
t3chguy May 13, 2022
f080b1f
Update unlabel workflow to check for card archive-ness (#22194)
turt2live May 13, 2022
6c87e29
Run CI in Github Actions (#22054)
t3chguy May 16, 2022
0292f66
Fix coverage reporting to Sonar (#22223)
t3chguy May 16, 2022
ca98529
Improve code as per Sonar suggestions (#22224)
t3chguy May 16, 2022
88b5368
Ignore decoder-ring for Sonar coverage (#22225)
t3chguy May 16, 2022
aca0346
Translations update from Weblate (#22243)
RiotTranslateBot May 17, 2022
b3ef2c1
Update weblateToCounterpart to be more resilient (#22247)
t3chguy May 17, 2022
56f3afc
Sonarcloud check out upstream develop not fork develop (#22239)
t3chguy May 17, 2022
20cc774
Revert "Sonarcloud check out upstream develop not fork develop (#2223…
t3chguy May 17, 2022
fa2f438
Upgrade matrix-js-sdk to 18.0.0-rc.1
RiotRobot May 17, 2022
91805c9
Upgrade matrix-react-sdk to 3.45.0-rc.2
RiotRobot May 17, 2022
676cf4f
Prepare changelog for v1.10.13-rc.1
RiotRobot May 17, 2022
0039572
v1.10.13-rc.1
RiotRobot May 17, 2022
06349e4
[create-pull-request] automated change
t3chguy May 17, 2022
f906cc3
Merge pull request #22253 from vector-im/actions/upgrade-deps
RiotRobot May 17, 2022
ff7398b
Remove spaces to delight board automation (#22260)
May 18, 2022
d36dcd2
Patch Jitsi logs into rageshakes (#22270)
robintown May 19, 2022
b2d057b
Update triage-priority-bugs.yml (#22277)
t3chguy May 19, 2022
fab5279
Consolidate i18n check into a reusable workflow (#22248)
t3chguy May 20, 2022
b9af13b
Upgrade matrix-js-sdk to 18.0.0-rc.2
RiotRobot May 20, 2022
095f273
Upgrade matrix-react-sdk to 3.45.0-rc.3
RiotRobot May 20, 2022
61a8b6f
Prepare changelog for v1.10.13-rc.2
RiotRobot May 20, 2022
57499c7
v1.10.13-rc.2
RiotRobot May 20, 2022
6c7f663
Stop Jitsi if we time out while connecting to a video room (#22301)
robintown May 20, 2022
11a3011
Option to disable hardware acceleration on Element Desktop (#22295)
novocaine May 23, 2022
7c949f9
Fix wrongly using github.ref in workflow_run actions which always ref…
t3chguy May 24, 2022
1c8b52e
Upgrade matrix-js-sdk to 18.0.0
RiotRobot May 24, 2022
bf1f297
Upgrade matrix-react-sdk to 3.45.0
RiotRobot May 24, 2022
d5cf793
Prepare changelog for v1.10.13
RiotRobot May 24, 2022
c46c112
v1.10.13
RiotRobot May 24, 2022
1cdbcf2
Merge branch 'master' into develop
RiotRobot May 24, 2022
4e6836d
Reset matrix-js-sdk back to develop branch
RiotRobot May 24, 2022
863e5f6
Reset matrix-react-sdk back to develop branch
RiotRobot May 24, 2022
745140e
Remove stale release.sh parameter for no-jsdoc (#22255)
t3chguy May 25, 2022
9c92f55
Work around a Jitsi log handling crash (#22353)
robintown May 25, 2022
89bffd1
Fix gha concurrency conditions (#22360)
t3chguy May 26, 2022
359e0e2
Make Lao translation available (#22358)
robintown May 26, 2022
51ed778
Show a dialog when Jitsi encounters an error (#22352)
robintown May 26, 2022
9df5bf1
unit test WebPlatform (#22371)
May 27, 2022
5ade461
unit test getVectorConfig (#22373)
May 27, 2022
70a2474
Add logo to readme badge (#22374)
t3chguy May 27, 2022
e92d44e
matrix-mock-request to 2.0 (#22395)
May 30, 2022
7c8ded1
Add /coverage to .gitignore (#22397)
May 30, 2022
4a91c17
Github Actions pull_request synchronize runs on PR open anyway (#22396)
t3chguy May 30, 2022
41f0554
Disable no-non-null assertions lint rule (#22348)
turt2live May 30, 2022
fa58552
Upgrade matrix-js-sdk to 18.1.0-rc.1
RiotRobot May 31, 2022
82a564a
Upgrade matrix-react-sdk to 3.46.0-rc.1
RiotRobot May 31, 2022
e24d664
Prepare changelog for v1.10.14-rc.1
RiotRobot May 31, 2022
e2d5aeb
v1.10.14-rc.1
RiotRobot May 31, 2022
e89892c
Upgrade matrix-js-sdk to 18.1.0
RiotRobot Jun 7, 2022
59d90b3
Upgrade matrix-react-sdk to 3.46.0
RiotRobot Jun 7, 2022
657af4f
Prepare changelog for v1.10.14
RiotRobot Jun 7, 2022
b7b5408
v1.10.14
RiotRobot Jun 7, 2022
1243cf7
Merge tag 'v1.10.14' into rebase/element-web-1.10.14 (with conflicts)
estellecomment Jun 13, 2022
9832af7
Fix conflicts
estellecomment Jun 13, 2022
cb79ce3
Linter fix
estellecomment Jun 23, 2022
91d4be5
Fix our customisations, sdk.getComponent is not needed any more
estellecomment Jun 27, 2022
3d365a5
Remove uses of replaceableComponent, it has been deprecated
estellecomment Jun 27, 2022
696f787
Linter fix
estellecomment Jun 27, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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/enforce-label-action@2.1.0
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