148 commits

Author	SHA1	Message	Date
Michael Telatynski	d7aaeb37b9	delint	2021-09-29 14:05:31 +01:00
Michael Telatynski	0e79daee4b	Remove stale new in the spaces beta toast & modal	2021-09-29 11:53:13 +01:00
Michael Telatynski	d71f2345fb	Null guard around the matrixClient in SpaceStore	2021-09-28 10:34:32 +01:00
Michael Telatynski	e17318a364	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-09-16 10:05:20 +01:00
Michael Telatynski	8921e25815	Merge pull request #6804 from matrix-org/t3chguy/fix/18481	2021-09-16 10:02:06 +01:00
Michael Telatynski	c786ef9f69	Fix space keyboard shortcuts conflicting with native zoom shortcuts	2021-09-14 16:02:14 +01:00
Michael Telatynski	919270ff0c	Update src/stores/SpaceStore.tsx ... Co-authored-by: Travis Ralston <travisr@matrix.org>	2021-09-14 15:50:51 +01:00
Michael Telatynski	87c9551507	Fix edge cases around joining new room which does not belong to active space	2021-09-14 12:49:18 +01:00
Michael Telatynski	911ca07da4	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-09-08 15:28:58 +01:00
Michael Telatynski	0d0eea392c	Merge pull request #6746 from matrix-org/t3chguy/fix/10935	2021-09-08 12:55:45 +01:00
Michael Telatynski	0caca49ec0	Fix regressed tab view buttons in space update toast	2021-09-08 10:26:23 +01:00
Michael Telatynski	f4f4686270	tidy up code	2021-09-07 12:07:18 +01:00
Michael Telatynski	c915288044	Respect m.space.parent relations if they hold valid permissions	2021-09-06 14:34:06 +01:00
Michael Telatynski	a688e5b8b3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ... Conflicts: src/components/structures/LoggedInView.tsx src/stores/SpaceStore.tsx	2021-09-06 11:41:09 +01:00
Michael Telatynski	44b4561b8b	Don't context switch room on SpaceStore ready as it can break permalinks	2021-09-02 13:40:48 +01:00
Michael Telatynski	6e7a1e2db7	Merge pull request #6715 from matrix-org/t3chguy/fix/18761	2021-09-01 14:30:17 +01:00
Michael Telatynski	bbd420096b	don't bother awaiting SpaceStore::setActiveSpace as it is no longer async	2021-08-31 17:03:43 +01:00
Michael Telatynski	bf4ffa965c	Reload suggested rooms if we see the state change down /sync	2021-08-31 16:56:47 +01:00
Michael Telatynski	b814100b98	Fix membership updates to Spaces not applying in real-time	2021-08-31 16:31:10 +01:00
Michael Telatynski	0a209afdc2	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: res/css/structures/_SpaceHierarchy.scss src/components/structures/SpaceHierarchy.tsx src/i18n/strings/en_EN.json	2021-08-12 11:41:03 +01:00
Michael Telatynski	be85dcd1bf	Delabs Spaces, keeping it as a default-on preference for the time being	2021-08-11 14:52:40 +01:00
Michael Telatynski	3c436c9617	update setting naming to match style	2021-07-30 12:20:02 +01:00
Michael Telatynski	9eb0986353	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: src/i18n/strings/en_EN.json	2021-07-30 11:34:52 +01:00
Michael Telatynski	d459dbe700	Refactor Space Hierarchy stuff in preparation for pagination	2021-07-29 17:35:15 +01:00
Michael Telatynski	02dbdc5c0a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 ... Conflicts: src/components/views/spaces/SpaceTreeLevel.tsx src/dispatcher/actions.ts src/i18n/strings/en_EN.json	2021-07-29 16:11:16 +01:00
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	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	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
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
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	1b2d70d816	Prompt user to leave rooms/subspaces in a space when leaving space	2021-07-21 09:57:10 +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	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
Michael Telatynski	bd175c6f40	Improve and consolidate typing	2021-07-10 15:43:46 +01:00
Michael Telatynski	437d53d1cc	Update space children (best effort) when upgrading a room	2021-07-09 08:43:41 +01:00
Michael Telatynski	692347843d	Track restricted join rule support in the SpaceStore for sync access	2021-07-06 10:09:35 +01:00
Michael Telatynski	89949bd884	Add new in the spaces beta toast & explanatory modal	2021-07-02 16:07:17 +01:00
Jaiwanth	f50604db78	missing semicolon	2021-06-30 12:13:39 +05:30
Jaiwanth	a99b24ef83	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room	2021-06-30 11:20:01 +05:30
Jaiwanth	1b21c8f732	Remove unreadRoomId from summarized notification state	2021-06-30 10:53:46 +05:30
J. Ryan Stinnett	ae0a8b8da4	Auto-fix lint errors	2021-06-29 13:11:58 +01:00
Jaiwanth	746b11b24d	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room	2021-06-29 14:31:08 +05:30
Michael Telatynski	49d20d2530	consolidate the two onRoomAccountData listeners	2021-06-22 21:22:30 +01:00