PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
46920 commits 1 branch 0 tags 338 MiB
Commit graph

46920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kerry
0d367a7c7e
Fix: sync intentional mentions push rules with legacy rules (#11667) 
* fix monitorSyncedPushRules when primary rule is disabled

* sync intentional mentions rules

* remove debug log
 2023-09-27 00:03:38 +00:00
Michael Telatynski
4d0d024e86
Migrate more strings to translation keys (#11671) 2023-09-26 18:35:55 +01:00
Andy Balaam
63c391a3f1
Merge branch 'develop' into andybalaam/fix-receipt-flakes 2023-09-26 15:40:41 +01:00
RiotRobot
13aed62a91 Merge remote-tracking branch 'origin/develop' into develop 2023-09-26 13:09:30 +01:00
RiotRobot
259bef0fce Reset matrix-js-sdk back to develop branch 2023-09-26 13:05:19 +01:00
Michael Telatynski
5252361d1e
Migrate more strings to translation keys (#11669) 2023-09-26 13:04:17 +01:00
RiotRobot
0c6e56ca91 Merge branch 'master' into develop 2023-09-26 13:00:53 +01:00
RiotRobot
81c62e51c4 v3.81.0 2023-09-26 12:58:35 +01:00
RiotRobot
3a9eab8d85 Prepare changelog for v3.81.0 2023-09-26 12:58:31 +01:00
RiotRobot
b3778f5beb Upgrade matrix-js-sdk to 28.2.0 2023-09-26 12:36:02 +01:00
Andy Balaam
9131d87e0d
Merge pull request #11670 from matrix-org/backport-11634-to-staging 
Backport #11634 to staging
 2023-09-26 09:55:40 +01:00
Andy Balaam
50110ba253 Merge pull request #11634 from matrix-org/germain-gg/facepile-offset 
Revert "Fix regression around FacePile with overflow (#11527)"

(cherry picked from commit 875fcb1a32)
 2023-09-26 09:53:27 +01:00
Andy Balaam
875fcb1a32
Merge pull request #11634 from matrix-org/germain-gg/facepile-offset 
Revert "Fix regression around FacePile with overflow (#11527)"
 2023-09-26 09:49:37 +01:00
Michael Telatynski
24b10a87c0
Switch to sorry-cypress (#11668) 2023-09-26 07:17:14 +01:00
Michael Telatynski
54c88c57ed
Migrate more strings to translation keys (#11665) 2023-09-25 18:12:41 +01:00
Andy Balaam
8565637213
Merge branch 'develop' into andybalaam/fix-receipt-flakes 2023-09-25 17:40:08 +01:00
Andy Balaam
de250df520
Merge pull request #11654 from matrix-org/andybalaam/fix-high-level-flakes 
Fix flake in high-level tests by not using markAsRead
 2023-09-25 12:53:56 +01:00
Andy Balaam
5901920635
Merge pull request #11652 from matrix-org/andybalaam/fix-flake-in-editing-test 
Fix flaky tests around editing messages
 2023-09-25 12:53:06 +01:00
Andy Balaam
d37790c460
Merge branch 'develop' into andybalaam/fix-receipt-flakes 2023-09-25 12:41:05 +01:00
Michael Telatynski
0f59298f30
Consolidate conjugation i18n strings (#11660) 2023-09-25 12:18:15 +01:00
Andy Balaam
4804adcef6 Fix flaky receipt and redaction tests by pausing between message sends 2023-09-25 12:06:22 +01:00
Germain
d99618263a
Merge branch 'develop' into germain-gg/facepile-offset 2023-09-25 11:33:28 +01:00
Andy Balaam
4097844fed Fix flake in high-level tests by not using markAsRead 2023-09-25 09:55:37 +01:00
Andy Balaam
25a462ad8e Fix lint error 2023-09-25 09:51:44 +01:00
Andy Balaam
10eac43e24 Fix flaky test that raced because we were in the room while the count changed 2023-09-25 09:51:44 +01:00
Andy Balaam
14a622b1e8 Fix flaky test that assumes edits count as messages 2023-09-25 09:51:44 +01:00
Manan Sadana
f841757906
Message layout will update according to the selected style (#10170) 
* message_layout_preview_update

* using_settings_watcher

* Update FontScalingPanel.tsx

* Marked the class property as optional

* Optional variable was still giving error.

* Fix: typescript fail for layoutWatcherRef

* Fix: using value from SettingStore

* Update src/components/views/settings/FontScalingPanel.tsx

Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix: Prettier formatting added for ESList checks

---------

Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
 2023-09-22 16:12:48 +00:00
Germain
7378b7fdd1 Fix more button sizing in face pile 2023-09-22 17:07:43 +01:00
Michael Telatynski
f4d056fd38
Migrate more strings to translation keys (#11651) 2023-09-22 16:39:40 +01:00
Germain
477d79cb92 Fix FacePile 'more' rendering 2023-09-22 16:31:52 +01:00
Manan Sadana
560449676b
Fix: Alignment Fixed (#11648) 
* Fix: Alignment Fixed

* Fix: Pinned Widget also aligned

---------

Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
 2023-09-22 12:57:07 +00:00
Andy Balaam
1c2d604abe
Split the read-receipt tests into logical units (#11649) 
* Split the read-receipt tests into logical units

* Move read-receipt docs into a readme file

* Provide doc comments for exported functions in read-receipt tests
 2023-09-22 11:57:40 +00:00
Richard van der Hoff
6fd46f3bc8
CreateSecretStorageDialog: stop using deprecated APIs (#11635) 
* Add some tests for `CreateSecretStorageDialog`

* CreateSecretStorageDialog: stop using deprecated APIs
 2023-09-22 11:03:05 +00:00
Richard van der Hoff
11f258e62e
SecureBackupPanel: stop using deprecated APIs, and other fixes (#11644) 
* SecureBackupPanel: replace `isKeyBackupTrusted`

`MatrixClient.isKeyBackupTrusted` -> `CryptoApi.isKeyBackupTrusted`

* SecureBackupPanel: replace `getKeyBackupEnabled`

`MatrixClient.getKeyBackupEnabled` -> `CryptoApi.getActiveSessionBackupVersion`

* SecureBackupPanel: replace `deleteKeyBackupVersion`

`MatrixClient.deleteKeyBackupVersion` -> `CryptoApi.deleteKeyBackupVersion`

* Do not show session count if we have no info

We shouldn't say "zero sessions to back up" if we don't know.

* SecureBackupPanel: distinguish between server and active backup
 2023-09-22 10:57:11 +00:00
Andy Balaam
4f7d9da140
Merge pull request #11653 from matrix-org/andybalaam/revert-11615-setup-chrome 
Revert "Update browser-actions/setup-chrome digest to 905ab04"
 2023-09-22 11:54:22 +01:00
Andy Balaam
29280607df Revert "Update browser-actions/setup-chrome digest to 905ab04" 
This reverts commit ea38f6366e0181a73567c9e935eb9809adf21a6d which is
from PR https://github.com/matrix-org/matrix-react-sdk/pull/11615
 2023-09-22 11:52:10 +01:00
renovate[bot]
9418dc60f4
Update browser-actions/setup-chrome digest to 905ab04 (#11615) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-22 08:38:31 +00:00
Germain
899cc53a3e upgrade snapshots 2023-09-22 09:35:36 +01:00
Germain
224f34c211
Merge branch 'develop' into germain-gg/facepile-offset 2023-09-22 08:46:37 +01:00
renovate[bot]
c297222d04
Update tj-actions/changed-files digest to 4196030 (#11617) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-22 00:19:18 +00:00
renovate[bot]
b379f8314f
Update jest (#11623) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-22 00:18:31 +00:00
renovate[bot]
30a659f192
Update SimenB/github-actions-cpu-cores action to v2 (#11627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-22 00:15:45 +00:00
Manan Sadana
6504fff25c
Fix: onFinished added which closes the menu (#11647) 
Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
 2023-09-21 22:16:47 +00:00
Dominik Henneke
60bed46014
Add an action to upload media files according to MSC4039 (#11311) 
Signed-off-by: Dominik Henneke <dominik.henneke@nordeck.net>
 2023-09-21 19:03:22 +00:00
Richard van der Hoff
902aea8bc4
LogoutDialog: Remove usage of deprecated keybackup API (#11645) 
* tests for LogoutDialog

* LogoutDialog: Remove usage of deprecated keybackup API
 2023-09-21 18:34:10 +00:00
Michael Telatynski
faa7b1521f
Migrate more strings to translation keys (#11642) 2023-09-21 18:16:04 +01:00
Richard van der Hoff
c879882558
Don't start key backups when opening settings (#11640) 
* SecureBackupPanel: stop calling `checkKeyBackup`

`checkKeyBackup` will start key backups if they aren't already running. In my
not-so-humble opinion, the mere act of opening a settings panel shouldn't change anything.

* fix SecurityUserSettingsTab test
 2023-09-21 12:19:38 +00:00
Germain
c6fec9b95b
Fix add to space avatar text centering (#11643) 2023-09-21 11:56:05 +00:00
Germain
20fa3f2a14
fix avatar styling in lightbox (#11641) 2023-09-21 11:42:23 +00:00
Germain
54ec7e696d
Render space pills with square corners to match new avatar (#11632) 2023-09-21 11:04:57 +00:00