Commit Graph

62952 Commits (f157c90ba99ed065dd5cde914b976f1561ef5a54)

Author SHA1 Message Date
Johannes Marbach 3fbf38f17d
Escape placeholder before injecting it into the style (#11607)
* Escape placeholder before injecting it into the style

In particular this adds escaping for backslashes which was previously missing.

* Update snapshots

* Add tests
2023-09-19 05:58:53 +00:00
Michael Telatynski e9c9377e78
Migrate more strings to translation keys (#11608) 2023-09-19 07:17:31 +01:00
Kerry 46072caa3a
OIDC: persist refresh token (#11249)
* 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

* comments

* prettier

* Update src/Lifecycle.ts

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

* comments

---------

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
2023-09-19 00:06:19 +00:00
Richard van der Hoff 50ee43c4a5
Enable cypress tests for shields with rust crypto (#11589)
* Use new crypto-api for cross user verification

* update verification flow with new APIs

* Replace some calls to `checkUserTrust`

A start on https://github.com/vector-im/crypto-internal/issues/147

* Enable cypress tests

* update tests

* Delegate decisions on event shields to the js-sdk

* rerender after editing events

This is required because a transition from "valid event" to "unencrypted event"
no longer triggers a state change, so the component does not render
itself. Previously, this would be a transition from `verified:
E2EState.Normal` to `verified: null`.

* Update tests

* prettier

* Test coverage

* Enable cypress tests for shields with rust crypto

---------

Co-authored-by: Florian Duros <florianduros@element.io>
2023-09-18 21:34:24 +00:00
Richard van der Hoff cf2340bcad
Replace event verification logic with new code in js-sdk (#11528)
* Use new crypto-api for cross user verification

* update verification flow with new APIs

* Replace some calls to `checkUserTrust`

A start on https://github.com/vector-im/crypto-internal/issues/147

* Enable cypress tests

* update tests

* Delegate decisions on event shields to the js-sdk

* rerender after editing events

This is required because a transition from "valid event" to "unencrypted event"
no longer triggers a state change, so the component does not render
itself. Previously, this would be a transition from `verified:
E2EState.Normal` to `verified: null`.

* Update tests

* prettier

* Test coverage

---------

Co-authored-by: Florian Duros <florianduros@element.io>
2023-09-18 17:12:18 +00:00
Florian Duros 579b0dd10a
ElementR: Cross user verification (#11364)
The hard work has been done in previous PRs in the js-sdk, so this is now just a case of updating a few call sites to use the new APIs.
2023-09-18 17:34:00 +01:00
Andy Balaam e887c6d71f
Cypress tests for redactions in threads (#11594)
* Tests for redacting messages not increasing unreads

* Comment explaining tips for writing high level rr tests

* Test for restarting with a receipt pointing at a redacted thread root

* Two failing tests for counting correctly when a thread message was redacted

* Test for reading a thread containing an earlier redaction

* Failing tests for redacted messages in threads
2023-09-18 15:01:05 +00:00
Johannes Marbach 29bd206f85
Merge pull request #26186 from vector-im/johannes/undefault-new-room-header 2023-09-18 12:09:22 +02:00
Andy Balaam 5a3c32e26c
More assertions about threads being read (#11505) 2023-09-18 09:09:47 +00:00
Johannes Marbach 5d04a2adc3 Turn off new room header by default 2023-09-18 09:47:08 +02:00
Johannes Marbach df6b106b26
Merge pull request #26089 from vector-im/germain-gg/room-ui-develop 2023-09-15 15:22:32 +02:00
Andy Balaam 0b50e02790
Merge pull request #11508 from matrix-org/germain-gg/notifications-labs
Move notifications bell back in labs
2023-09-15 14:19:47 +01:00
RMidhunSuresh d5d4b528d5
Remove unused import 2023-09-15 16:45:51 +05:30
RiotRobot e456ca1b20 Reset matrix-react-sdk back to develop branch 2023-09-15 12:13:45 +01:00
RiotRobot 744ff5ca9a Reset matrix-js-sdk back to develop branch 2023-09-15 12:13:30 +01:00
RiotRobot 0c0f4cfdbd Merge branch 'master' into develop 2023-09-15 12:13:08 +01:00
RiotRobot 8436c91279 v1.11.43 2023-09-15 12:09:01 +01:00
RiotRobot c52c62ebc0 Prepare changelog for v1.11.43 2023-09-15 12:09:00 +01:00
RMidhunSuresh 2f69013f6d
Merge branch 'develop' into germain-gg/notifications-labs 2023-09-15 16:28:59 +05:30
Andy Balaam dce42d32e7
Merge pull request #11495 from matrix-org/germain-gg/fix-right-panel-member
Move ViewUser action callback to RoomView
2023-09-15 11:37:26 +01:00
Johannes Marbach 1e303652cc
Merge branch 'develop' into germain-gg/room-ui-develop 2023-09-15 09:14:50 +02:00
Michael Telatynski 491b43ef09
Migrate more strings to translation keys (#11606) 2023-09-14 18:47:29 +01:00
Johannes Marbach 3608d52c4a
Default intentional mentions (#11602)
* Default intentional mentions

* wait for autocomplete to settle before submitting edit

* lint

* Update strings

---------

Co-authored-by: Kerry Archibald <kerrya@element.io>
2023-09-14 11:36:15 +00:00
RMidhunSuresh 610f9396bb
Fix broken tests 2023-09-14 16:55:14 +05:30
Michael Telatynski 1d0c7046c0
i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-14 11:39:17 +01:00
Michael Telatynski e301fe474b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/cr/72
# Conflicts:
#	test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap
2023-09-14 11:33:22 +01:00
RMidhunSuresh 1ba419fe11
Merge branch 'develop' into germain-gg/notifications-labs 2023-09-14 12:14:08 +05:30
Michael Telatynski 237038aa56
Fix RoomView::onSearchClick toggle behaviour (#11605)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2023-09-13 19:23:33 +00:00
RiotRobot 361941e5d4 Reset matrix-js-sdk back to develop branch 2023-09-13 13:00:58 +01:00
RiotRobot dc6c7022fc Merge branch 'master' into develop 2023-09-13 12:59:06 +01:00
RiotRobot 60585cce94 v1.11.42 2023-09-13 12:47:26 +01:00
RiotRobot 3a6a603778 Prepare changelog for v1.11.42 2023-09-13 12:47:25 +01:00
RiotRobot 28a8c1cd1e Upgrade matrix-react-sdk to 3.80.1 2023-09-13 12:44:38 +01:00
RiotRobot da1daa1b18 Reset matrix-js-sdk back to develop branch 2023-09-13 12:02:40 +01:00
RiotRobot 2d5e486db6 Merge branch 'master' into develop 2023-09-13 12:01:35 +01:00
RiotRobot 0a7b3718a7 v3.80.1 2023-09-13 12:01:18 +01:00
RiotRobot 4bacfa41f5 Prepare changelog for v3.80.1 2023-09-13 12:01:15 +01:00
Michael Telatynski 4deb864322
Update Compound to fix Firefox-specific avatar regression (#11604) 2023-09-13 11:32:47 +01:00
RMidhunSuresh f7fa9facd7
Let code in RoomView handle all cases 2023-09-13 14:58:01 +05:30
Michael Telatynski 8c35abbb04
Migrate more strings to translation keys (#11601) 2023-09-13 09:30:56 +01:00
Till 564d4eda7c
Change binary to use (#11486) 2023-09-12 19:00:34 +00:00
ElementRobot b9be840291 Reset matrix-react-sdk back to develop branch 2023-09-12 17:17:24 +01:00
ElementRobot 81b6320595 Merge branch 'master' into develop
# Conflicts:
#	package.json
#	yarn.lock
2023-09-12 17:16:37 +01:00
ElementRobot 189fa14c29 v1.11.41 2023-09-12 17:12:42 +01:00
ElementRobot ee254efcf3 Prepare changelog for v1.11.41 2023-09-12 17:12:42 +01:00
ElementRobot c9e5df4aa0 Upgrade matrix-js-sdk to 28.1.0 2023-09-12 17:06:29 +01:00
ElementRobot eec8b37c49 Upgrade matrix-react-sdk to 3.80.0 2023-09-12 17:06:18 +01:00
ElementRobot 6f8f97ba35 Reset matrix-js-sdk back to develop branch 2023-09-12 17:04:51 +01:00
ElementRobot da9321011f Resetting package fields for development 2023-09-12 17:00:10 +01:00
ElementRobot 6a4915ac98 Merge branch 'master' into develop
# Conflicts:
#	res/css/views/avatars/_BaseAvatar.pcss
2023-09-12 16:59:39 +01:00