Michael Telatynski 3dbcb5efa3

Merge branch 'develop' of https://github.com/vector-im/element-web into dbkr/stateafter ...

# Conflicts:
#	test/unit-tests/components/structures/RoomView-test.tsx
#	test/unit-tests/components/structures/TimelinePanel-test.tsx

2024-11-27 10:47:35 +00:00

..

audio.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

beacon.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

call.ts

Update calls to addEventToTimeline and addLiveEvents for new signature

2024-11-06 14:55:21 +00:00

client.ts

Use CryptoApi.getKeyBackupInfo instead of deprecated MatrixClient.getKeyBackupVersion (#28450)

2024-11-25 09:30:42 +00:00

composer.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

console.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

date.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

events.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

index.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

jest-matrix-react.tsx

Migrate to React 18 createRoot API (#28256)

2024-11-20 13:29:23 +00:00

location.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

oidc.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

platform.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

poll.ts

Avoid use of transitive deps

2024-11-05 18:35:53 +00:00

predictableRandom.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

pushRules.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

relations.ts

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00

room.ts

Replace MatrixClient.isRoomEncrypted by MatrixClient.CryptoApi.isEncryptionEnabledInRoom in RoomView (#28278)

2024-11-26 21:34:32 +00:00

test-utils.ts

Replace MatrixClient.isRoomEncrypted by MatrixClient.CryptoApi.isEncryptionEnabledInRoom in RoomView (#28278)

2024-11-26 21:34:32 +00:00

threads.ts

Update calls to addEventToTimeline and addLiveEvents for new signature

2024-11-06 14:55:21 +00:00

utilities.ts

Migrate to React 18 createRoot API (#28256)

2024-11-20 13:29:23 +00:00

wrappers.tsx

Merge matrix-react-sdk into element-web

2024-10-15 15:32:09 +01:00