Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 0a209af

Browse files
t3chguyt3chguy
committed
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089
� Conflicts: � res/css/structures/_SpaceHierarchy.scss � src/components/structures/SpaceHierarchy.tsx � src/i18n/strings/en_EN.json
2 parents 8216a35 + 228d623 commit 0a209af

File tree

196 files changed

+8565
-2978
lines changed

Some content is hidden

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

196 files changed

+8565
-2978
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @matrix-org/element-web

‎.github/workflows/layered-build.yaml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Layered Preview Build
2+
on:
3+
pull_request:
4+
branches: [develop]
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
- name: Build
11+
run: scripts/ci/layered.sh && cd element-web && cp element.io/develop/config.json config.json && CI_PACKAGE=true yarn build
12+
- name: Upload Artifact
13+
uses: actions/upload-artifact@v2
14+
with:
15+
name: previewbuild
16+
path: element-web/webapp
17+
# We'll only use this in a triggered job, then we're done with it
18+
retention-days: 1
19+
- uses: actions/[email protected]
20+
with:
21+
script: |
22+
var fs = require('fs');
23+
fs.writeFileSync('${{github.workspace}}/pr.json', JSON.stringify(context.payload.pull_request));
24+
- name: Upload PR Info
25+
uses: actions/upload-artifact@v2
26+
with:
27+
name: pr.json
28+
path: pr.json
29+
# We'll only use this in a triggered job, then we're done with it
30+
retention-days: 1
31+

‎.github/workflows/netflify.yaml‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: Upload Preview Build to Netlify
2+
on:
3+
workflow_run:
4+
workflows: ["Layered Preview Build"]
5+
types:
6+
- completed
7+
jobs:
8+
build:
9+
runs-on: ubuntu-latest
10+
if: >
11+
${{ github.event.workflow_run.conclusion == 'success' }}
12+
steps:
13+
# There's a 'download artifact' action but it hasn't been updated for the
14+
# workflow_run action (https://github.com/actions/download-artifact/issues/60)
15+
# so instead we get this mess:
16+
- name: 'Download artifact'
17+
uses: actions/[email protected]
18+
with:
19+
script: |
20+
var artifacts = await github.actions.listWorkflowRunArtifacts({
21+
owner: context.repo.owner,
22+
repo: context.repo.repo,
23+
run_id: ${{github.event.workflow_run.id }},
24+
});
25+
var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
26+
return artifact.name == "previewbuild"
27+
})[0];
28+
var download = await github.actions.downloadArtifact({
29+
owner: context.repo.owner,
30+
repo: context.repo.repo,
31+
artifact_id: matchArtifact.id,
32+
archive_format: 'zip',
33+
});
34+
var fs = require('fs');
35+
fs.writeFileSync('${{github.workspace}}/previewbuild.zip', Buffer.from(download.data));
36+
37+
var prInfoArtifact = artifacts.data.artifacts.filter((artifact) => {
38+
return artifact.name == "pr.json"
39+
})[0];
40+
var download = await github.actions.downloadArtifact({
41+
owner: context.repo.owner,
42+
repo: context.repo.repo,
43+
artifact_id: prInfoArtifact.id,
44+
archive_format: 'zip',
45+
});
46+
var fs = require('fs');
47+
fs.writeFileSync('${{github.workspace}}/pr.json.zip', Buffer.from(download.data));
48+
- name: Extract Artifacts
49+
run: unzip -d webapp previewbuild.zip && rm previewbuild.zip && unzip pr.json.zip && rm pr.json.zip
50+
- name: 'Read PR Info'
51+
id: readctx
52+
uses: actions/[email protected]
53+
with:
54+
script: |
55+
var fs = require('fs');
56+
var pr = JSON.parse(fs.readFileSync('${{github.workspace}}/pr.json'));
57+
console.log(`::set-output name=prnumber::${pr.number}`);
58+
- name: Deploy to Netlify
59+
id: netlify
60+
uses: nwtgck/[email protected]
61+
with:
62+
publish-dir: webapp
63+
deploy-message: "Deploy from GitHub Actions"
64+
# These don't work because we're in workflow_run
65+
enable-pull-request-comment: false
66+
enable-commit-comment: false
67+
env:
68+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
69+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
70+
timeout-minutes: 1
71+
- name: Edit PR Description
72+
uses: velas/[email protected]
73+
env:
74+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
with:
76+
pull-request-number: ${{ steps.readctx.outputs.prnumber }}
77+
description-message: |
78+
Preview: ${{ steps.netlify.outputs.deploy-url }}
79+
⚠️ Do you trust the author of this PR? Maybe this build will steal your keys or give you malware. Exercise caution. Use test accounts.
80+

‎.github/workflows/preview_changelog.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Preview Changelog
2+
on:
3+
pull_request_target:
4+
types: [ opened, edited, labeled ]
5+
jobs:
6+
changelog:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Preview Changelog
10+
uses: matrix-org/allchange@main
11+
with:
12+
ghToken: ${{ secrets.GITHUB_TOKEN }}

‎.node-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
14

‎CHANGELOG.md‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,122 @@
1+
Changes in [3.27.0](https://github.com/vector-im/element-desktop/releases/tag/v3.27.0) (2021-07-02)
2+
===================================================================================================
3+
4+
## 🔒 SECURITY FIXES
5+
* Sanitize untrusted variables from message previews before translation
6+
Fixes vector-im/element-web#18314
7+
8+
## ✨ Features
9+
* Fix editing of `<sub>` & `<sup`> & `<u>`
10+
[\#6469](https://github.com/matrix-org/matrix-react-sdk/pull/6469)
11+
Fixes vector-im/element-web#18211
12+
* Zoom images in lightbox to where the cursor points
13+
[\#6418](https://github.com/matrix-org/matrix-react-sdk/pull/6418)
14+
Fixes vector-im/element-web#17870
15+
* Avoid hitting the settings store from TextForEvent
16+
[\#6205](https://github.com/matrix-org/matrix-react-sdk/pull/6205)
17+
Fixes vector-im/element-web#17650
18+
* Initial MSC3083 + MSC3244 support
19+
[\#6212](https://github.com/matrix-org/matrix-react-sdk/pull/6212)
20+
Fixes vector-im/element-web#17686 and vector-im/element-web#17661
21+
* Navigate to the first room with notifications when clicked on space notification dot
22+
[\#5974](https://github.com/matrix-org/matrix-react-sdk/pull/5974)
23+
* Add matrix: to the list of permitted URL schemes
24+
[\#6388](https://github.com/matrix-org/matrix-react-sdk/pull/6388)
25+
* Add "Copy Link" to room context menu
26+
[\#6374](https://github.com/matrix-org/matrix-react-sdk/pull/6374)
27+
* 💭 Message bubble layout
28+
[\#6291](https://github.com/matrix-org/matrix-react-sdk/pull/6291)
29+
Fixes vector-im/element-web#4635, vector-im/element-web#17773 vector-im/element-web#16220 and vector-im/element-web#7687
30+
* Play only one audio file at a time
31+
[\#6417](https://github.com/matrix-org/matrix-react-sdk/pull/6417)
32+
Fixes vector-im/element-web#17439
33+
* Move download button for media to the action bar
34+
[\#6386](https://github.com/matrix-org/matrix-react-sdk/pull/6386)
35+
Fixes vector-im/element-web#17943
36+
* Improved display of one-to-one call history with summary boxes for each call
37+
[\#6121](https://github.com/matrix-org/matrix-react-sdk/pull/6121)
38+
Fixes vector-im/element-web#16409
39+
* Notification settings UI refresh
40+
[\#6352](https://github.com/matrix-org/matrix-react-sdk/pull/6352)
41+
Fixes vector-im/element-web#17782
42+
* Fix EventIndex double handling events and erroring
43+
[\#6385](https://github.com/matrix-org/matrix-react-sdk/pull/6385)
44+
Fixes vector-im/element-web#18008
45+
* Improve reply rendering
46+
[\#3553](https://github.com/matrix-org/matrix-react-sdk/pull/3553)
47+
Fixes vector-im/riot-web#9217, vector-im/riot-web#7633, vector-im/riot-web#7530, vector-im/riot-web#7169, vector-im/riot-web#7151, vector-im/riot-web#6692 vector-im/riot-web#6579 and vector-im/element-web#17440
48+
49+
## 🐛 Bug Fixes
50+
* Fix CreateRoomDialog exploding when making public room outside of a space
51+
[\#6493](https://github.com/matrix-org/matrix-react-sdk/pull/6493)
52+
* Fix regression where registration would soft-crash on captcha
53+
[\#6505](https://github.com/matrix-org/matrix-react-sdk/pull/6505)
54+
Fixes vector-im/element-web#18284
55+
* only send join rule event if we have a join rule to put in it
56+
[\#6517](https://github.com/matrix-org/matrix-react-sdk/pull/6517)
57+
* Improve the new download button's discoverability and interactions.
58+
[\#6510](https://github.com/matrix-org/matrix-react-sdk/pull/6510)
59+
* Fix voice recording UI looking broken while microphone permissions are being requested.
60+
[\#6479](https://github.com/matrix-org/matrix-react-sdk/pull/6479)
61+
Fixes vector-im/element-web#18223
62+
* Match colors of room and user avatars in DMs
63+
[\#6393](https://github.com/matrix-org/matrix-react-sdk/pull/6393)
64+
Fixes vector-im/element-web#2449
65+
* Fix onPaste handler to work with copying files from Finder
66+
[\#5389](https://github.com/matrix-org/matrix-react-sdk/pull/5389)
67+
Fixes vector-im/element-web#15536 and vector-im/element-web#16255
68+
* Fix infinite pagination loop when offline
69+
[\#6478](https://github.com/matrix-org/matrix-react-sdk/pull/6478)
70+
Fixes vector-im/element-web#18242
71+
* Fix blurhash rounded corners missing regression
72+
[\#6467](https://github.com/matrix-org/matrix-react-sdk/pull/6467)
73+
Fixes vector-im/element-web#18110
74+
* Fix position of the space hierarchy spinner
75+
[\#6462](https://github.com/matrix-org/matrix-react-sdk/pull/6462)
76+
Fixes vector-im/element-web#18182
77+
* Fix display of image messages that lack thumbnails
78+
[\#6456](https://github.com/matrix-org/matrix-react-sdk/pull/6456)
79+
Fixes vector-im/element-web#18175
80+
* Fix crash with large audio files.
81+
[\#6436](https://github.com/matrix-org/matrix-react-sdk/pull/6436)
82+
Fixes vector-im/element-web#18149
83+
* Make diff colors in codeblocks more pleasant
84+
[\#6355](https://github.com/matrix-org/matrix-react-sdk/pull/6355)
85+
Fixes vector-im/element-web#17939
86+
* Show the correct audio file duration while loading the file.
87+
[\#6435](https://github.com/matrix-org/matrix-react-sdk/pull/6435)
88+
Fixes vector-im/element-web#18160
89+
* Fix various timeline settings not applying immediately.
90+
[\#6261](https://github.com/matrix-org/matrix-react-sdk/pull/6261)
91+
Fixes vector-im/element-web#17748
92+
* Fix issues with room list duplication
93+
[\#6391](https://github.com/matrix-org/matrix-react-sdk/pull/6391)
94+
Fixes vector-im/element-web#14508
95+
* Fix grecaptcha throwing useless error sometimes
96+
[\#6401](https://github.com/matrix-org/matrix-react-sdk/pull/6401)
97+
Fixes vector-im/element-web#15142
98+
* Update Emojibase and Twemoji and switch to IamCal (Slack-style) shortcodes
99+
[\#6347](https://github.com/matrix-org/matrix-react-sdk/pull/6347)
100+
Fixes vector-im/element-web#13857 and vector-im/element-web#13334
101+
* Respect compound emojis in default avatar initial generation
102+
[\#6397](https://github.com/matrix-org/matrix-react-sdk/pull/6397)
103+
Fixes vector-im/element-web#18040
104+
* Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
105+
[\#6394](https://github.com/matrix-org/matrix-react-sdk/pull/6394)
106+
Fixes vector-im/element-web#18031
107+
* Standardise spelling and casing of homeserver, identity server, and integration manager
108+
[\#6365](https://github.com/matrix-org/matrix-react-sdk/pull/6365)
109+
* Fix widgets not receiving decrypted events when they have permission.
110+
[\#6371](https://github.com/matrix-org/matrix-react-sdk/pull/6371)
111+
Fixes vector-im/element-web#17615
112+
* Prevent client hangs when calculating blurhashes
113+
[\#6366](https://github.com/matrix-org/matrix-react-sdk/pull/6366)
114+
Fixes vector-im/element-web#17945
115+
* Exclude state events from widgets reading room events
116+
[\#6378](https://github.com/matrix-org/matrix-react-sdk/pull/6378)
117+
* Cache feature_spaces\* flags to improve performance
118+
[\#6381](https://github.com/matrix-org/matrix-react-sdk/pull/6381)
119+
1120
Changes in [3.26.0](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v3.26.0) (2021-07-19)
2121
=====================================================================================================
3122
[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v3.26.0-rc.1...v3.26.0)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ All code lands on the `develop` branch - `master` is only used for stable releas
3434
**Please file PRs against `develop`!!**
3535

3636
Please follow the standard Matrix contributor's guide:
37-
https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.rst
37+
https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md
3838

3939
Please follow the Matrix JS/React code style as per:
4040
https://github.com/matrix-org/matrix-react-sdk/blob/master/code_style.md

‎package.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "matrix-react-sdk",
3-
"version": "3.26.0",
3+
"version": "3.27.0",
44
"description": "SDK for matrix.org using React",
55
"author": "matrix.org",
66
"repository": {
@@ -80,13 +80,14 @@
8080
"katex": "^0.12.0",
8181
"linkifyjs": "^2.1.9",
8282
"lodash": "^4.17.20",
83-
"matrix-js-sdk": "12.1.0",
83+
"matrix-js-sdk": "12.2.0",
8484
"matrix-widget-api": "^0.1.0-beta.15",
8585
"minimist": "^1.2.5",
8686
"opus-recorder": "^8.0.3",
8787
"pako": "^2.0.3",
8888
"parse5": "^6.0.1",
8989
"png-chunks-extract": "^1.0.0",
90+
"posthog-js": "1.12.2",
9091
"prop-types": "^15.7.2",
9192
"qrcode": "^1.4.4",
9293
"re-resizable": "^6.9.0",
@@ -123,6 +124,7 @@
123124
"@babel/traverse": "^7.12.12",
124125
"@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
125126
"@peculiar/webcrypto": "^1.1.4",
127+
"@sentry/types": "^6.10.0",
126128
"@sinonjs/fake-timers": "^7.0.2",
127129
"@types/classnames": "^2.2.11",
128130
"@types/commonmark": "^0.27.4",
@@ -147,13 +149,14 @@
147149
"@typescript-eslint/eslint-plugin": "^4.17.0",
148150
"@typescript-eslint/parser": "^4.17.0",
149151
"@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
152+
"allchange": "github:matrix-org/allchange",
150153
"babel-jest": "^26.6.3",
151154
"chokidar": "^3.5.1",
152155
"concurrently": "^5.3.0",
153156
"enzyme": "^3.11.0",
154157
"eslint": "7.18.0",
155158
"eslint-config-google": "^0.14.0",
156-
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#main",
159+
"eslint-plugin-matrix-org": "github:matrix-org/eslint-plugin-matrix-org#2306b3d4da4eba908b256014b979f1d3d43d2945",
157160
"eslint-plugin-react": "^7.22.0",
158161
"eslint-plugin-react-hooks": "^4.2.0",
159162
"glob": "^7.1.6",
@@ -166,6 +169,7 @@
166169
"matrix-web-i18n": "github:matrix-org/matrix-web-i18n",
167170
"react-test-renderer": "^17.0.2",
168171
"rimraf": "^3.0.2",
172+
"rrweb-snapshot": "1.1.7",
169173
"stylelint": "^13.9.0",
170174
"stylelint-config-standard": "^20.0.0",
171175
"stylelint-scss": "^3.18.0",
@@ -189,7 +193,8 @@
189193
"decoderWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
190194
"decoderWorker\\.min\\.wasm": "<rootDir>/__mocks__/empty.js",
191195
"waveWorker\\.min\\.js": "<rootDir>/__mocks__/empty.js",
192-
"workers/(.+)\\.worker\\.ts": "<rootDir>/__mocks__/workerMock.js"
196+
"workers/(.+)\\.worker\\.ts": "<rootDir>/__mocks__/workerMock.js",
197+
"RecorderWorklet": "<rootDir>/__mocks__/empty.js"
193198
},
194199
"transformIgnorePatterns": [
195200
"/node_modules/(?!matrix-js-sdk).+$"

‎release_config.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
subprojects:
2+
matrix-js-sdk:
3+
includeByDefault: false
4+

‎res/css/_components.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
@import "./views/dialogs/_CreateCommunityPrototypeDialog.scss";
7676
@import "./views/dialogs/_CreateGroupDialog.scss";
7777
@import "./views/dialogs/_CreateRoomDialog.scss";
78+
@import "./views/dialogs/_CreateSpaceFromCommunityDialog.scss";
7879
@import "./views/dialogs/_CreateSubspaceDialog.scss";
7980
@import "./views/dialogs/_DeactivateAccountDialog.scss";
8081
@import "./views/dialogs/_DevtoolsDialog.scss";
@@ -240,6 +241,7 @@
240241
@import "./views/settings/_E2eAdvancedPanel.scss";
241242
@import "./views/settings/_EmailAddresses.scss";
242243
@import "./views/settings/_IntegrationManager.scss";
244+
@import "./views/settings/_LayoutSwitcher.scss";
243245
@import "./views/settings/_Notifications.scss";
244246
@import "./views/settings/_PhoneNumbers.scss";
245247
@import "./views/settings/_ProfileSettings.scss";
@@ -266,12 +268,15 @@
266268
@import "./views/spaces/_SpacePublicShare.scss";
267269
@import "./views/terms/_InlineTermsAgreement.scss";
268270
@import "./views/toasts/_AnalyticsToast.scss";
271+
@import "./views/toasts/_IncomingCallToast.scss";
269272
@import "./views/toasts/_NonUrgentEchoFailureToast.scss";
270273
@import "./views/verification/_VerificationShowSas.scss";
274+
@import "./views/voip/CallView/_CallViewButtons.scss";
271275
@import "./views/voip/_CallContainer.scss";
272276
@import "./views/voip/_CallPreview.scss";
273277
@import "./views/voip/_CallView.scss";
274278
@import "./views/voip/_CallViewForRoom.scss";
279+
@import "./views/voip/_CallViewHeader.scss";
275280
@import "./views/voip/_CallViewSidebar.scss";
276281
@import "./views/voip/_DialPad.scss";
277282
@import "./views/voip/_DialPadContextMenu.scss";

0 commit comments

Comments
 (0)