Skip to content

Commit d63c26c

Browse files
committed
Merge tag 'v1.10.1' into deploy-auto
* Fix the sticker picker ([\element-hq#7692](matrix-org/matrix-react-sdk#7692)). Fixes element-hq#20797. * Ensure UserInfo can be rendered without a room ([\element-hq#7687](matrix-org/matrix-react-sdk#7687)). Fixes element-hq#20830. * Fix publishing address wrongly demanding the alias be available ([\element-hq#7690](matrix-org/matrix-react-sdk#7690)). Fixes element-hq#12013 and element-hq#20833.
2 parents 8a2fa51 + e70c52e commit d63c26c

Some content is hidden

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

70 files changed

+4067
-1952
lines changed

.github/ISSUE_TEMPLATE/bug-desktop.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ body:
2323
- type: textarea
2424
id: result
2525
attributes:
26-
label: What happened?
26+
label: Outcome
2727
placeholder: Tell us what went wrong
2828
value: |
29-
### What did you expect?
29+
#### What did you expect?
3030
31-
### What happened?
31+
#### What happened instead?
3232
validations:
3333
required: true
3434
- type: input
@@ -58,16 +58,17 @@ body:
5858
id: homeserver
5959
attributes:
6060
label: Homeserver
61-
description: Which server is your account registered on?
62-
placeholder: e.g. matrix.org
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
6364
validations:
6465
required: false
6566
- type: dropdown
6667
id: rageshake
6768
attributes:
68-
label: Have you submitted a rageshake?
69+
label: Will you send logs?
6970
description: |
70-
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 entry area followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers.
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.
7172
options:
7273
- 'Yes'
7374
- 'No'

.github/ISSUE_TEMPLATE/bug-web.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ body:
2323
- type: textarea
2424
id: result
2525
attributes:
26-
label: What happened?
26+
label: Outcome
2727
placeholder: Tell us what went wrong
2828
value: |
29-
### What did you expect?
29+
#### What did you expect?
3030
31-
### What happened?
31+
#### What happened instead?
3232
validations:
3333
required: true
3434
- type: input
@@ -54,20 +54,29 @@ body:
5454
placeholder: e.g. develop.element.io, app.element.io
5555
validations:
5656
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
5765
- type: input
5866
id: homeserver
5967
attributes:
6068
label: Homeserver
61-
description: Which server is your account registered on?
62-
placeholder: e.g. matrix.org
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
6372
validations:
6473
required: false
6574
- type: dropdown
6675
id: rageshake
6776
attributes:
68-
label: Have you submitted a rageshake?
77+
label: Will you send logs?
6978
description: |
70-
Did you know that you can send a /rageshake command from the web applicaiton to submit logs for this issue? Trigger the defect, then type /rageshake into the message entry area followed by a description of the problem and send the command. This will automatically submit anonymous logs to the developers.
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.
7180
options:
7281
- 'Yes'
7382
- 'No'

.github/ISSUE_TEMPLATE/config.ylm

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Report a security vulnerability
4+
url: https://github.com/vector-im/element-web/security/policy
5+
about: Please review our security policy for more details
6+
- name: Questions & support
7+
url: https://matrix.to/#/#element-web:matrix.org
8+
about: Please ask and answer questions here.

.github/workflows/issues_to_projects.yaml

Lines changed: 0 additions & 36 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Upload Sentry Sourcemaps
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
repository_dispatch:
7+
types: [ element-web-notify ]
8+
jobs:
9+
upload-sentry-sourcemaps:
10+
runs-on: ubuntu-latest
11+
environment: develop
12+
steps:
13+
- uses: actions/checkout@v2
14+
- uses: actions/setup-node@v2
15+
with:
16+
node-version: '14'
17+
cache: 'yarn'
18+
- run: ./scripts/fetch-develop.deps.sh --depth 1
19+
- run: yarn install
20+
- run: ./scripts/ci_package.sh
21+
env:
22+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
23+
SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
24+
SENTRY_URL: ${{ secrets.SENTRY_URL }}
25+
SENTRY_ORG: sentry
26+
SENTRY_PROJECT: riot-web

.github/workflows/triage-incoming.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
automate-project-columns:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: alex-page/github-project-automation-plus@v0.8.1
11+
- uses: alex-page/github-project-automation-plus@bb266ff4dde9242060e2d5418e120a133586d488
1212
with:
1313
project: Issue triage
1414
column: Incoming

.github/workflows/triage-labelled.yml

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
name: Move labelled issues to correct boards and columns
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
jobs:
8+
apply_Z-Labs_label:
9+
name: Add Z-Labs label for features behind labs flags
10+
runs-on: ubuntu-latest
11+
if: >
12+
contains(github.event.issue.labels.*.name, 'A-Maths') ||
13+
contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
14+
contains(github.event.issue.labels.*.name, 'A-Threads') ||
15+
contains(github.event.issue.labels.*.name, 'A-Polls') ||
16+
contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
17+
contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||
18+
contains(github.event.issue.labels.*.name, 'Z-IA') ||
19+
contains(github.event.issue.labels.*.name, 'A-Themes-Custom') ||
20+
contains(github.event.issue.labels.*.name, 'A-E2EE-Dehydration') ||
21+
contains(github.event.issue.labels.*.name, 'A-Tags')
22+
steps:
23+
- uses: actions/github-script@v5
24+
with:
25+
script: |
26+
github.rest.issues.addLabels({
27+
issue_number: context.issue.number,
28+
owner: context.repo.owner,
29+
repo: context.repo.repo,
30+
labels: ['Z-Labs']
31+
})
32+
33+
move_needs_info_issues:
34+
name: X-Needs-Info issues to Need info column on triage board
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: konradpabjan/move-labeled-or-milestoned-issue@219d384e03fa4b6460cd24f9f37d19eb033a4338
38+
with:
39+
action-token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
40+
project-url: "https://github.com/vector-im/element-web/projects/27"
41+
column-name: "Need info"
42+
label-name: "X-Needs-Info"
43+
44+
add_priority_design_issues_to_project:
45+
name: P1 X-Needs-Design to Design project board
46+
runs-on: ubuntu-latest
47+
if: >
48+
contains(github.event.issue.labels.*.name, 'X-Needs-Design') &&
49+
(contains(github.event.issue.labels.*.name, 'S-Critical') &&
50+
(contains(github.event.issue.labels.*.name, 'O-Frequent') ||
51+
contains(github.event.issue.labels.*.name, 'O-Occasional')) ||
52+
contains(github.event.issue.labels.*.name, 'S-Major') &&
53+
contains(github.event.issue.labels.*.name, 'O-Frequent') ||
54+
contains(github.event.issue.labels.*.name, 'A11y') &&
55+
contains(github.event.issue.labels.*.name, 'O-Frequent'))
56+
steps:
57+
- uses: octokit/[email protected]
58+
id: add_to_project
59+
with:
60+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
61+
query: |
62+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
63+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
64+
projectNextItem {
65+
id
66+
}
67+
}
68+
}
69+
projectid: ${{ env.PROJECT_ID }}
70+
contentid: ${{ github.event.issue.node_id }}
71+
env:
72+
PROJECT_ID: "PN_kwDOAM0swc0sUA"
73+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
74+
75+
add_product_issues:
76+
name: X-Needs-Product to Design project board
77+
runs-on: ubuntu-latest
78+
if: >
79+
contains(github.event.issue.labels.*.name, 'X-Needs-Product')
80+
steps:
81+
- uses: octokit/[email protected]
82+
id: add_to_project
83+
with:
84+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
85+
query: |
86+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
87+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
88+
projectNextItem {
89+
id
90+
}
91+
}
92+
}
93+
projectid: ${{ env.PROJECT_ID }}
94+
contentid: ${{ github.event.issue.node_id }}
95+
env:
96+
PROJECT_ID: "PN_kwDOAM0swc4AAg6N"
97+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
98+
99+
Delight_issues_to_board:
100+
name: Delight issues to project board
101+
runs-on: ubuntu-latest
102+
if: >
103+
contains(github.event.issue.labels.*.name, 'A-Spaces') ||
104+
contains(github.event.issue.labels.*.name, 'A-Space-Settings') ||
105+
contains(github.event.issue.labels.*.name, 'A-Subspaces') ||
106+
contains(github.event.issue.labels.*.name, 'Z-IA')
107+
steps:
108+
- uses: octokit/[email protected]
109+
with:
110+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
111+
query: |
112+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
113+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
114+
projectNextItem {
115+
id
116+
}
117+
}
118+
}
119+
projectid: ${{ env.PROJECT_ID }}
120+
contentid: ${{ github.event.issue.node_id }}
121+
env:
122+
PROJECT_ID: "PN_kwDOAM0swc1HvQ"
123+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
124+
125+
move_voice-message_issues:
126+
name: A-Voice Messages to voice message board
127+
runs-on: ubuntu-latest
128+
if: >
129+
contains(github.event.issue.labels.*.name, 'A-Voice Messages')
130+
steps:
131+
- uses: octokit/[email protected]
132+
with:
133+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
134+
query: |
135+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
136+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
137+
projectNextItem {
138+
id
139+
}
140+
}
141+
}
142+
projectid: ${{ env.PROJECT_ID }}
143+
contentid: ${{ github.event.issue.node_id }}
144+
env:
145+
PROJECT_ID: "PN_kwDOAM0swc2KCw"
146+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
147+
148+
move_threads_issues:
149+
name: A-Threads to Thread board
150+
runs-on: ubuntu-latest
151+
if: >
152+
contains(github.event.issue.labels.*.name, 'A-Threads')
153+
steps:
154+
- uses: octokit/[email protected]
155+
with:
156+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
157+
query: |
158+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
159+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
160+
projectNextItem {
161+
id
162+
}
163+
}
164+
}
165+
projectid: ${{ env.PROJECT_ID }}
166+
contentid: ${{ github.event.issue.node_id }}
167+
env:
168+
PROJECT_ID: "PN_kwDOAM0swc0rRA"
169+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
170+
171+
move_message_bubbles_issues:
172+
name: A-Message-Bubbles to Message bubbles board
173+
runs-on: ubuntu-latest
174+
if: >
175+
contains(github.event.issue.labels.*.name, 'A-Message-Bubbles')
176+
steps:
177+
- uses: octokit/[email protected]
178+
with:
179+
headers: '{"GraphQL-Features": "projects_next_graphql"}'
180+
query: |
181+
mutation add_to_project($projectid:ID!,$contentid:ID!) {
182+
addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
183+
projectNextItem {
184+
id
185+
}
186+
}
187+
}
188+
projectid: ${{ env.PROJECT_ID }}
189+
contentid: ${{ github.event.issue.node_id }}
190+
env:
191+
PROJECT_ID: "PN_kwDOAM0swc3m-g"
192+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

0 commit comments

Comments
 (0)