Commit graph

1447 commits

Author SHA1 Message Date
Michael Telatynski
493cd01ed3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
 Conflicts:
	res/css/views/dialogs/_AddExistingToSpaceDialog.scss
	src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
6f37e8b223 Use getChildren instead of getSpaceSummary as MSC2946 has moved on 2021-07-29 12:16:59 +01:00
Michael Telatynski
ac800ad94d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 2021-07-28 19:24:26 +01:00
Travis Ralston
b8781b7552
Merge pull request #6455 from matrix-org/travis/widget-customisation
Add customisation point for declaring widget variables
2021-07-28 07:15:45 -06:00
Michael Telatynski
776435f620 Switch all-rooms toggle for spaces to non-feature settings key 2021-07-27 21:17:24 +01:00
Michael Telatynski
0a9d3302ba Fix home vs all rooms requiring app reload and change default to home
Consolidate ALL_ROOMS and HOME_SPACE storage
Fix behaviour when recalled room is no longer part of the target space
Improve tests
2021-07-27 21:11:47 +01:00
Michael Telatynski
ec173e74e6 Test & Refactor SpaceWatcher to allow all rooms/home change without needing reload 2021-07-27 20:15:40 +01:00
Michael Telatynski
8c073a6439 RoomListStore removeFilter skip triggering update if nothing changed 2021-07-27 17:53:03 +01:00
Michael Telatynski
12461a79e1 Move SettingsStore setting_updated dispatch to action enum 2021-07-27 17:19:45 +01:00
Michael Telatynski
39d9ec3ced Merge branch 'develop' into t3chguy/fix/18071 2021-07-27 15:02:59 +01:00
Michael Telatynski
755007cbee Conclude labs flags and write more tests 2021-07-27 14:39:14 +01:00
Šimon Brandner
40947a2a68
Simplifie toast handling
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-26 12:21:58 +02:00
Šimon Brandner
379101e3ff
Remove an unused member
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:09:00 +02:00
Šimon Brandner
07be6dd780
Allow suppliing whole body to toasts
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 13:35:54 +02:00
Travis Ralston
2c4ab507d6
Merge pull request #6453 from matrix-org/travis/voice-messages/code-cleanup-1
Clean up voice messages code
2021-07-23 09:09:12 -06:00
Travis Ralston
bb0be4ba72 Add customisation point for declaring widget variables
Fixes https://github.com/vector-im/element-web/issues/18035 (indirectly; issue is on a non-standard version of Element).

This has an isReady() step because the variable usage code path cannot be made async, so instead we let the async loading state happen in the prepare() stage. This is required for the intended usecase.
2021-07-22 15:43:18 -06:00
Travis Ralston
eec63574e6 Move src/voice to src/audio for better naming
Many of these files are used by Audio and Voice messages.

Fixes https://github.com/vector-im/element-web/issues/18131
2021-07-22 09:26:26 -06:00
Michael Telatynski
18bb4bce35 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/stores/SpaceStore.tsx
2021-07-22 12:44:27 +01:00
Jaiwanth
517e8951ee Apply suggestions from review 2021-07-22 08:30:18 +05:30
Jaiwanth
76040c652c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room 2021-07-22 08:25:24 +05:30
David Baker
a6c432d66f fix types
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown
Remove unused old stale feather-customised/globe.svg
2021-07-21 11:20:41 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Michael Telatynski
1b2d70d816 Prompt user to leave rooms/subspaces in a space when leaving space 2021-07-21 09:57:10 +01:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01:00
Michael Telatynski
de42a00ca4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/avatars/RoomAvatar.tsx
	test/stores/SpaceStore-test.ts
	test/test-utils.js
2021-07-19 16:47:31 +01:00
Michael Telatynski
e54a7f0997 Don't throw exception from setStickyRoom as it split-brains the RoomListStore 2021-07-19 09:36:25 +01:00
Šimon Brandner
c9a11af26b
Give singletonRoomViewStore a type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +02:00
Michael Telatynski
05028f1997 remove unused import 2021-07-16 09:22:25 +01:00
Michael Telatynski
191591e807 Make the critical sections of the RLS synchronous to avoid needing to mutex everything 2021-07-16 09:15:56 +01:00
Michael Telatynski
32cc48ff7a Fix issue with room duplication caused by filtering and selecting room using keyboard
Wrap sticky room updates in lock to prevent setStickyRoom running in middle of setKnownRooms
2021-07-16 08:49:19 +01:00
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console 2021-07-15 13:50:13 +01:00
Michael Telatynski
59feff3763 Silence RoomListStore possible memory leak warning 2021-07-15 11:49:15 +01:00
Michael Telatynski
50b6c5c557 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
Michael Telatynski
dcb9b9b777 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/elements/MiniAvatarUploader.tsx
	src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
	src/i18n/strings/en_EN.json
	src/settings/handlers/RoomSettingsHandler.ts
	src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Michael Telatynski
90d380c8ae Cache value of feature_spaces* flags as they cause page refresh so are immutable 2021-07-15 08:26:49 +01:00
Travis Ralston
421392f339 Exclude state events from widgets reading room events
They can request state reading permissions to read state.
2021-07-14 12:48:27 -06:00
Travis Ralston
5a51b7139c
Merge pull request #6371 from matrix-org/travis/widgets/fix-enc
Send clear events to widgets when permitted
2021-07-14 10:34:08 -06:00
Travis Ralston
c4b03064ae fix imports 2021-07-14 10:28:45 -06:00
Travis Ralston
5dc3d09dd8 Use new function name 2021-07-14 10:18:55 -06:00
Travis Ralston
9495ba001c Send clear events to widgets when permitted
Fixes https://github.com/vector-im/element-web/issues/17615
2021-07-13 23:17:17 -06:00
Michael Telatynski
ae6eaa5acc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
 Conflicts:
	src/components/structures/RoomDirectory.tsx
	src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
Germain Souquet
36ba65b534 Merge branch 'develop' into gsouquet/fix-backdrop-filter 2021-07-12 13:00:34 +02:00
Michael Telatynski
2ef714b9eb remove unused import 2021-07-12 10:49:19 +01:00
Michael Telatynski
bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Michael Telatynski
a7aa87a9fc Fix right panel not closing user info when changing rooms 2021-07-09 14:43:07 +01:00
Michael Telatynski
437d53d1cc Update space children (best effort) when upgrading a room 2021-07-09 08:43:41 +01:00
Michael Telatynski
f412fb44a7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/SlashCommands.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
	src/createRoom.ts
2021-07-09 08:13:39 +01:00
David Baker
72acd5a611
Merge pull request #6330 from matrix-org/dbkr/tsify_secretstorage
Update import location for types
2021-07-08 09:18:31 +01:00