mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-20 23:32:04 +03:00
Code Issues Projects Releases Packages Wiki Activity
62799 commits 219 branches 562 tags 474 MiB
Commit graph

5 commits

Author SHA1 Message Date
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
Florian Duros
5cdcf44b6f
Second batch: Replace MatrixClient.isRoomEncrypted by MatrixClient.CryptoApi.isEncryptionEnabledInRoom (#28466) 
* Add `asyncFilter`

* Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `MemberListStore.tsx`

* Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `EventIndex.tsx`

* Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `SendMessageComposer.tsx`

* Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `ScalarMessaging.ts`

* Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `RolesRoomSettingsTab.tsx`

* Add reject doc to `asyncFilter`

* Reverse `MemberListStore.loadMembers` condition

* Remove async for `ScalarMessaging.ts`

* Display permission section only after `isEncrypted` is computed

* Display composer only after `isEncrypted` is computed

* Revert "Display composer only after `isEncrypted` is computed"

This reverts commit 4d4e037391.

* Revert "Replace `MatrixClient.isRoomEncrypted` by `MatrixClient.CryptoApi.isEncryptionEnabledInRoom` in `SendMessageComposer.tsx`"

This reverts commit 6bf06da02c.
 2024-11-20 14:27:09 +00:00
Michael Telatynski
044eaf7eb5
Update calls to addEventToTimeline and addLiveEvents for new signature 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2024-11-06 14:55:21 +00:00
Michael Telatynski
f0ee7f7905
Merge matrix-react-sdk into element-web 
Merge remote-tracking branch 'repomerge/t3chguy/repomerge' into t3chguy/repo-merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2024-10-15 15:32:09 +01:00
Michael Telatynski
b084ff2313
Prepare for repo merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2024-10-15 11:35:21 +01:00
Renamed from test/stores/MemberListStore-test.ts (Browse further)