Skip to content

Commit c552741

Browse files
Michael-SchaerMichael-Schaer
committed
Merge branch 'main' of github.com:grueneschweiz/element-web-apache
2 parents b6de475 + bf54609 commit c552741

65 files changed

Lines changed: 4990 additions & 1 deletion

Some content is hidden

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

‎README.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎upstream-release/.github/CODEOWNERS‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
* @element-hq/element-web-reviewers
2+
/.github/workflows/** @element-hq/element-web-team
3+
/package.json @element-hq/element-web-team
4+
/yarn.lock @element-hq/element-web-team
5+
6+
/src/SecurityManager.ts @element-hq/element-crypto-web-reviewers
7+
/test/SecurityManager-test.ts @element-hq/element-crypto-web-reviewers
8+
/src/async-components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers
9+
/src/components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers
10+
/test/components/views/dialogs/security/ @element-hq/element-crypto-web-reviewers
11+
/src/stores/SetupEncryptionStore.ts @element-hq/element-crypto-web-reviewers
12+
/test/stores/SetupEncryptionStore-test.ts @element-hq/element-crypto-web-reviewers
13+
/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx @element-hq/element-crypto-web-reviewers
14+
/src/components/views/settings/encryption/ @element-hq/element-crypto-web-reviewers
15+
/test/unit-tests/components/views/settings/encryption/ @element-hq/element-crypto-web-reviewers
16+
/src/components/views/dialogs/devtools/Crypto.tsx @element-hq/element-crypto-web-reviewers
17+
/playwright/e2e/crypto/ @element-hq/element-crypto-web-reviewers
18+
/playwright/e2e/settings/encryption-user-tab/ @element-hq/element-crypto-web-reviewers
19+
20+
21+
/src/models/Call.ts @element-hq/element-call-reviewers
22+
/src/call-types.ts @element-hq/element-call-reviewers
23+
/src/components/views/voip @element-hq/element-call-reviewers
24+
25+
# Ignore translations as those will be updated by GHA for Localazy download
26+
/src/i18n/strings
27+
/src/i18n/strings/en_EN.json @element-hq/element-web-reviewers
28+
# Ignore the synapse & mas plugins as this is updated by GHA for docker image updating
29+
/playwright/testcontainers/synapse.ts
30+
/playwright/testcontainers/mas.ts
31+

‎upstream-release/.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
patreon: matrixdotorg
2+
liberapay: matrixdotorg

‎upstream-release/.github/ISSUE_TEMPLATE/bug-desktop.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Bug report for the Element desktop app (not in a browser)
2+
description: File a bug report if you are using the desktop Element application.
3+
labels: [T-Defect]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this bug report!
9+
10+
Please report security issues by email to security@matrix.org
11+
- type: textarea
12+
id: reproduction-steps
13+
attributes:
14+
label: Steps to reproduce
15+
description: Please attach screenshots, videos or logs if you can.
16+
placeholder: Tell us what you see!
17+
value: |
18+
1. Where are you starting? What can you see?
19+
2. What do you click?
20+
3. More steps…
21+
validations:
22+
required: true
23+
- type: textarea
24+
id: result
25+
attributes:
26+
label: Outcome
27+
placeholder: Tell us what went wrong
28+
value: |
29+
#### What did you expect?
30+
31+
#### What happened instead?
32+
validations:
33+
required: true
34+
- type: input
35+
id: os
36+
attributes:
37+
label: Operating system
38+
placeholder: Windows, macOS, Ubuntu, Arch Linux…
39+
validations:
40+
required: false
41+
- type: input
42+
id: version
43+
attributes:
44+
label: Application version
45+
description: You can find the version information in Settings -> Help & About.
46+
placeholder: e.g. Element version 1.7.34, olm version 3.2.3
47+
validations:
48+
required: false
49+
- type: input
50+
id: source
51+
attributes:
52+
label: How did you install the app?
53+
description: Where did you install the app from? Please give a link or a description.
54+
placeholder: e.g. From https://element.io/get-started
55+
validations:
56+
required: false
57+
- type: input
58+
id: homeserver
59+
attributes:
60+
label: Homeserver
61+
description: |
62+
Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
63+
placeholder: e.g. matrix.org or Synapse 1.50.0rc1
64+
validations:
65+
required: false
66+
- type: dropdown
67+
id: rageshake
68+
attributes:
69+
label: Will you send logs?
70+
description: |
71+
Did you know that you can send a /rageshake command from your application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
72+
options:
73+
- "Yes"
74+
- "No"
75+
validations:
76+
required: true

‎upstream-release/.github/ISSUE_TEMPLATE/bug-web.yml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Bug report for Element Web (in browser)
2+
description: File a bug report if you are using Element in a web browser like Firefox, Chrome, Edge, and so on.
3+
labels: [T-Defect]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Thanks for taking the time to fill out this bug report!
9+
10+
Please report security issues by email to security@matrix.org
11+
- type: textarea
12+
id: reproduction-steps
13+
attributes:
14+
label: Steps to reproduce
15+
description: Please attach screenshots, videos or logs if you can.
16+
placeholder: Tell us what you see!
17+
value: |
18+
1. Where are you starting? What can you see?
19+
2. What do you click?
20+
3. More steps…
21+
validations:
22+
required: true
23+
- type: textarea
24+
id: result
25+
attributes:
26+
label: Outcome
27+
placeholder: Tell us what went wrong
28+
value: |
29+
#### What did you expect?
30+
31+
#### What happened instead?
32+
validations:
33+
required: true
34+
- type: input
35+
id: os
36+
attributes:
37+
label: Operating system
38+
placeholder: Windows, macOS, Ubuntu, Arch Linux…
39+
validations:
40+
required: false
41+
- type: input
42+
id: browser
43+
attributes:
44+
label: Browser information
45+
description: Which browser are you using? Which version?
46+
placeholder: e.g. Chromium Version 92.0.4515.131
47+
validations:
48+
required: false
49+
- type: input
50+
id: webapp-url
51+
attributes:
52+
label: URL for webapp
53+
description: Which URL are you using to access the webapp? If a private server, tell us what version of Element Web you are using.
54+
placeholder: e.g. develop.element.io, app.element.io
55+
validations:
56+
required: false
57+
- type: input
58+
id: version
59+
attributes:
60+
label: Application version
61+
description: You can find the version information in Settings -> Help & About.
62+
placeholder: e.g. Element version 1.7.34, olm version 3.2.3
63+
validations:
64+
required: false
65+
- type: input
66+
id: homeserver
67+
attributes:
68+
label: Homeserver
69+
description: |
70+
Which server is your account registered on? If it is a local or non-public homeserver, please tell us what is the homeserver implementation (ex: Synapse/Dendrite/etc.) and the version.
71+
placeholder: e.g. matrix.org or Synapse 1.50.0rc1
72+
validations:
73+
required: false
74+
- type: dropdown
75+
id: rageshake
76+
attributes:
77+
label: Will you send logs?
78+
description: |
79+
Did you know that you can send a /rageshake command from the web application to submit logs for this issue? Trigger the defect, then type `/rageshake` into the message input area followed by a description of the problem and send the command. You will be able to add a link to this defect report and submit anonymous logs to the developers.
80+
options:
81+
- "Yes"
82+
- "No"
83+
validations:
84+
required: true

‎upstream-release/.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Questions & support
4+
url: https://matrix.to/#/#element-web:matrix.org
5+
about: Please ask and answer questions here.

‎upstream-release/.github/ISSUE_TEMPLATE/enhancement.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Enhancement request
2+
description: Do you have a suggestion or feature request?
3+
labels: [T-Enhancement]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
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).
9+
- type: textarea
10+
id: usecase
11+
attributes:
12+
label: Your use case
13+
description: What would you like to be able to do? Please feel welcome to include screenshots or mock ups.
14+
placeholder: Tell us what you would like to do!
15+
value: |
16+
#### What would you like to do?
17+
18+
#### Why would you like to do it?
19+
20+
#### How would you like to achieve it?
21+
validations:
22+
required: true
23+
- type: textarea
24+
id: alternative
25+
attributes:
26+
label: Have you considered any alternatives?
27+
placeholder: A clear and concise description of any alternative solutions or features you've considered.
28+
validations:
29+
required: false
30+
- type: textarea
31+
id: additional-context
32+
attributes:
33+
label: Additional context
34+
placeholder: Is there anything else you'd like to add?
35+
validations:
36+
required: false

‎upstream-release/.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!-- Thanks for submitting a PR! Please ensure the following requirements are met in order for us to review your PR -->
2+
3+
## Checklist
4+
5+
- [ ] I have read through [review guidelines](../docs/review.md) and [CONTRIBUTING.md](../CONTRIBUTING.md).
6+
- [ ] Tests written for new code (and old code if feasible).
7+
- [ ] New or updated `public`/`exported` symbols have accurate [TSDoc](https://tsdoc.org/) documentation.
8+
- [ ] Linter and other CI checks pass.
9+
- [ ] I have licensed the changes to Element by completing the [Contributor License Agreement (CLA)](https://cla-assistant.io/element-hq/element-web)

‎upstream-release/.github/actions/download-verify-element-tarball/action.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Upload release assets
2+
description: Uploads assets to an existing release and optionally signs them
3+
inputs:
4+
tag:
5+
description: GitHub release tag to fetch assets from.
6+
required: true
7+
out-file-path:
8+
description: Path to where the webapp should be extracted to.
9+
required: true
10+
runs:
11+
using: composite
12+
steps:
13+
- name: Download release tarball
14+
uses: robinraju/release-downloader@daf26c55d821e836577a15f77d86ddc078948b05 # v1
15+
with:
16+
tag: ${{ inputs.tag }}
17+
fileName: element-*.tar.gz*
18+
out-file-path: ${{ runner.temp }}/download-verify-element-tarball
19+
20+
- name: Verify tarball
21+
shell: bash
22+
run: gpg --verify element-*.tar.gz.asc element-*.tar.gz
23+
working-directory: ${{ runner.temp }}/download-verify-element-tarball
24+
25+
- name: Extract tarball
26+
shell: bash
27+
run: |
28+
mkdir webapp
29+
tar xvzf element-*.tar.gz -C webapp --strip-components=1
30+
working-directory: ${{ runner.temp }}/download-verify-element-tarball
31+
32+
- name: Move webapp to out-file-path
33+
shell: bash
34+
run: mv ${{ runner.temp }}/download-verify-element-tarball/webapp ${{ inputs.out-file-path }}
35+
36+
- name: Clean up temp directory
37+
shell: bash
38+
run: rm -R ${{ runner.temp }}/download-verify-element-tarball

‎upstream-release/.github/cfp_headers‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
! Access-Control-Allow-Origin
3+
X-XSS-Protection: 1; mode=block
4+
X-Content-Type-Options: nosniff
5+
X-Frame-Options: SAMEORIGIN
6+
Content-Security-Policy: frame-ancestors 'self'
7+
Strict-Transport-Security: max-age=31536000; includeSubDomains; preload
8+
9+
/version
10+
Content-Type: text/plain
11+
12+
/apple-app-site-association
13+
Content-Type: application/json
14+
15+
/.well-known/assetlinks.json
16+
Content-Type: application/json

0 commit comments

Comments
 (0)
⚡