PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge branch 'develop' into toger5/force_ec_video_rooms

Browse source
This commit is contained in:
Timo 2024-01-03 17:22:35 +01:00 committed by GitHub
commit e3522d221a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 1292 additions and 978 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.github/CODEOWNERS vendored
View file

@ -1,5 +1,5 @@
* @vector-im/element-web * @element-hq/element-web-reviewers
/.github/workflows/** @vector-im/element-web-app-team /.github/workflows/** @element-hq/element-web-team
/package.json @vector-im/element-web-app-team /package.json @element-hq/element-web-team
/yarn.lock @vector-im/element-web-app-team /yarn.lock @element-hq/element-web-team
/src/i18n/strings /src/i18n/strings

2
.github/ISSUE_TEMPLATE/enhancement.yml vendored
View file

@ -5,7 +5,7 @@ body:
- type: markdown - type: markdown
attributes: attributes:
value: | value: |
Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/vector-im/element-meta/discussions/new?category=ideas). Thank you for taking the time to propose an enhancement to an existing feature. If you would like to propose a new feature or a major cross-platform change, please [start a discussion here](https://github.com/element-hq/element-meta/discussions/new?category=ideas).
- type: textarea - type: textarea
id: usecase id: usecase
attributes: attributes:

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View file

@ -4,7 +4,7 @@
- [ ] Tests written for new code (and old code if feasible) - [ ] Tests written for new code (and old code if feasible)
- [ ] Linter and other CI checks pass - [ ] Linter and other CI checks pass
- [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/vector-im/element-web/blob/develop/CONTRIBUTING.md)) - [ ] Sign-off given on the changes (see [CONTRIBUTING.md](https://github.com/element-hq/element-web/blob/develop/CONTRIBUTING.md))
<!-- <!--
If you would like to specify text for the changelog entry other than your PR title, add the following: If you would like to specify text for the changelog entry other than your PR title, add the following:

5
.github/labels.yml vendored
View file

@ -119,7 +119,7 @@
description: "Also known as Sync v3 - https://github.com/matrix-org/sliding-sync" description: "Also known as Sync v3 - https://github.com/matrix-org/sliding-sync"
color: "bfd4f2" color: "bfd4f2"
- name: "A-Soft-Logout" - name: "A-Soft-Logout"
description: "https://github.com/vector-im/element-web/issues/10224" description: "https://github.com/element-hq/element-web/issues/10224"
color: "bfd4f2" color: "bfd4f2"
- name: "A-Spaces-Settings" - name: "A-Spaces-Settings"
color: "bfd4f2" color: "bfd4f2"
@ -179,9 +179,6 @@
- name: "Dependencies" - name: "Dependencies"
description: "Pull requests that update a dependency file" description: "Pull requests that update a dependency file"
color: "0366d6" color: "0366d6"
- name: "Epic"
description: "Issue is at Epic level"
color: "98e6ae"
- name: "Hacktoberfest" - name: "Hacktoberfest"
description: "Issues which are suitable for Hacktoberfest PRs: https://hacktoberfest.digitalocean.com/" description: "Issues which are suitable for Hacktoberfest PRs: https://hacktoberfest.digitalocean.com/"
color: "ff7518" color: "ff7518"

6
.github/workflows/build_debian.yaml vendored
View file

@ -17,8 +17,8 @@ jobs:
- name: Download package - name: Download package
run: | run: |
wget "https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz" wget "https://github.com/element-hq/element-web/releases/download/$VERSION/element-$VERSION.tar.gz"
wget "https://github.com/vector-im/element-web/releases/download/$VERSION/element-$VERSION.tar.gz.asc" wget "https://github.com/element-hq/element-web/releases/download/$VERSION/element-$VERSION.tar.gz.asc"
- name: Check GPG signature - name: Check GPG signature
run: | run: |
@ -69,7 +69,7 @@ jobs:
- name: Publish to packages.element.io - name: Publish to packages.element.io
if: github.event.release.prerelease == false if: github.event.release.prerelease == false
uses: vector-im/packages.element.io@master uses: element-hq/packages.element.io@master
with: with:
file: element-web.deb file: element-web.deb
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

2
.github/workflows/build_develop.yml vendored
View file

@ -13,7 +13,7 @@ jobs:
build: build:
name: "Build & Deploy develop.element.io" name: "Build & Deploy develop.element.io"
# Only respect triggers from our develop branch, ignore that of forks # Only respect triggers from our develop branch, ignore that of forks
if: github.repository == 'vector-im/element-web' if: github.repository == 'element-hq/element-web'
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: develop environment: develop
env: env:

4
.github/workflows/dockerhub.yaml vendored
View file

@ -46,7 +46,7 @@ jobs:
- name: Docker meta - name: Docker meta
id: meta id: meta
uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5 uses: docker/metadata-action@31cebacef4805868f9ce9a0cb03ee36c32df2ac4 # v5
with: with:
images: | images: |
vectorim/element-web vectorim/element-web
@ -58,7 +58,7 @@ jobs:
${{ matrix.flavor }} ${{ matrix.flavor }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5 uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5
with: with:
context: . context: .
push: true push: true

4
.github/workflows/docs.yml vendored
View file

@ -22,7 +22,7 @@ jobs:
- name: Fetch element-desktop - name: Fetch element-desktop
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: vector-im/element-desktop repository: element-hq/element-desktop
path: element-desktop path: element-desktop
- name: Fetch element-web - name: Fetch element-web
@ -112,4 +112,4 @@ jobs:
steps: steps:
- name: Deploy to GitHub Pages - name: Deploy to GitHub Pages
id: deployment id: deployment
uses: actions/deploy-pages@v2 uses: actions/deploy-pages@v3

16
.github/workflows/pending-reviews.yaml vendored
View file

@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: Matrix environment: Matrix
env: env:
URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+" URL: "https://github.com/pulls?q=is%3Apr+is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+review-requested%3A%40me+sort%3Aupdated-desc+"
RELEASE_BLOCKERS_URL: "https://github.com/pulls?q=is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Avector-im%2Felement-web+repo%3Avector-im%2Felement-desktop+sort%3Aupdated-desc+label%3AX-Release-Blocker+" RELEASE_BLOCKERS_URL: "https://github.com/pulls?q=is%3Aopen+repo%3Amatrix-org%2Fmatrix-js-sdk+repo%3Amatrix-org%2Fmatrix-react-sdk+repo%3Aelement-hq%2Felement-web+repo%3Aelement-hq%2Felement-desktop+sort%3Aupdated-desc+label%3AX-Release-Blocker+"
steps: steps:
- uses: actions/github-script@v7 - uses: actions/github-script@v7
env: env:
@ -60,16 +60,16 @@ jobs:
} }
const repos = [ const repos = [
"vector-im/element-desktop", "element-hq/element-desktop",
"vector-im/element-web", "element-hq/element-web",
"matrix-org/matrix-react-sdk", "matrix-org/matrix-react-sdk",
"matrix-org/matrix-js-sdk", "matrix-org/matrix-js-sdk",
]; ];
const teams = [ const teams = [
"matrix-org/element-web-app-team", "matrix-org/element-web-team",
"matrix-org/element-web", "matrix-org/element-web-reviewers",
"vector-im/element-web-app-team", "element-hq/element-web-team",
"vector-im/element-web", "element-hq/element-web-reviewers",
]; ];
let issueCount = 0; let issueCount = 0;

4
.github/workflows/release_prepare.yml vendored
View file

@ -30,7 +30,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
if: inputs.element-desktop if: inputs.element-desktop
with: with:
repository: vector-im/element-desktop repository: element-hq/element-desktop
path: element-desktop path: element-desktop
ref: staging ref: staging
fetch-depth: 0 fetch-depth: 0
@ -40,7 +40,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
if: inputs.element-web if: inputs.element-web
with: with:
repository: vector-im/element-web repository: element-hq/element-web
path: element-web path: element-web
ref: staging ref: staging
fetch-depth: 0 fetch-depth: 0

7
.github/workflows/sync-labels.yml vendored
View file

@ -1,6 +1,8 @@
name: Sync labels name: Sync labels
on: on:
workflow_dispatch: {} workflow_dispatch: {}
schedule:
- cron: "0 1 * * *" # 1am every day
push: push:
branches: branches:
- develop - develop
@ -8,9 +10,12 @@ on:
- .github/labels.yml - .github/labels.yml
jobs: jobs:
sync-labels: sync-labels:
uses: vector-im/element-meta/.github/workflows/sync-labels.yml@develop uses: element-hq/element-meta/.github/workflows/sync-labels.yml@develop
with: with:
LABELS: | LABELS: |
element-hq/element-meta
.github/labels.yml .github/labels.yml
DELETE: true
WET: true
secrets: secrets:
ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }} ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

2
.github/workflows/triage-assigned.yml vendored
View file

@ -14,5 +14,5 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/67 project-url: https://github.com/orgs/element-hq/projects/67
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}

16
.github/workflows/triage-labelled.yml vendored
View file

@ -61,7 +61,7 @@ jobs:
- uses: konradpabjan/move-labeled-or-milestoned-issue@190352295fe309fcb113b49193bc81d9aaa9cb01 - uses: konradpabjan/move-labeled-or-milestoned-issue@190352295fe309fcb113b49193bc81d9aaa9cb01
with: with:
action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}" action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
project-url: "https://github.com/vector-im/element-web/projects/27" project-url: "https://github.com/element-hq/element-web/projects/27"
column-name: "Need info" column-name: "Need info"
label-name: "X-Needs-Info" label-name: "X-Needs-Info"
@ -79,7 +79,7 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/18 project-url: https://github.com/orgs/element-hq/projects/18
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
add_product_issues: add_product_issues:
@ -90,7 +90,7 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/28 project-url: https://github.com/orgs/element-hq/projects/28
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
Search_issues_to_board: Search_issues_to_board:
@ -101,7 +101,7 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/48 project-url: https://github.com/orgs/element-hq/projects/48
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
voip: voip:
@ -112,7 +112,7 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/41 project-url: https://github.com/orgs/element-hq/projects/41
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
verticals_feature: verticals_feature:
@ -123,7 +123,7 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/57 project-url: https://github.com/orgs/element-hq/projects/57
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
tech_debt: tech_debt:
@ -139,7 +139,7 @@ jobs:
steps: steps:
- uses: actions/add-to-project@main - uses: actions/add-to-project@main
with: with:
project-url: https://github.com/orgs/vector-im/projects/101 project-url: https://github.com/orgs/element-hq/projects/101
github-token: ${{ secrets.ELEMENT_BOT_TOKEN }} github-token: ${{ secrets.ELEMENT_BOT_TOKEN }}
element_r: element_r:
@ -163,4 +163,4 @@ jobs:
field-keys: Workstream,module field-keys: Workstream,module
field-values: Element-R,web field-values: Element-R,web
env: env:
PROJECT_URL: https://github.com/orgs/vector-im/projects/76 PROJECT_URL: https://github.com/orgs/element-hq/projects/76

4
.github/workflows/triage-move-review-requests.yml vendored
View file

@ -14,7 +14,7 @@ jobs:
headers: '{"GraphQL-Features": "projects_next_graphql"}' headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: | query: |
query find_team_members($team: String!) { query find_team_members($team: String!) {
organization(login: "vector-im") { organization(login: "element-hq") {
team(slug: $team) { team(slug: $team) {
members { members {
nodes { nodes {
@ -81,7 +81,7 @@ jobs:
headers: '{"GraphQL-Features": "projects_next_graphql"}' headers: '{"GraphQL-Features": "projects_next_graphql"}'
query: | query: |
query find_team_members($team: String!) { query find_team_members($team: String!) {
organization(login: "vector-im") { organization(login: "element-hq") {
team(slug: $team) { team(slug: $team) {
members { members {
nodes { nodes {

43
CHANGELOG.md
View file

@ -1,3 +1,46 @@
Changes in [1.11.52](https://github.com/element-hq/element-web/releases/tag/v1.11.52) (2023-12-19)
==================================================================================================
## ✨ Features
* Keep more recent rageshake logs ([#12003](https://github.com/matrix-org/matrix-react-sdk/pull/12003)). Contributed by @richvdh.
## 🐛 Bug Fixes
* Fix bug which prevented correct clean up of rageshake store ([#12002](https://github.com/matrix-org/matrix-react-sdk/pull/12002)). Contributed by @richvdh.
* Set up key backup using non-deprecated APIs ([#12005](https://github.com/matrix-org/matrix-react-sdk/pull/12005)). Contributed by @andybalaam.
* Fix notifications appearing for old events ([#3946](https://github.com/matrix-org/matrix-js-sdk/pull/3946)). Contributed by @dbkr.
* Prevent phantom notifications from events not in a room's timeline ([#3942](https://github.com/matrix-org/matrix-js-sdk/pull/3942)). Contributed by @dbkr.
Changes in [1.11.51](https://github.com/vector-im/element-web/releases/tag/v1.11.51) (2023-12-05)
=================================================================================================
## ✨ Features
* Improve debian package and docs ([#26618](https://github.com/vector-im/element-web/pull/26618)). Contributed by @t3chguy.
## 🦖 Deprecations
* Remove Quote from MessageContextMenu as it is unsupported by WYSIWYG ([#11914](https://github.com/matrix-org/matrix-react-sdk/pull/11914)). Contributed by @t3chguy.
## ✨ Features
* Always allow call.member events on new rooms ([#11948](https://github.com/matrix-org/matrix-react-sdk/pull/11948)). Contributed by @toger5.
* Right panel: view third party invite info without clearing history ([#11934](https://github.com/matrix-org/matrix-react-sdk/pull/11934)). Contributed by @kerryarchibald.
* Allow switching to system emoji font ([#11925](https://github.com/matrix-org/matrix-react-sdk/pull/11925)). Contributed by @t3chguy.
* Update open in other tab message ([#11916](https://github.com/matrix-org/matrix-react-sdk/pull/11916)). Contributed by @weeman1337.
* Add menu for legacy and element call in 1:1 rooms ([#11910](https://github.com/matrix-org/matrix-react-sdk/pull/11910)). Contributed by @toger5.
* Add ringing for matrixRTC ([#11870](https://github.com/matrix-org/matrix-react-sdk/pull/11870)). Contributed by @toger5.
## 🐛 Bug Fixes
* Keep device language when it has been previosuly set, after a successful delegated authentication flow that clears localStorage ([#11902](https://github.com/matrix-org/matrix-react-sdk/pull/11902)). Contributed by @mgcm.
* Fix misunderstanding of functional members ([#11918](https://github.com/matrix-org/matrix-react-sdk/pull/11918)). Contributed by @toger5.
* Fix: Video Room Chat Header Button Removed ([#11911](https://github.com/matrix-org/matrix-react-sdk/pull/11911)). Contributed by @kerryarchibald.
* Fix "not attempting encryption" warning ([#11899](https://github.com/matrix-org/matrix-react-sdk/pull/11899)). Contributed by @richvdh.
Changes in [1.11.50](https://github.com/vector-im/element-web/releases/tag/v1.11.50) (2023-11-21) Changes in [1.11.50](https://github.com/vector-im/element-web/releases/tag/v1.11.50) (2023-11-21)
================================================================================================= =================================================================================================

13
CONTRIBUTING.md
View file

@ -271,9 +271,20 @@ on Git 2.17+ you can mass signoff using rebase:
git rebase --signoff origin/develop git rebase --signoff origin/develop
``` ```
## Private sign off
If you would like to provide your legal name privately to the Matrix.org
Foundation (instead of in a public commit or comment), you can do so by emailing
your legal name and a link to the pull request to dco@matrix.org. It helps to
include "sign off" or similar in the subject line. You will then be instructed
further.
Once private sign off is complete, doing so for future contributions will not
be required.
# Review expectations # Review expectations
See https://github.com/vector-im/element-meta/wiki/Review-process See https://github.com/element-hq/element-meta/wiki/Review-process
# Merge Strategy # Merge Strategy

26
README.md
View file

@ -1,6 +1,6 @@
[![Chat](https://img.shields.io/matrix/element-web:matrix.org?logo=matrix)](https://matrix.to/#/#element-web:matrix.org) [![Chat](https://img.shields.io/matrix/element-web:matrix.org?logo=matrix)](https://matrix.to/#/#element-web:matrix.org)
![Tests](https://github.com/vector-im/element-web/actions/workflows/tests.yaml/badge.svg) ![Tests](https://github.com/element-hq/element-web/actions/workflows/tests.yaml/badge.svg)
![Static Analysis](https://github.com/vector-im/element-web/actions/workflows/static_analysis.yaml/badge.svg) ![Static Analysis](https://github.com/element-hq/element-web/actions/workflows/static_analysis.yaml/badge.svg)
[![Localazy](https://img.shields.io/endpoint?url=https%3A%2F%2Fconnect.localazy.com%2Fstatus%2Felement-web%2Fdata%3Fcontent%3Dall%26title%3Dlocalazy%26logo%3Dtrue)](https://localazy.com/p/element-web) [![Localazy](https://img.shields.io/endpoint?url=https%3A%2F%2Fconnect.localazy.com%2Fstatus%2Felement-web%2Fdata%3Fcontent%3Dall%26title%3Dlocalazy%26logo%3Dtrue)](https://localazy.com/p/element-web)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-web&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-web) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=element-web&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=element-web)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=element-web&metric=coverage)](https://sonarcloud.io/summary/new_code?id=element-web) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=element-web&metric=coverage)](https://sonarcloud.io/summary/new_code?id=element-web)
@ -32,8 +32,8 @@ Element has several tiers of support for different environments:
- Everything else - Everything else
For accessing Element on an Android or iOS device, we currently recommend the For accessing Element on an Android or iOS device, we currently recommend the
native apps [element-android](https://github.com/vector-im/element-android) native apps [element-android](https://github.com/element-hq/element-android)
and [element-ios](https://github.com/vector-im/element-ios). and [element-ios](https://github.com/element-hq/element-ios).
# Getting Started # Getting Started
@ -57,7 +57,7 @@ access to Element (or other apps) due to sharing the same domain.
We have put some coarse mitigations into place to try to protect against this We have put some coarse mitigations into place to try to protect against this
situation, but it's still not good practice to do it in the first place. See situation, but it's still not good practice to do it in the first place. See
<https://github.com/vector-im/element-web/issues/1977> for more details. <https://github.com/element-hq/element-web/issues/1977> for more details.
## Configuration best practices ## Configuration best practices
@ -111,7 +111,7 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread
1. Install or update `node.js` so that your `node` is at least the current recommended LTS. 1. Install or update `node.js` so that your `node` is at least the current recommended LTS.
1. Install `yarn` if not present already. 1. Install `yarn` if not present already.
1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`. 1. Clone the repo: `git clone https://github.com/element-hq/element-web.git`.
1. Switch to the element-web directory: `cd element-web`. 1. Switch to the element-web directory: `cd element-web`.
1. Install the prerequisites: `yarn install`. 1. Install the prerequisites: `yarn install`.
- If you're using the `develop` branch, then it is recommended to set up a - If you're using the `develop` branch, then it is recommended to set up a
@ -137,7 +137,7 @@ Element can also be run as a desktop app, wrapped in Electron. You can download
pre-built version from <https://element.io/get-started> or, if you prefer, pre-built version from <https://element.io/get-started> or, if you prefer,
build it yourself. build it yourself.
To build it yourself, follow the instructions at <https://github.com/vector-im/element-desktop>. To build it yourself, follow the instructions at <https://github.com/element-hq/element-desktop>.
Many thanks to @aviraldg for the initial work on the Electron integration. Many thanks to @aviraldg for the initial work on the Electron integration.
@ -151,7 +151,7 @@ See the [configuration docs](docs/config.md) for more details.
# Labs Features # Labs Features
Some features of Element may be enabled by flags in the `Labs` section of the settings. Some features of Element may be enabled by flags in the `Labs` section of the settings.
Some of these features are described in [labs.md](https://github.com/vector-im/element-web/blob/develop/docs/labs.md). Some of these features are described in [labs.md](https://github.com/element-hq/element-web/blob/develop/docs/labs.md).
# Caching requirements # Caching requirements
@ -231,7 +231,7 @@ popd
Clone the repo and switch to the `element-web` directory: Clone the repo and switch to the `element-web` directory:
```bash ```bash
git clone https://github.com/vector-im/element-web.git git clone https://github.com/element-hq/element-web.git
cd element-web cd element-web
``` ```
@ -267,8 +267,8 @@ for changes. If the inotify limits are too low your build will fail silently or
`Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit `Error: EMFILE: too many open files`. To avoid these issues, we recommend a watch limit
of at least `128M` and instance limit around `512`. of at least `128M` and instance limit around `512`.
You may be interested in issues [#15750](https://github.com/vector-im/element-web/issues/15750) and You may be interested in issues [#15750](https://github.com/element-hq/element-web/issues/15750) and
[#15774](https://github.com/vector-im/element-web/issues/15774) for further details. [#15774](https://github.com/element-hq/element-web/issues/15774) for further details.
To set a new inotify watch and instance limit, execute: To set a new inotify watch and instance limit, execute:
@ -316,6 +316,6 @@ For a developer guide, see the [translating dev doc](docs/translating-dev.md).
# Triaging issues # Triaging issues
Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/vector-im/element-meta/wiki/Triage-process). Issues are triaged by community members and the Web App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues. We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.

2
book.toml
View file

@ -21,7 +21,7 @@ no-section-label = true
additional-css = ["docs/lib/custom.css"] additional-css = ["docs/lib/custom.css"]
# The source code URL of the repository # The source code URL of the repository
git-repository-url = "https://github.com/vector-im/element-web" git-repository-url = "https://github.com/element-hq/element-web"
# The path that the docs are hosted on # The path that the docs are hosted on
site-url = "/element-web/" site-url = "/element-web/"

6
contribute.json
View file

@ -2,12 +2,12 @@
"name": "Element", "name": "Element",
"description": "A glossy Matrix collaboration client for the web.", "description": "A glossy Matrix collaboration client for the web.",
"repository": { "repository": {
"url": "https://github.com/vector-im/element-web", "url": "https://github.com/element-hq/element-web",
"license": "Apache License 2.0" "license": "Apache License 2.0"
}, },
"bugs": { "bugs": {
"list": "https://github.com/vector-im/element-web/issues", "list": "https://github.com/element-hq/element-web/issues",
"report": "https://github.com/vector-im/element-web/issues/new/choose" "report": "https://github.com/element-hq/element-web/issues/new/choose"
}, },
"keywords": ["chat", "riot", "matrix"] "keywords": ["chat", "riot", "matrix"]
} }

2
docs/betas.md
View file

@ -4,7 +4,7 @@ Beta features are features that are not ready for production yet but the team
wants more people to try the features and give feedback on them. wants more people to try the features and give feedback on them.
Before a feature gets into its beta phase, it is often a labs feature (see Before a feature gets into its beta phase, it is often a labs feature (see
[Labs](https://github.com/vector-im/element-web/blob/develop/docs/labs.md)). [Labs](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)).
**Be warned! Beta features may not be completely finalised or stable!** **Be warned! Beta features may not be completely finalised or stable!**

10
docs/choosing-an-issue.md
View file

@ -18,12 +18,12 @@ If you're looking for inspiration on where to start, keep reading!
## Finding a good first issue ## Finding a good first issue
All the issues for Element Web live in the All the issues for Element Web live in the
[element-web](https://github.com/vector-im/element-web) repository, including [element-web](https://github.com/element-hq/element-web) repository, including
issues that actually need fixing in `matrix-react-sdk` or one of the related issues that actually need fixing in `matrix-react-sdk` or one of the related
repos. repos.
The first place to look is for The first place to look is for
[issues tagged with "good first issue"](https://github.com/vector-im/element-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22). [issues tagged with "good first issue"](https://github.com/element-hq/element-web/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
Look through that list and find something that catches your interest. If there Look through that list and find something that catches your interest. If there
is nothing, there, try gently asking in is nothing, there, try gently asking in
@ -38,8 +38,8 @@ issue a **GOOD** choice:
- You think you can understand what's needed. - You think you can understand what's needed.
- It already has approval from Element Web's designers (look for comments from - It already has approval from Element Web's designers (look for comments from
members of the members of the
[Product](https://github.com/orgs/vector-im/teams/product/members) or [Product](https://github.com/orgs/element-hq/teams/product/members) or
[Design](https://github.com/orgs/vector-im/teams/design/members) teams). [Design](https://github.com/orgs/element-hq/teams/design/members) teams).
Here are some things that might make it a **BAD** choice: Here are some things that might make it a **BAD** choice:
@ -57,7 +57,7 @@ way the product works, or how it looks in a specific area.
Once you've fixed a few small things, you can consider taking on something a Once you've fixed a few small things, you can consider taking on something a
little larger. This should mostly be driven by what you find interesting, but little larger. This should mostly be driven by what you find interesting, but
you may also find the you may also find the
[Help Wanted](https://github.com/vector-im/element-web/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22Help+Wanted%22) [Help Wanted](https://github.com/element-hq/element-web/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22Help+Wanted%22)
label useful. label useful.
Note that the same comment applies as in the previous section: if you want to Note that the same comment applies as in the previous section: if you want to

2
docs/config.md
View file

@ -480,7 +480,7 @@ decentralised.
## Desktop app configuration ## Desktop app configuration
See https://github.com/vector-im/element-desktop#user-specified-configjson See https://github.com/element-hq/element-desktop#user-specified-configjson
## UI Features ## UI Features

2
docs/customisations.md
View file

@ -2,7 +2,7 @@
### 🦖 DEPRECATED ### 🦖 DEPRECATED
Customisations have been deprecated in favour of the [Module API](https://github.com/vector-im/element-web/blob/develop/docs/modules.md). Customisations have been deprecated in favour of the [Module API](https://github.com/element-hq/element-web/blob/develop/docs/modules.md).
If you have use cases from customisations which are not yet available via the Module API please open an issue. If you have use cases from customisations which are not yet available via the Module API please open an issue.
Customisations will be removed from the codebase in a future release. Customisations will be removed from the codebase in a future release.

22
docs/feature-flags.md
View file

@ -53,7 +53,7 @@ When starting work on a feature, we should create a matching feature flag:
SettingsStore.getValue("feature_cats"); SettingsStore.getValue("feature_cats");
``` ```
3. Document the feature in the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md) 3. Document the feature in the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
With these steps completed, the feature is disabled by default, but can be With these steps completed, the feature is disabled by default, but can be
enabled on develop and nightly by interested users for testing. enabled on develop and nightly by interested users for testing.
@ -64,9 +64,9 @@ The following lists a few common options.
## Enabling by default on develop and nightly ## Enabling by default on develop and nightly
Set the feature to `true` in the Set the feature to `true` in the
[develop](https://github.com/vector-im/element-web/blob/develop/element.io/develop/config.json) [develop](https://github.com/element-hq/element-web/blob/develop/element.io/develop/config.json)
and and
[nightly](https://github.com/vector-im/element-desktop/blob/develop/element.io/nightly/config.json) [nightly](https://github.com/element-hq/element-desktop/blob/develop/element.io/nightly/config.json)
configs: configs:
```json ```json
@ -78,9 +78,9 @@ configs:
## Enabling by default on staging, app, and release ## Enabling by default on staging, app, and release
Set the feature to `true` in the Set the feature to `true` in the
[staging / app](https://github.com/vector-im/element-web/blob/develop/element.io/app/config.json) [staging / app](https://github.com/element-hq/element-web/blob/develop/element.io/app/config.json)
and and
[release](https://github.com/vector-im/element-desktop/blob/develop/element.io/release/config.json) [release](https://github.com/element-hq/element-desktop/blob/develop/element.io/release/config.json)
configs. configs.
**Note:** The above will only enable the feature for https://app.element.io and official Element **Note:** The above will only enable the feature for https://app.element.io and official Element
@ -95,19 +95,19 @@ If the feature is meant to be turned off/on by the user:
1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) 1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
2. Change the `default` to `true` (if desired). 2. Change the `default` to `true` (if desired).
3. Remove the feature from the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md) 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
4. Celebrate! 🥳 4. Celebrate! 🥳
If the feature is meant to be forced on (non-configurable): If the feature is meant to be forced on (non-configurable):
1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) 1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts)
2. Remove all `getValue` lines that test for the feature. 2. Remove all `getValue` lines that test for the feature.
3. Remove the feature from the [labs documentation](https://github.com/vector-im/element-web/blob/develop/docs/labs.md) 3. Remove the feature from the [labs documentation](https://github.com/element-hq/element-web/blob/develop/docs/labs.md)
4. If applicable, remove the feature state from 4. If applicable, remove the feature state from
[develop](https://github.com/vector-im/element-web/blob/develop/element.io/develop/config.json), [develop](https://github.com/element-hq/element-web/blob/develop/element.io/develop/config.json),
[nightly](https://github.com/vector-im/element-desktop/blob/develop/element.io/nightly/config.json), [nightly](https://github.com/element-hq/element-desktop/blob/develop/element.io/nightly/config.json),
[staging / app](https://github.com/vector-im/element-web/blob/develop/element.io/app/config.json), [staging / app](https://github.com/element-hq/element-web/blob/develop/element.io/app/config.json),
and and
[release](https://github.com/vector-im/element-desktop/blob/develop/element.io/release/config.json) [release](https://github.com/element-hq/element-desktop/blob/develop/element.io/release/config.json)
configs configs
5. Celebrate! 🥳 5. Celebrate! 🥳

12
docs/install.md
View file

@ -8,12 +8,12 @@ There are some exceptions like when using localhost, which is considered a [secu
## Release tarball ## Release tarball
1. Download the latest version from <https://github.com/vector-im/element-web/releases> 1. Download the latest version from <https://github.com/element-hq/element-web/releases>
1. Untar the tarball on your web server 1. Untar the tarball on your web server
1. Move (or symlink) the `element-x.x.x` directory to an appropriate name 1. Move (or symlink) the `element-x.x.x` directory to an appropriate name
1. Configure the correct caching headers in your webserver (see below) 1. Configure the correct caching headers in your webserver (see below)
1. Configure the app by copying `config.sample.json` to `config.json` and 1. Configure the app by copying `config.sample.json` to `config.json` and
modifying it. See the [configuration docs](docs/config.md) for details. modifying it. See the [configuration docs](config.md) for details.
1. Enter the URL into your browser and log into Element! 1. Enter the URL into your browser and log into Element!
Releases are signed using gpg and the OpenPGP standard, Releases are signed using gpg and the OpenPGP standard,
@ -31,7 +31,9 @@ sudo apt update
sudo apt install element-web sudo apt install element-web
``` ```
Configure the app by modifying `/etc/element-web/config.json`. See the [configuration docs](docs/config.md) for details. Configure the app by modifying `/etc/element-web/config.json`. See the [configuration docs](config.md) for details.
Then point your chosen web server (e.g. Caddy, Nginx, Apache, etc) at the `/usr/share/element-web` webroot.
## Docker ## Docker
@ -53,7 +55,7 @@ docker run -p 80:80 -v /etc/element-web/config.json:/app/config.json vectorim/el
To build the image yourself: To build the image yourself:
```bash ```bash
git clone https://github.com/vector-im/element-web.git element-web git clone https://github.com/element-hq/element-web.git element-web
cd element-web cd element-web
git checkout master git checkout master
docker build . docker build .
@ -75,4 +77,4 @@ docker build -t \
## Kubernetes ## Kubernetes
The provided element-web docker image can also be run from within a Kubernetes cluster. The provided element-web docker image can also be run from within a Kubernetes cluster.
See the [Kubernetes example](docs/kubernetes.md) for more details. See the [Kubernetes example](kubernetes.md) for more details.

2
docs/jitsi.md
View file

@ -64,7 +64,7 @@ Element Android (1.0.5+) supports custom Jitsi domains, similar to Element Web a
calls work directly between clients or via TURN servers configured on the respective calls work directly between clients or via TURN servers configured on the respective
homeservers. homeservers.
For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`. For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/element-hq/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`.
The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.json` (meet.element.io) The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.json` (meet.element.io)
For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data.

25
docs/labs.md
View file

@ -5,7 +5,7 @@ to `Settings->Labs`. This list is non-exhaustive and subject to change, chat in
[#element-web:matrix.org](https://matrix.to/#/#element-web:matrix.org) for more information. [#element-web:matrix.org](https://matrix.to/#/#element-web:matrix.org) for more information.
If a labs features gets more stable, it _may_ be promoted to a beta feature If a labs features gets more stable, it _may_ be promoted to a beta feature
(see [Betas](https://github.com/vector-im/element-web/blob/develop/docs/betas.md)). (see [Betas](https://github.com/element-hq/element-web/blob/develop/docs/betas.md)).
**Be warned! Labs features are not finalised, they may be fragile, they may change, they may be **Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
dropped. Ask in the room if you are unclear about any details here.** dropped. Ask in the room if you are unclear about any details here.**
@ -37,29 +37,6 @@ date from the calendar.
Also adds the `/jumptodate 2022-01-31` slash command. Also adds the `/jumptodate 2022-01-31` slash command.
## Render simple counters in room header (`feature_state_counters`)
Allows rendering of labelled counters above the message list.
Once enabled, send a custom state event to a room to set values:
1. In a room, type `/devtools` to bring up the devtools interface
2. Click "Send Custom Event"
3. Toggle from "Event" to "State Event"
4. Set the event type to: `re.jki.counter` and give it a unique key
5. Specify the content in the following format:
```
{
"link": "",
"severity": "normal",
"title": "my counter",
"value": 0
}
```
That's it. Now should see your new counter under the header.
## New ways to ignore people (`feature_mjolnir`) ## New ways to ignore people (`feature_mjolnir`)
When enabled, a new settings tab appears for users to be able to manage their ban lists. When enabled, a new settings tab appears for users to be able to manage their ban lists.

4
docs/modules.md
View file

@ -6,7 +6,7 @@ at runtime.
## Installing modules ## Installing modules
If you already have a module you want to install, such as our [ILAG Module](https://github.com/vector-im/element-web-ilag-module), If you already have a module you want to install, such as our [ILAG Module](https://github.com/element-hq/element-web-ilag-module),
then copy `build_config.sample.yaml` to `build_config.yaml` in the same directory. In your new `build_config.yaml` simply then copy `build_config.sample.yaml` to `build_config.yaml` in the same directory. In your new `build_config.yaml` simply
add the reference to the module as described by the sample file, using the same syntax you would for `yarn add`: add the reference to the module as described by the sample file, using the same syntax you would for `yarn add`:
@ -30,7 +30,7 @@ Once your change to the module API is accepted, the `@matrix-org/react-sdk-modul
`matrix-react-sdk` and `element-web` layers (usually by us, the maintainers) to ensure your module can operate. `matrix-react-sdk` and `element-web` layers (usually by us, the maintainers) to ensure your module can operate.
If you're not adding anything to the module API, or your change was accepted per above, then start off with a clone of If you're not adding anything to the module API, or your change was accepted per above, then start off with a clone of
our [ILAG module](https://github.com/vector-im/element-web-ilag-module) which will give you a general idea for what the our [ILAG module](https://github.com/element-hq/element-web-ilag-module) which will give you a general idea for what the
structure of a module is and how it works. structure of a module is and how it works.
The following requirements are key for any module: The following requirements are key for any module:

2
docs/native-node-modules.md
View file

@ -1,3 +1,3 @@
# Native Node Modules # Native Node Modules
This documentation moved to the [`element-desktop`](https://github.com/vector-im/element-desktop/blob/develop/docs/native-node-modules.md) repository. This documentation moved to the [`element-desktop`](https://github.com/element-hq/element-desktop/blob/develop/docs/native-node-modules.md) repository.

22
docs/release.md
View file

@ -82,8 +82,8 @@ This label will automagically convert to `X-Release-Blocker` at the conclusion o
This release process revolves around our four main repositories: This release process revolves around our four main repositories:
- [Element Desktop](https://github.com/vector-im/element-desktop/) - [Element Desktop](https://github.com/element-hq/element-desktop/)
- [Element Web](https://github.com/vector-im/element-web/) - [Element Web](https://github.com/element-hq/element-web/)
- [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk/) - [Matrix React SDK](https://github.com/matrix-org/matrix-react-sdk/)
- [Matrix JS SDK](https://github.com/matrix-org/matrix-js-sdk/) - [Matrix JS SDK](https://github.com/matrix-org/matrix-js-sdk/)
@ -97,7 +97,7 @@ We own other repositories, but they have more ad-hoc releases and are not part o
<details><summary><h1>Prerequisites</h1></summary><blockquote> <details><summary><h1>Prerequisites</h1></summary><blockquote>
- You must be part of the 2 Releasers GitHub groups: - You must be part of the 2 Releasers GitHub groups:
- <https://github.com/orgs/vector-im/teams/element-web-releasers> - <https://github.com/orgs/element-hq/teams/element-web-releasers>
- <https://github.com/orgs/matrix-org/teams/element-web-releasers> - <https://github.com/orgs/matrix-org/teams/element-web-releasers>
- You will need access to the **VPN** ([docs](https://gitlab.matrix.org/new-vector/internal/-/wikis/SRE/Tailscale)) to be able to follow the instructions under Deploy below. - You will need access to the **VPN** ([docs](https://gitlab.matrix.org/new-vector/internal/-/wikis/SRE/Tailscale)) to be able to follow the instructions under Deploy below.
- You will need the ability to **SSH** in to the production machines to be able to follow the instructions under Deploy below. Ensure that your SSH key has a non-empty passphrase, and you registered your SSH key with Ops. Log a ticket at https://github.com/matrix-org/matrix-ansible-private and ask for: - You will need the ability to **SSH** in to the production machines to be able to follow the instructions under Deploy below. Ensure that your SSH key has a non-empty passphrase, and you registered your SSH key with Ops. Log a ticket at https://github.com/matrix-org/matrix-ansible-private and ask for:
@ -168,7 +168,7 @@ The goal of this stage is to get the code you want to ship onto the `staging` br
There are multiple ways to accomplish this depending on the type of release you need to perform. There are multiple ways to accomplish this depending on the type of release you need to perform.
For the first RC in a given release cycle the easiest way to prepare branches is using the For the first RC in a given release cycle the easiest way to prepare branches is using the
[Cut branches automation](https://github.com/vector-im/element-web/actions/workflows/release_prepare.yml) - [Cut branches automation](https://github.com/element-hq/element-web/actions/workflows/release_prepare.yml) -
this will take `develop` and merge it into the `staging` on the chosen repositories. this will take `develop` and merge it into the `staging` on the chosen repositories.
For subsequent RCs, if you need to include a change you may PR it directly to the `staging` branch or rely on the For subsequent RCs, if you need to include a change you may PR it directly to the `staging` branch or rely on the
@ -204,13 +204,13 @@ The next stop is matrix-react-sdk; kick off a release using [the automation](htt
### Element Web ### Element Web
The next stop is element-web; kick off a release using [the automation](https://github.com/vector-im/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the SDK version fields enter the versions you wish to use, for typical releases including all the layers this would be the versions released in the stages above. The next stop is element-web; kick off a release using [the automation](https://github.com/element-hq/element-web/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the SDK version fields enter the versions you wish to use, for typical releases including all the layers this would be the versions released in the stages above.
- [ ] Element Web has been released - [ ] Element Web has been released
### Element Desktop ### Element Desktop
The next stop is element-desktop; kick off a release using [the automation](https://github.com/vector-im/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the JS SDK version field enter the version of the JS SDK you wish to use, for typical releases including all the layers this would be the version released in the stage above. The next stop is element-desktop; kick off a release using [the automation](https://github.com/element-hq/element-desktop/actions/workflows/release.yml) - making sure to select the right type of release. For anything other than an RC: choose final. In the JS SDK version field enter the version of the JS SDK you wish to use, for typical releases including all the layers this would be the version released in the stage above.
- [ ] Element Desktop has been released - [ ] Element Desktop has been released
@ -235,7 +235,7 @@ For final releases additionally do these steps:
We have some manual housekeeping to do in order to prepare for the next release. We have some manual housekeeping to do in order to prepare for the next release.
- [ ] Update topics using [the automation](https://github.com/vector-im/element-web/actions/workflows/update-topics.yaml). It will autodetect the current latest version. Don't forget the date you supply should be e.g. September 5th (including the "th") for the script to work. - [ ] Update topics using [the automation](https://github.com/element-hq/element-web/actions/workflows/update-topics.yaml). It will autodetect the current latest version. Don't forget the date you supply should be e.g. September 5th (including the "th") for the script to work.
- [ ] Announce the release in [#element-web-announcements:matrix.org](https://matrix.to/#/#element-web-announcements:matrix.org) - [ ] Announce the release in [#element-web-announcements:matrix.org](https://matrix.to/#/#element-web-announcements:matrix.org)
<details><summary>(show)</summary> <details><summary>(show)</summary>
@ -246,7 +246,7 @@ With wording like:
> >
> This version adds ... and fixes bugs ... > This version adds ... and fixes bugs ...
> >
> Check it out at app.element.io, in Element Desktop, or from Docker Hub. Changelog and more details at https://github.com/vector-im/element-web/releases/tag/v1.11.24 > Check it out at app.element.io, in Element Desktop, or from Docker Hub. Changelog and more details at https://github.com/element-hq/element-web/releases/tag/v1.11.24
</details> </details>
@ -256,13 +256,13 @@ For the first RC of a given release cycle do these steps:
- [ ] Go to the [matrix-react-sdk Renovate dashboard](https://github.com/matrix-org/matrix-react-sdk/issues/9667) and click the checkbox to create/update its PRs. - [ ] Go to the [matrix-react-sdk Renovate dashboard](https://github.com/matrix-org/matrix-react-sdk/issues/9667) and click the checkbox to create/update its PRs.
- [ ] Go to the [element-web Renovate dashboard](https://github.com/vector-im/element-web/issues/22941) and click the checkbox to create/update its PRs. - [ ] Go to the [element-web Renovate dashboard](https://github.com/element-hq/element-web/issues/22941) and click the checkbox to create/update its PRs.
- [ ] Go to the [element-desktop Renovate dashboard](https://github.com/vector-im/element-desktop/issues/465) and click the checkbox to create/update its PRs. - [ ] Go to the [element-desktop Renovate dashboard](https://github.com/element-hq/element-desktop/issues/465) and click the checkbox to create/update its PRs.
- [ ] Later, check back and merge the PRs that succeeded to build. The ones that failed will get picked up by the [maintainer](https://docs.google.com/document/d/1V5VINWXATMpz9UBw4IKmVVB8aw3CxM0Jt7igtHnDfSk/edit#). - [ ] Later, check back and merge the PRs that succeeded to build. The ones that failed will get picked up by the [maintainer](https://docs.google.com/document/d/1V5VINWXATMpz9UBw4IKmVVB8aw3CxM0Jt7igtHnDfSk/edit#).
For final releases additionally do these steps: For final releases additionally do these steps:
- [ ] Archive done column on the [team board](https://github.com/orgs/vector-im/projects/67/views/34) _Note: this should be automated_ - [ ] Archive done column on the [team board](https://github.com/orgs/element-hq/projects/67/views/34) _Note: this should be automated_
- [ ] Add entry to the [milestones diary](https://docs.google.com/document/d/1cpRFJdfNCo2Ps6jqzQmatzbYEToSrQpyBug0aP_iwZE/edit#heading=h.6y55fw4t283z). The document says only to add significant releases, but we add all of them just in case. - [ ] Add entry to the [milestones diary](https://docs.google.com/document/d/1cpRFJdfNCo2Ps6jqzQmatzbYEToSrQpyBug0aP_iwZE/edit#heading=h.6y55fw4t283z). The document says only to add significant releases, but we add all of them just in case.

2
docs/translating-dev.md
View file

@ -36,7 +36,7 @@ function getColorName(hex) {
## Key naming rules ## Key naming rules
These rules are based on https://github.com/vector-im/element-x-android/blob/develop/tools/localazy/README.md These rules are based on https://github.com/element-hq/element-x-android/blob/develop/tools/localazy/README.md
At this time we are not trying to have a translation key per UI element as some methodologies use, At this time we are not trying to have a translation key per UI element as some methodologies use,
whilst that would offer the greatest flexibility, it would also make reuse between projects nigh impossible. whilst that would offer the greatest flexibility, it would also make reuse between projects nigh impossible.
We are aiming for a set of common strings to be shared then some more localised translations per context they may appear in. We are aiming for a set of common strings to be shared then some more localised translations per context they may appear in.

2
element.io/README
View file

@ -6,7 +6,7 @@ official element.io distribution, but these files may be useful if you want to
inspect the configuration used there. inspect the configuration used there.
Element Desktop uses a separate config (see Element Desktop uses a separate config (see
https://github.com/vector-im/element-desktop/tree/develop/element.io). https://github.com/element-hq/element-desktop/tree/develop/element.io).
Deployment scripts (such as app/deploy.py) are meant to be run on the web server Deployment scripts (such as app/deploy.py) are meant to be run on the web server
hosting the Element installation. hosting the Element installation.

50
package.json
View file

@ -1,11 +1,11 @@
{ {
"name": "element-web", "name": "element-web",
"version": "1.11.50", "version": "1.11.52",
"description": "A feature-rich client for Matrix.org", "description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.", "author": "New Vector Ltd.",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/vector-im/element-web" "url": "https://github.com/element-hq/element-web"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"files": [ "files": [
@ -32,7 +32,7 @@
"scripts": { "scripts": {
"i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint",
"i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json", "i18n:sort": "jq --sort-keys '.' src/i18n/strings/en_EN.json > src/i18n/strings/en_EN.json.tmp && mv src/i18n/strings/en_EN.json.tmp src/i18n/strings/en_EN.json",
"i18n:lint": "prettier --write src/i18n/strings/ --ignore-path /dev/null", "i18n:lint": "prettier --log-level=silent --write src/i18n/strings/ --ignore-path /dev/null",
"i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json", "i18n:diff": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && matrix-compare-i18n-files src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
"clean": "rimraf lib webapp", "clean": "rimraf lib webapp",
"build": "yarn clean && yarn build:genfiles && yarn build:bundle", "build": "yarn clean && yarn build:genfiles && yarn build:bundle",
@ -53,7 +53,7 @@
"lint:js:src": "eslint --max-warnings 0 src test && prettier --check .", "lint:js:src": "eslint --max-warnings 0 src test && prettier --check .",
"lint:js:module_system": "eslint --max-warnings 0 --config .eslintrc-module_system.js module_system", "lint:js:module_system": "eslint --max-warnings 0 --config .eslintrc-module_system.js module_system",
"lint:js-fix": "yarn lint:js-fix:src && yarn lint:js-fix:module_system", "lint:js-fix": "yarn lint:js-fix:src && yarn lint:js-fix:module_system",
"lint:js-fix:src": "prettier --write . && eslint --fix src test", "lint:js-fix:src": "prettier --log-level=warn --write . && eslint --fix src test",
"lint:js-fix:module_system": "eslint --fix --config .eslintrc-module_system.js module_system", "lint:js-fix:module_system": "eslint --fix --config .eslintrc-module_system.js module_system",
"lint:types": "yarn lint:types:src && yarn lint:types:module_system", "lint:types": "yarn lint:types:src && yarn lint:types:module_system",
"lint:types:src": "tsc --noEmit --jsx react", "lint:types:src": "tsc --noEmit --jsx react",
@ -109,29 +109,47 @@
"@sentry/webpack-plugin": "^2.7.1", "@sentry/webpack-plugin": "^2.7.1",
"@svgr/webpack": "^5.5.0", "@svgr/webpack": "^5.5.0",
"@testing-library/react": "^12.1.5", "@testing-library/react": "^12.1.5",
"@types/commonmark": "^0.27.9",
"@types/content-type": "^1.1.8",
"@types/counterpart": "^0.18.4",
"@types/diff-match-patch": "^1.0.36",
"@types/escape-html": "^1.0.4",
"@types/file-saver": "^2.0.7",
"@types/glob-to-regexp": "^0.4.4",
"@types/jest": "^29.0.0", "@types/jest": "^29.0.0",
"@types/jitsi-meet": "^2.0.2", "@types/jitsi-meet": "^2.0.2",
"@types/jsrsasign": "^10.5.4", "@types/jsrsasign": "^10.5.4",
"@types/katex": "^0.16.7",
"@types/lodash": "^4.14.197", "@types/lodash": "^4.14.197",
"@types/minimist": "^1.2.5",
"@types/modernizr": "^3.5.6",
"@types/node": "^16", "@types/node": "^16",
"@types/node-fetch": "^2.6.4", "@types/node-fetch": "^2.6.4",
"@types/pako": "^2.0.3",
"@types/qrcode": "^1.5.5",
"@types/react": "17.0.68", "@types/react": "17.0.68",
"@types/react-beautiful-dnd": "^13.1.7",
"@types/react-dom": "17.0.21", "@types/react-dom": "17.0.21",
"@types/react-transition-group": "^4.4.9",
"@types/sanitize-html": "^2.9.5",
"@types/sdp-transform": "^2.4.9",
"@types/tar-js": "^0.3.5",
"@types/ua-parser-js": "^0.7.36", "@types/ua-parser-js": "^0.7.36",
"@typescript-eslint/eslint-plugin": "^5.45.0", "@types/uuid": "^9.0.7",
"@typescript-eslint/parser": "^5.45.0", "@typescript-eslint/eslint-plugin": "^6.0.0",
"@typescript-eslint/parser": "^6.0.0",
"allchange": "^1.0.6", "allchange": "^1.0.6",
"babel-jest": "^29.0.0", "babel-jest": "^29.0.0",
"babel-loader": "^8.2.2", "babel-loader": "^9.0.0",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"chokidar": "^3.5.1", "chokidar": "^3.5.1",
"concurrently": "^8.0.0", "concurrently": "^8.0.0",
"copy-webpack-plugin": "^11.0.0", "copy-webpack-plugin": "^11.0.0",
"cronstrue": "^2.41.0", "cronstrue": "^2.41.0",
"css-loader": "^4", "css-loader": "^5.2.7",
"css-minimizer-webpack-plugin": "^5.0.1", "css-minimizer-webpack-plugin": "^5.0.1",
"dotenv": "^16.0.2", "dotenv": "^16.0.2",
"eslint": "8.53.0", "eslint": "8.55.0",
"eslint-config-google": "^0.14.0", "eslint-config-google": "^0.14.0",
"eslint-config-prettier": "^9.0.0", "eslint-config-prettier": "^9.0.0",
"eslint-plugin-deprecate": "0.8.4", "eslint-plugin-deprecate": "0.8.4",
@ -167,7 +185,7 @@
"postcss-preset-env": "^6.7.0", "postcss-preset-env": "^6.7.0",
"postcss-scss": "^4.0.4", "postcss-scss": "^4.0.4",
"postcss-simple-vars": "^5.0.2", "postcss-simple-vars": "^5.0.2",
"prettier": "2.8.8", "prettier": "3.1.1",
"process": "^0.11.10", "process": "^0.11.10",
"proxy-agent": "^6.3.0", "proxy-agent": "^6.3.0",
"raw-loader": "^4.0.2", "raw-loader": "^4.0.2",
@ -175,18 +193,18 @@
"semver": "^7.5.2", "semver": "^7.5.2",
"setimmediate": "^1.0.5", "setimmediate": "^1.0.5",
"string-replace-loader": "3", "string-replace-loader": "3",
"style-loader": "2", "style-loader": "3",
"stylelint": "^15.10.1", "stylelint": "^16.0.0",
"stylelint-config-standard": "^34.0.0", "stylelint-config-standard": "^35.0.0",
"stylelint-scss": "^5.0.0", "stylelint-scss": "^6.0.0",
"terser-webpack-plugin": "^5.3.9", "terser-webpack-plugin": "^5.3.9",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"ts-prune": "^0.10.3", "ts-prune": "^0.10.3",
"typescript": "5.2.2", "typescript": "5.3.3",
"util": "^0.12.5", "util": "^0.12.5",
"webpack": "^5.89.0", "webpack": "^5.89.0",
"webpack-bundle-analyzer": "^4.8.0", "webpack-bundle-analyzer": "^4.8.0",
"webpack-cli": "^4.10.0", "webpack-cli": "^5.0.0",
"webpack-dev-server": "^4.15.1", "webpack-dev-server": "^4.15.1",
"yaml": "^2.3.3" "yaml": "^2.3.3"
}, },

4
res/css/structures/ErrorView.pcss
View file

@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// import font-size variables manually, /* import font-size variables manually,
// ideally this file would get loaded by the theme which has all variables in context ideally this file would get loaded by the theme which has all variables in context */
@import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.pcss"; @import "../../../node_modules/matrix-react-sdk/res/css/_font-sizes.pcss";
.mx_ErrorView { .mx_ErrorView {

2
res/decoder-ring/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Rageshake decoder ring</title> <title>Rageshake decoder ring</title>

6
scripts/gen-workflow-mermaid.ts
View file

@ -400,7 +400,11 @@ class MermaidFlowchartPrinter {
this.currentIndent += delta * MermaidFlowchartPrinter.INDENT; this.currentIndent += delta * MermaidFlowchartPrinter.INDENT;
} }
public constructor(direction: "TD" | "TB" | "BT" | "RL" | "LR", title?: string, private readonly markdown = false) { public constructor(
direction: "TD" | "TB" | "BT" | "RL" | "LR",
title?: string,
private readonly markdown = false,
) {
if (this.markdown) { if (this.markdown) {
this.print("```mermaid"); this.print("```mermaid");
} }

2
scripts/issues-burndown.pl
View file

@ -18,7 +18,7 @@ my $gh = Net::GitHub->new(
login => 'ara4n', pass => read_password("github password: "), login => 'ara4n', pass => read_password("github password: "),
); );
$gh->set_default_user_repo('vector-im', 'element-web'); $gh->set_default_user_repo('element-hq', 'element-web');
#my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 }); #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
my @issues = $gh->issue->repos_issues({ state => 'all' }); my @issues = $gh->issue->repos_issues({ state => 'all' });

2
scripts/issues-no-state.pl
View file

@ -18,7 +18,7 @@ my $gh = Net::GitHub->new(
login => 'ara4n', pass => read_password("github password: "), login => 'ara4n', pass => read_password("github password: "),
); );
$gh->set_default_user_repo('vector-im', 'element-web'); $gh->set_default_user_repo('element-hq', 'element-web');
#my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 }); #my @issues = $gh->issue->repos_issues({ state => 'all', milestone => 3 });
my @issues = $gh->issue->repos_issues({ state => 'all' }); my @issues = $gh->issue->repos_issues({ state => 'all' });

2
scripts/layered.sh
View file

@ -17,7 +17,7 @@ set -ex
yarn install --frozen-lockfile yarn install --frozen-lockfile
# Pass appropriate repo to fetchdep.sh # Pass appropriate repo to fetchdep.sh
export PR_ORG=vector-im export PR_ORG=element-hq
export PR_REPO=element-web export PR_REPO=element-web
# Set up the js-sdk first # Set up the js-sdk first

2
src/components/views/auth/VectorAuthFooter.tsx
View file

@ -25,7 +25,7 @@ const VectorAuthFooter = (): ReactElement => {
const links = brandingConfig?.get("auth_footer_links") ?? [ const links = brandingConfig?.get("auth_footer_links") ?? [
{ text: "Blog", url: "https://element.io/blog" }, { text: "Blog", url: "https://element.io/blog" },
{ text: "Twitter", url: "https://twitter.com/element_hq" }, { text: "Twitter", url: "https://twitter.com/element_hq" },
{ text: "GitHub", url: "https://github.com/vector-im/element-web" }, { text: "GitHub", url: "https://github.com/element-hq/element-web" },
]; ];
const authFooterLinks: JSX.Element[] = []; const authFooterLinks: JSX.Element[] = [];

1
src/i18n/strings/de_DE.json
View file

@ -9,6 +9,7 @@
"auth": { "auth": {
"sso_complete_in_browser_dialog_title": "Browser öffnen, um die Anmeldung abzuschließen" "sso_complete_in_browser_dialog_title": "Browser öffnen, um die Anmeldung abzuschließen"
}, },
"desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
"download_completed": "Herunterladen fertiggestellt", "download_completed": "Herunterladen fertiggestellt",
"error": { "error": {
"app_launch_unexpected_error": "Unerwarteter Fehler bei der Vorbereitung der App; mehr Details in der Konsole.", "app_launch_unexpected_error": "Unerwarteter Fehler bei der Vorbereitung der App; mehr Details in der Konsole.",

5
src/i18n/strings/en_US.json
View file

@ -1,5 +0,0 @@
{
"action": {
"sign_in": "Sign in"
}
}

2
src/i18n/strings/hu.json
View file

@ -22,7 +22,7 @@
"misconfigured": "Az Element hibásan van beállítva" "misconfigured": "Az Element hibásan van beállítva"
}, },
"failed_to_start": "Az indítás sikertelen", "failed_to_start": "Az indítás sikertelen",
"go_to_element_io": "Irány a element.io", "go_to_element_io": "Irány az element.io",
"incompatible_browser": { "incompatible_browser": {
"browser_links": "A legjobb élmény érdékében telepítsen <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.", "browser_links": "A legjobb élmény érdékében telepítsen <chromeLink>Chrome-ot</chromeLink>, <firefoxLink>Firefoxot</firefoxLink> vagy <safariLink>Safarit</safariLink>.",
"continue_warning": "Megértettem a kockázatot és folytatom", "continue_warning": "Megértettem a kockázatot és folytatom",

1
src/i18n/strings/id.json
View file

@ -9,6 +9,7 @@
"auth": { "auth": {
"sso_complete_in_browser_dialog_title": "Buka peramban Anda untuk menyelesaikan Sign In" "sso_complete_in_browser_dialog_title": "Buka peramban Anda untuk menyelesaikan Sign In"
}, },
"desktop_default_device_name": "%(brand)s Desktop: %(platformName)s",
"download_completed": "Unduhan Selesai", "download_completed": "Unduhan Selesai",
"error": { "error": {
"app_launch_unexpected_error": "Kesalahan tak terduga saat menyiapkan aplikasi. Lihat konsol untuk detail.", "app_launch_unexpected_error": "Kesalahan tak terduga saat menyiapkan aplikasi. Lihat konsol untuk detail.",

2
src/i18n/strings/zh_Hans.json
View file

@ -2,7 +2,7 @@
"action": { "action": {
"create_account": "创建账户", "create_account": "创建账户",
"dismiss": "忽略", "dismiss": "忽略",
"explore_rooms": "探索房间", "explore_rooms": "探索聊天室",
"open": "打开", "open": "打开",
"sign_in": "登录" "sign_in": "登录"
}, },

2
src/vector/index.html
View file

@ -59,7 +59,7 @@
</head> </head>
<body style="height: 100%; margin: 0;"> <body style="height: 100%; margin: 0;">
<noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? --> <noscript>Sorry, Element requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
<section id="matrixchat" style="height: 100%;" class="notranslate"></section> <div id="matrixchat" style="height: 100%;" class="notranslate"></div>
<% <%
// insert <script> tags for the JS entry points // insert <script> tags for the JS entry points

4
src/vector/index.ts
View file

@ -102,7 +102,7 @@ const supportedBrowser = checkBrowserFeatures();
// try in react but fallback to an `alert` // try in react but fallback to an `alert`
// We start loading stuff but don't block on it until as late as possible to allow // We start loading stuff but don't block on it until as late as possible to allow
// the browser to use as much parallelism as it can. // the browser to use as much parallelism as it can.
// Load parallelism is based on research in https://github.com/vector-im/element-web/issues/12253 // Load parallelism is based on research in https://github.com/element-hq/element-web/issues/12253
async function start(): Promise<void> { async function start(): Promise<void> {
// load init.ts async so that its code is not executed immediately and we can catch any exceptions // load init.ts async so that its code is not executed immediately and we can catch any exceptions
const { const {
@ -133,7 +133,7 @@ async function start(): Promise<void> {
// don't try to redirect to the native apps if we're // don't try to redirect to the native apps if we're
// verifying a 3pid (but after we've loaded the config) // verifying a 3pid (but after we've loaded the config)
// or if the user is following a deep link // or if the user is following a deep link
// (https://github.com/vector-im/element-web/issues/7378) // (https://github.com/element-hq/element-web/issues/7378)
const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0; const preventRedirect = fragparts.params.client_secret || fragparts.location.length > 0;
if (!preventRedirect) { if (!preventRedirect) {

2
src/vector/jitsi/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

2
src/vector/jitsi/index.pcss
View file

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
/* TODO: Match the user's theme: https://github.com/vector-im/element-web/issues/12794 */ /* TODO: Match the user's theme: https://github.com/element-hq/element-web/issues/12794 */
@font-face { @font-face {
font-family: "Nunito"; font-family: "Nunito";

2
src/vector/jitsi/index.ts
View file

@ -459,7 +459,7 @@ async function joinConference(audioInput?: string | null, videoInput?: string |
// normal conference calls, since in video rooms we control exactly what // normal conference calls, since in video rooms we control exactly what
// set of controls appear, but in normal calls we need to leave that up // set of controls appear, but in normal calls we need to leave that up
// to the deployment's configuration. // to the deployment's configuration.
// https://github.com/vector-im/element-web/issues/4880#issuecomment-940002464 // https://github.com/element-hq/element-web/issues/4880#issuecomment-940002464
if (supportsScreensharing) options.configOverwrite!.toolbarButtons.splice(2, 0, "desktop"); if (supportsScreensharing) options.configOverwrite!.toolbarButtons.splice(2, 0, "desktop");
// Hide all top bar elements // Hide all top bar elements
options.configOverwrite!.conferenceInfo = { autoHide: [] }; options.configOverwrite!.conferenceInfo = { autoHide: [] };

2
src/vector/mobile_guide/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<title>Element Mobile Guide</title> <title>Element Mobile Guide</title>

2
src/vector/platform/ElectronPlatform.tsx
View file

@ -366,7 +366,7 @@ export default class ElectronPlatform extends VectorBasePlatform {
} }
public supportsJitsiScreensharing(): boolean { public supportsJitsiScreensharing(): boolean {
// See https://github.com/vector-im/element-web/issues/4880 // See https://github.com/element-hq/element-web/issues/4880
return false; return false;
} }

2
src/vector/platform/VectorBasePlatform.ts
View file

@ -41,7 +41,7 @@ export default abstract class VectorBasePlatform extends BasePlatform {
/** /**
* Delay creating the `Favicon` instance until first use (on the first notification) as * Delay creating the `Favicon` instance until first use (on the first notification) as
* it uses canvas, which can trigger a permission prompt in Firefox's resist fingerprinting mode. * it uses canvas, which can trigger a permission prompt in Firefox's resist fingerprinting mode.
* See https://github.com/vector-im/element-web/issues/9605. * See https://github.com/element-hq/element-web/issues/9605.
*/ */
public get favicon(): Favicon { public get favicon(): Favicon {
if (this._favicon) { if (this._favicon) {

11
test/app-tests/loading-test.tsx
View file

@ -39,6 +39,9 @@ import { cleanLocalstorage, deleteIndexedDB, waitForLoadingSpinner, waitForWelco
const DEFAULT_HS_URL = "http://my_server"; const DEFAULT_HS_URL = "http://my_server";
const DEFAULT_IS_URL = "http://my_is"; const DEFAULT_IS_URL = "http://my_is";
/** The matrix versions our mock server claims to support */
const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
describe("loading:", function () { describe("loading:", function () {
let httpBackend: MockHttpBackend; let httpBackend: MockHttpBackend;
@ -155,7 +158,7 @@ describe("loading:", function () {
async function expectAndAwaitSync(opts?: { isGuest?: boolean }): Promise<any> { async function expectAndAwaitSync(opts?: { isGuest?: boolean }): Promise<any> {
let syncRequest: (typeof MockHttpBackend.prototype.requests)[number] | null = null; let syncRequest: (typeof MockHttpBackend.prototype.requests)[number] | null = null;
httpBackend.when("GET", "/_matrix/client/versions").respond(200, { httpBackend.when("GET", "/_matrix/client/versions").respond(200, {
versions: ["v1.1"], versions: SERVER_SUPPORTED_MATRIX_VERSIONS,
unstable_features: {}, unstable_features: {},
}); });
const isGuest = opts?.isGuest; const isGuest = opts?.isGuest;
@ -215,7 +218,7 @@ describe("loading:", function () {
}); });
// Pass the liveliness checks // Pass the liveliness checks
httpBackend.when("GET", "/versions").respond(200, { versions: ["v1.1"] }); httpBackend.when("GET", "/versions").respond(200, { versions: SERVER_SUPPORTED_MATRIX_VERSIONS });
httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {});
return sleep(1) return sleep(1)
@ -265,7 +268,7 @@ describe("loading:", function () {
}); });
// Pass the liveliness checks // Pass the liveliness checks
httpBackend.when("GET", "/versions").respond(200, { versions: ["v1.1"] }); httpBackend.when("GET", "/versions").respond(200, { versions: SERVER_SUPPORTED_MATRIX_VERSIONS });
httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {}); httpBackend.when("GET", "/_matrix/identity/v2").respond(200, {});
return awaitLoginComponent(matrixChat) return awaitLoginComponent(matrixChat)
@ -377,7 +380,7 @@ describe("loading:", function () {
it("does not show a login view", async function () { it("does not show a login view", async function () {
await awaitRoomView(matrixChat); await awaitRoomView(matrixChat);
await screen.findByLabelText("Spaces"); await screen.getByRole("tree", { name: "Spaces" });
expect(screen.queryAllByText("Sign in")).toHaveLength(0); expect(screen.queryAllByText("Sign in")).toHaveLength(0);
}); });
}); });

5
test/app-tests/server-config-test.ts
View file

@ -21,6 +21,9 @@ import fetchMock from "fetch-mock-jest";
import { loadApp } from "../../src/vector/app"; import { loadApp } from "../../src/vector/app";
import WebPlatform from "../../src/vector/platform/WebPlatform"; import WebPlatform from "../../src/vector/platform/WebPlatform";
/** The matrix versions our mock server claims to support */
const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
fetchMock.config.overwriteRoutes = true; fetchMock.config.overwriteRoutes = true;
describe("Loading server config", function () { describe("Loading server config", function () {
@ -29,7 +32,7 @@ describe("Loading server config", function () {
PlatformPeg.set(new WebPlatform()); PlatformPeg.set(new WebPlatform());
fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", { fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", {
unstable_features: {}, unstable_features: {},
versions: ["v1.1"], versions: SERVER_SUPPORTED_MATRIX_VERSIONS,
}); });
fetchMock.get("https://matrix.org/.well-known/matrix/client", { fetchMock.get("https://matrix.org/.well-known/matrix/client", {
"m.homeserver": { "m.homeserver": {

5
test/app-tests/wrapper-test.tsx
View file

@ -28,6 +28,9 @@ import WebPlatform from "../../src/vector/platform/WebPlatform";
import { loadApp } from "../../src/vector/app"; import { loadApp } from "../../src/vector/app";
import { waitForLoadingSpinner, waitForWelcomeComponent } from "../test-utils"; import { waitForLoadingSpinner, waitForWelcomeComponent } from "../test-utils";
/** The matrix versions our mock server claims to support */
const SERVER_SUPPORTED_MATRIX_VERSIONS = ["v1.1", "v1.5", "v1.6", "v1.8", "v1.9"];
fetchMock.config.overwriteRoutes = true; fetchMock.config.overwriteRoutes = true;
describe("Wrapper", () => { describe("Wrapper", () => {
@ -36,7 +39,7 @@ describe("Wrapper", () => {
PlatformPeg.set(new WebPlatform()); PlatformPeg.set(new WebPlatform());
fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", { fetchMock.get("https://matrix-client.matrix.org/_matrix/client/versions", {
unstable_features: {}, unstable_features: {},
versions: ["v1.1"], versions: SERVER_SUPPORTED_MATRIX_VERSIONS,
}); });
fetchMock.get("https://matrix.org/.well-known/matrix/client", { fetchMock.get("https://matrix.org/.well-known/matrix/client", {
"m.homeserver": { "m.homeserver": {

2
test/unit-tests/components/views/auth/__snapshots__/VectorAuthFooter-test.tsx.snap
View file

@ -21,7 +21,7 @@ exports[`<VectorAuthFooter /> should match snapshot 1`] = `
Twitter Twitter
</a> </a>
<a <a
href="https://github.com/vector-im/element-web" href="https://github.com/element-hq/element-web"
rel="noreferrer noopener" rel="noreferrer noopener"
target="_blank" target="_blank"
> >

2
test/unit-tests/components/views/auth/__snapshots__/VectorAuthPage-test.tsx.snap
View file

@ -37,7 +37,7 @@ exports[`<VectorAuthPage /> should match snapshot 1`] = `
Twitter Twitter
</a> </a>
<a <a
href="https://github.com/vector-im/element-web" href="https://github.com/element-hq/element-web"
rel="noreferrer noopener" rel="noreferrer noopener"
target="_blank" target="_blank"
> >

1
tsconfig.json
View file

@ -17,6 +17,7 @@
}, },
"include": [ "include": [
"./node_modules/matrix-js-sdk/src/@types/*.d.ts", "./node_modules/matrix-js-sdk/src/@types/*.d.ts",
"./node_modules/matrix-react-sdk/src/@types/react.d.ts",
"./node_modules/matrix-react-sdk/src/@types/diff-dom.d.ts", "./node_modules/matrix-react-sdk/src/@types/diff-dom.d.ts",
"./node_modules/matrix-react-sdk/src/@types/opus-recorder.d.ts", "./node_modules/matrix-react-sdk/src/@types/opus-recorder.d.ts",
"./node_modules/matrix-react-sdk/src/@types/png-chunks-extract.d.ts", "./node_modules/matrix-react-sdk/src/@types/png-chunks-extract.d.ts",

1
variants/openDesk/build_config.yaml
View file

@ -7,4 +7,5 @@
# The values of this are provided to `yarn add` for inclusion. # The values of this are provided to `yarn add` for inclusion.
modules: modules:
- "@nordeck/element-web-guest-module@1.0.0" - "@nordeck/element-web-guest-module@1.0.0"
- "@nordeck/element-web-opendesk-module@0.3.0"
- "@nordeck/element-web-widget-lifecycle-module@1.0.1" - "@nordeck/element-web-widget-lifecycle-module@1.0.1"

4
webpack.config.js
View file

@ -67,7 +67,7 @@ try {
console.log(""); // blank line console.log(""); // blank line
console.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); console.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
console.warn("!! Customisations have been deprecated and will be removed in a future release !!"); console.warn("!! Customisations have been deprecated and will be removed in a future release !!");
console.warn("!! See https://github.com/vector-im/element-web/blob/develop/docs/customisations.md !!"); console.warn("!! See https://github.com/element-hq/element-web/blob/develop/docs/customisations.md !!");
console.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"); console.warn("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
console.log(""); // blank line console.log(""); // blank line
}); });
@ -810,7 +810,7 @@ function getAssetOutputPath(url, resourcePath) {
const prefix = /^.*[/\\](dist|res)[/\\]/; const prefix = /^.*[/\\](dist|res)[/\\]/;
/** /**
* Only needed for https://github.com/vector-im/element-web/pull/15939 * Only needed for https://github.com/element-hq/element-web/pull/15939
* If keeping this, we are not able to load external assets such as SVG * If keeping this, we are not able to load external assets such as SVG
* images coming from @vector-im/compound-web. * images coming from @vector-im/compound-web.
*/ */

1859
yarn.lock
View file

File diff suppressed because it is too large Load diff