Commit Graph

13 Commits (4f1ff134dc9b7505dc21e6e64d61ebe0b84c99dd)

Author SHA1 Message Date
Šimon Brandner 4f1ff134dc
Render guest settings only in public spaces
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-26 17:39:54 +02: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 ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +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 33dca81352 Update some more 2021-07-12 09:10:27 +01:00
Michael Telatynski bd175c6f40 Improve and consolidate typing 2021-07-10 15:43:46 +01:00
Michael Telatynski 912e192dc6 Tweak behaviour of setting restricted join rule 2021-07-02 15:18:27 +01:00
Michael Telatynski 88cd5aeaf6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/elements/StyledRadioGroup.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-06-29 12:29:45 +01:00
Michael Telatynski 5facee56b0 Fix space settings using join rule private instead of invite 2021-06-25 10:41:45 +01:00
Michael Telatynski 5dc542f189 Iterate PR 2021-06-22 22:01:18 +01:00
Michael Telatynski 5130d5e111 Hide addresses section for private spaces 2021-06-15 12:26:09 +01:00
Michael Telatynski 54241f44c2 delint 2021-06-08 16:40:01 +01:00
Michael Telatynski 90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00