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

47046 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Balaam
8d289544b3
Merge pull request #11692 from matrix-org/andybalaam/downgrade-cypress-to-12 
Downgrade Cypress to v12.
 2023-10-02 10:54:07 +01:00
Andy Balaam
97d871cba9
Merge pull request #11674 from manancodes/manancodes/Edited_message_ux_fix 
Fix: Edited message remove button is hard to reach.
 2023-10-02 10:53:19 +01:00
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
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
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
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
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