Commit graph

62554 commits

Author SHA1 Message Date
ElementRobot
2abac6fb70
[create-pull-request] automated change (#12387)
Co-authored-by: github-merge-queue <github-merge-queue@users.noreply.github.com>
2024-04-03 06:21:51 +00:00
Richard van der Hoff
cf605b5e6f
Merge pull request #27264 from element-hq/rav/format
`translating.md`: add missing `.`
2024-04-03 06:08:46 +00:00
Timo
d9c7bd16b5
Add EventType.RoomEncryption to the auto approve capabilities of Element Call widgets (#12386)
Signed-off-by: Timo K <toger5@hotmail.de>
2024-04-02 22:18:28 +00:00
Richard van der Hoff
1984ba3b33
translating.md: comma splice
While we're here
2024-04-02 17:46:04 +01:00
RiotRobot
43db5a8731 v1.11.64-rc.0 2024-04-02 16:33:52 +00:00
RiotRobot
7c9f521f65 Upgrade dependency to matrix-react-sdk@3.97.0-rc.0 2024-04-02 16:26:43 +00:00
RiotRobot
961ca278c9 v3.97.0-rc.0 2024-04-02 16:22:41 +00:00
RiotRobot
9848bf8246 Upgrade dependency to matrix-js-sdk@32.0.0-rc.0 2024-04-02 16:17:09 +00:00
RiotRobot
485c12e6cb Upgrade dependency to matrix-js-sdk@32.0.0-rc.0 2024-04-02 16:16:49 +00:00
Richard van der Hoff
b0d8d4bbdb translating.md: add missing . 2024-04-02 16:27:52 +01:00
David Baker
4ae94ae247
Mark all threads as read button (#12378)
* Mark all threads as read button

* Wrap in TooltipProvider and update snapshots

* Remove TooltipProvider wrapper: just add it to the test

* Add some more tests

* Add test for no-room-context handler because sonarcloud

* Add playwright test

* Make assertNoTacIndicator wait

* Use dedicated useMatrixClientContext function

Co-authored-by: Florian Duros <florianduros@element.io>

* Use dedicated useRoomContext function

Co-authored-by: Florian Duros <florianduros@element.io>

* Compound spacing variables

Co-authored-by: Florian Duros <florianduros@element.io>

* Compound spacing variables

Co-authored-by: Florian Duros <florianduros@element.io>

* Imports

* Use createTestClient()

* Add function to utils

* Use mkRoom

---------

Co-authored-by: Florian Duros <florianduros@element.io>
2024-03-28 17:38:21 +00:00
RiotRobot
4cd14b58e1 Reset matrix-js-sdk back to develop branch 2024-03-28 17:06:13 +00:00
RiotRobot
2853a23679 Reset matrix-react-sdk back to develop branch 2024-03-28 17:06:03 +00:00
RiotRobot
bd931ebd74 Merge branch 'master' into develop 2024-03-28 17:05:45 +00:00
RiotRobot
e2b5cea7df v1.11.63 2024-03-28 17:02:41 +00:00
RiotRobot
2fb41f19a7 Upgrade dependency to matrix-react-sdk@3.96.1 2024-03-28 16:56:42 +00:00
RiotRobot
f8e210f1a0 Reset matrix-js-sdk back to develop branch 2024-03-28 16:54:39 +00:00
RiotRobot
b3e96d037c Merge branch 'master' into develop 2024-03-28 16:54:25 +00:00
RiotRobot
3d0e7c657d v3.96.1 2024-03-28 16:53:21 +00:00
RiotRobot
0cd36558c5 Upgrade dependency to matrix-js-sdk@31.6.1 2024-03-28 16:46:25 +00:00
RiotRobot
6f5591b9e2 Upgrade dependency to matrix-js-sdk@31.6.1 2024-03-28 16:46:16 +00:00
David Baker
e314d3b548
Merge pull request #12383 from matrix-org/backport-12382-to-staging
[Backport staging] Revert "Make EC widget theme reactive - Update widget url when the theme changes"
2024-03-28 15:36:44 +00:00
Will Hunt
2603003745 Revert "Make EC widget theme reactive - Update widget url when the theme chan…" (#12382)
This reverts commit c42562ef39.

(cherry picked from commit 75a989e409)
2024-03-28 12:28:11 +00:00
Timo
09f0d11e7f
Fix external guest access url for unencrypted rooms (#12345)
* use unencrypted calls in unencrypted rooms (make external call links compatible with unencrypted embedded calls)

Signed-off-by: Timo K <toger5@hotmail.de>

* use same logic in Call.ts

Signed-off-by: Timo K <toger5@hotmail.de>

* fix tests

Signed-off-by: Timo K <toger5@hotmail.de>

* fix test

Signed-off-by: Timo K <toger5@hotmail.de>

---------

Signed-off-by: Timo K <toger5@hotmail.de>
2024-03-28 12:25:00 +00:00
Will Hunt
75a989e409
Revert "Make EC widget theme reactive - Update widget url when the theme chan…" (#12382)
This reverts commit c42562ef39.
2024-03-28 12:04:14 +00:00
Timo
f23c992296
add is video room or condition (#12374)
Signed-off-by: Timo K <toger5@hotmail.de>
2024-03-27 16:10:18 +00:00
Timo
ab7f5dca74
change order between untagged or conference (#12375)
Signed-off-by: Timo K <toger5@hotmail.de>
2024-03-27 15:03:21 +00:00
RiotRobot
f835c678bf Reset matrix-js-sdk back to develop branch 2024-03-26 17:02:44 +00:00
RiotRobot
44a2666183 Reset matrix-react-sdk back to develop branch 2024-03-26 17:02:34 +00:00
RiotRobot
1b81c276fc Merge branch 'master' into develop 2024-03-26 17:02:15 +00:00
RiotRobot
309bb7eb47 v1.11.62 2024-03-26 16:59:26 +00:00
Michael Telatynski
de154ffba9
Fix space topic jumping on hover/focus (#12377)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-03-26 16:39:31 +00:00
RiotRobot
44fff3b45c Upgrade dependency to matrix-react-sdk@3.96.0 2024-03-26 16:38:44 +00:00
RiotRobot
faf7b04899 v3.96.0 2024-03-26 16:35:13 +00:00
RiotRobot
7498afcb33 Upgrade dependency to matrix-js-sdk@31.6.0 2024-03-26 16:27:37 +00:00
RiotRobot
69c23b5ae7 Upgrade dependency to matrix-js-sdk@31.6.0 2024-03-26 16:27:24 +00:00
Michael Telatynski
ddadbf64fe
Allow popping out a Jitsi widget to respect Desktop web_base_url config (#12376)
* Allow popping out a Jitsi widget to respect Desktop `web_base_url` config

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Update tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2024-03-26 16:27:11 +00:00
RiotRobot
21190045c1 Reset matrix-js-sdk back to develop branch 2024-03-26 16:36:44 +00:00
RiotRobot
abd4caadb3 Resetting package fields for development 2024-03-26 16:36:29 +00:00
RiotRobot
c699c6bead Merge branch 'master' into develop 2024-03-26 16:36:28 +00:00
renovate[bot]
2e7668752f
Update dependency axe-core to v4.9.0 (#12373)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-26 11:54:51 +00:00
renovate[bot]
7697c27fa3
Update dependency express to v4.19.2 [SECURITY] (#12372)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-25 23:23:24 +00:00
Michael Telatynski
9091c074a8
Merge pull request #27239 from element-hq/renovate/npm-katex-vulnerability
Update dependency katex to v0.16.10 [SECURITY]
2024-03-25 22:55:05 +00:00
renovate[bot]
53f837d5e0
Update dependency katex to v0.16.10 [SECURITY] (#12371)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-25 22:38:52 +00:00
renovate[bot]
50a62f6105
Update dependency katex to v0.16.10 [SECURITY] 2024-03-25 22:30:23 +00:00
Richard van der Hoff
4702da8038
Convert DecryptionFailureTracker-test to typescript (#12368)
* Remove reference to private method

`MatrixEvent.setClearData` is private. Use the test helper instead.

* Remove redundant params to `expect.toBe`

* Convert to typescript
2024-03-25 19:57:29 +00:00
Timo
a24aa7e0f7
Video call meta space (#12297)
* add video room meta space button

Signed-off-by: Timo K <toger5@hotmail.de>

* Add videoRoomsSpace to meta space configuration

Signed-off-by: Timo K <toger5@hotmail.de>

* temp

Signed-off-by: Timo K <toger5@hotmail.de>

* dont show ppl section in video room space

Signed-off-by: Timo K <toger5@hotmail.de>

* add i18n strings

Signed-off-by: Timo K <toger5@hotmail.de>

* revert waitForIframe=false (this is part of another PR)

Signed-off-by: Timo K <toger5@hotmail.de>

* fix missing mock room method

Signed-off-by: Timo K <toger5@hotmail.de>

* test snapshot: add video room meta space

Signed-off-by: Timo K <toger5@hotmail.de>

* rename Conferences -> Conference

Signed-off-by: Timo K <toger5@hotmail.de>

* space panel snap test

Signed-off-by: Timo K <toger5@hotmail.de>

* update snapshot

Signed-off-by: Timo K <toger5@hotmail.de>

* fix test

Signed-off-by: Timo K <toger5@hotmail.de>

* add video room space tests

Signed-off-by: Timo K <toger5@hotmail.de>

* better logic

Signed-off-by: Timo K <toger5@hotmail.de>

* Add Video MetaSpace Test

Signed-off-by: Timo K <toger5@hotmail.de>

* make room join rule update reactive for the video room meta space

Signed-off-by: Timo K <toger5@hotmail.de>

* temp

Signed-off-by: Timo K <toger5@hotmail.de>

* fix description for meta space video room settings

Signed-off-by: Timo K <toger5@hotmail.de>

* tests

Signed-off-by: Timo K <toger5@hotmail.de>

* update snapshot

Signed-off-by: Timo K <toger5@hotmail.de>

* review

Signed-off-by: Timo K <toger5@hotmail.de>

* i18n

Signed-off-by: Timo K <toger5@hotmail.de>

* fix tests

Signed-off-by: Timo K <toger5@hotmail.de>

* put video meta space behind "feature_video_rooms" labs flag

Signed-off-by: Timo K <toger5@hotmail.de>

* review

Signed-off-by: Timo K <toger5@hotmail.de>

* update space store on RoomCreate state event

Signed-off-by: Timo K <toger5@hotmail.de>

* test for updating video room space on room type update

Signed-off-by: Timo K <toger5@hotmail.de>

* remove comment

Signed-off-by: Timo K <toger5@hotmail.de>

* also make knock join rule rooms part of the conference section

Signed-off-by: Timo K <toger5@hotmail.de>

---------

Signed-off-by: Timo K <toger5@hotmail.de>
2024-03-25 18:35:31 +00:00
ElementRobot
cd314477ce
[Backport staging] Remove the glass border from modal spinners (#12369)
Co-authored-by: Robin <robin@robin.town>
2024-03-25 18:15:45 +00:00
Robin
10526c92bb
Remove the glass border from modal spinners (#12367)
It was not intentional, as these spinners are not a real dialog.
2024-03-25 17:36:00 +00:00
Richard van der Hoff
157ca48dff
Remove references to matrix-js-sdk/src/crypto/verification (#12365)
All this stuff is deprecated and has better alternatives now.
2024-03-25 17:44:45 +00:00