Commit Graph

63128 Commits

Author SHA1 Message Date
Andy Balaam
ea6cc0fde4 Downgrade Cypress to v12.
(On the understanding that v12 will continue to allow us to use
the sorry-cypress service for balancing test parallelisation.)

Reverts "Update dependency cypress to v13 (#11570)"
This reverts commit 35a6595080.
2023-10-02 10:11:31 +01:00
Johannes Marbach
2984c3bdfb Remove . since path is already relative 2023-09-30 21:50:52 +02:00
Johannes Marbach
9b8d6e7607 Set context manually in NormalModuleReplacementPlugin to fix relative import paths 2023-09-29 22:02:38 +02:00
RiotRobot
260e0fc8ac Reset matrix-react-sdk back to develop branch 2023-09-29 11:31:48 +01:00
RiotRobot
6c305121f4 Reset matrix-js-sdk back to develop branch 2023-09-29 11:31:22 +01:00
RiotRobot
b7cca93ceb Merge branch 'master' into develop 2023-09-29 11:30:11 +01:00
RiotRobot
ae98e3a593 v1.11.45 v1.11.45 2023-09-29 11:24:44 +01:00
RiotRobot
e4ecf42a8c Prepare changelog for v1.11.45 2023-09-29 11:24:44 +01:00
RiotRobot
c47c598c0b Upgrade matrix-react-sdk to 3.81.1 2023-09-29 11:20:23 +01:00
RiotRobot
695049729c Reset matrix-js-sdk back to develop branch 2023-09-29 11:14:46 +01:00
RiotRobot
be315a4186 Resetting package fields for development 2023-09-29 11:14:24 +01:00
RiotRobot
5cb09c683a Merge branch 'master' into develop 2023-09-29 11:14:19 +01:00
RiotRobot
ee8e9a1c9d v3.81.1 2023-09-29 11:14:03 +01:00
RiotRobot
837253b037 Prepare changelog for v3.81.1 2023-09-29 11:14:01 +01:00
Johannes Marbach
c844d80217 Merge branch 'johannes/webpack-cli-4.10.0' into johannes/webpack-5 2023-09-29 11:00:03 +02:00
Johannes Marbach
bb04097912 Merge branch 'develop' into johannes/webpack-cli-4.10.0 2023-09-29 10:56:13 +02:00
Andy Balaam
42e1805cbb Merge pull request #11684 from matrix-org/backport-11673-to-staging
[Backport staging] Fix Emoji font on Safari 17
2023-09-29 09:49:39 +01:00
Michael Telatynski
a3fc8c69a0 Update FontManager.ts (#11673)
(cherry picked from commit 39c4e0c41f)
2023-09-29 08:48:21 +00:00
Andy Balaam
506f286a3e Tests for paging up to find old messages (#11650)
* Use longer numbers for many() messages to avoid substring clashes

* Tests for paging up
2023-09-29 08:26:47 +00:00
Michael Telatynski
6af4335db1 Migrate more strings to translation keys (#11680) 2023-09-29 08:49:26 +01:00
Andy Balaam
8014cebb20 Merge pull request #11661 from matrix-org/andybalaam/fix-receipt-flakes
Fix flaky receipt and redaction tests by pausing between message sends
2023-09-28 14:57:22 +01:00
Andy Balaam
d7d0f54e9b Merge branch 'develop' into andybalaam/fix-receipt-flakes 2023-09-28 14:23:45 +01:00
R Midhun Suresh
47677c8415 Fix broken tsc from localazy changes (#26255) 2023-09-28 14:07:29 +01:00
Andy Balaam
58afa900d5 Target specific thread name to unflake redaction tests (#11662)
* Disambiguate thread root names to unflake redaction tests

* Revert "Disambiguate thread root names to unflake redaction tests"

This reverts commit f21ffa5554e7d49322acc8f8c1c1ef4063b9efdd.

* Find thread root by text, not contains
2023-09-28 12:44:29 +00:00
Michael Telatynski
e0f4b26512 Remove focus-visible polyfill (#11677)
* Remove focus-visible polyfill

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

* Update snapshots

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

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-28 11:52:26 +00:00
Manan Sadana
8e4de798a5 Fix: Theme selector radio button not aligned in center with the text (#11676)
* Theme selector radio button aligned in center with the text

* fixed alignment, align-items at correct position now

---------

Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
2023-09-28 10:26:01 +00:00
Hugh Nimmo-Smith
8442f1cf10 Use .well-known to discover a default rendezvous server for use with Sign in with QR (#11655) 2023-09-28 09:37:44 +00:00
R Midhun Suresh
0518af70ac Localazy: Convert more strings (#11675) 2023-09-28 08:21:30 +01:00
Kerry
ef5a93b702 OIDC: retrieve refreshToken from storage (#11250)
* test persistCredentials without a pickle key

* test setLoggedIn with pickle key

* lint

* type error

* extract token persisting code into function, persist refresh token

* store has_refresh_token too

* pass refreshToken from oidcAuthGrant into credentials

* rest restore session with pickle key

* retreive stored refresh token and add to credentials

* extract token decryption into function

* remove TODO

* comments

* prettier

* comment pedantry

* fix code smell - nullish coalesce instead of ||

* more comments
2023-09-28 04:38:31 +00:00
Michael Telatynski
fa377cbade Migrate more strings to translation keys (#11672) 2023-09-27 17:15:22 +01:00
Manan Sadana
2e0eb63fe2 Room avatar alignment fixed 2023-09-27 21:19:07 +05:30
Manan Sadana
c16aba5c3a Merge branch 'develop' into manancodes/Edited_message_ux_fix 2023-09-27 17:03:00 +05:30
Manan Sadana
99a2d024ec Changed hover ui of edited messages for a better experience 2023-09-27 16:12:49 +05:30
Michael Telatynski
39c4e0c41f Update FontManager.ts (#11673) 2023-09-27 10:34:07 +00:00
Manan Sadana
2cfdf2ced9 Fix: Unread notification dot aligned (#11658)
Co-authored-by: Manan Sadana <manan.sadana@cnhteam.onmicrosoft.com>
2023-09-27 06:36:31 +00:00
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
1707ecd8b6 Reset matrix-react-sdk back to develop branch 2023-09-26 14:10:03 +01:00
RiotRobot
b4cc35b2da Reset matrix-js-sdk back to develop branch 2023-09-26 14:09:47 +01:00
RiotRobot
8492c22b55 Merge branch 'master' into develop 2023-09-26 14:09:32 +01:00
RiotRobot
e0dc62f7b1 v1.11.44 v1.11.44 2023-09-26 14:05:16 +01:00
RiotRobot
d6cf0c7be2 Prepare changelog for v1.11.44 2023-09-26 14:05:16 +01:00
RiotRobot
09291a9cf5 Upgrade matrix-react-sdk to 3.81.0 2023-09-26 13:32:57 +01:00
RiotRobot
9ac837068f Upgrade matrix-js-sdk to 28.2.0 2023-09-26 13:26:28 +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