Michael Telatynski
a58edcb241
tweak copy
2021-07-21 10:43:12 +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
Robin Townsend
0117d513ea
Consolidate disabling of history options
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-13 23:08:43 -04:00
Robin Townsend
d568e92e06
Merge branch 'develop' into e2ee-history-visibility
2021-07-13 23:07:11 -04: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
Michael Telatynski
d004163177
Fix 2 new NPEs
2021-07-06 12:05:30 +01:00
Michael Telatynski
c5ca98a3ad
Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog
2021-07-06 10:10:25 +01:00
Šimon Brandner
b36a727a09
Fourth batch of burning
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-02 18:15:05 +02:00
Michael Telatynski
912e192dc6
Tweak behaviour of setting restricted join rule
2021-07-02 15:18:27 +01:00
Michael Telatynski
e8f0412fe3
Add way to manage Restricted join rule in Room Settings
2021-07-02 14:51:55 +01:00
Michael Telatynski
4c42313f99
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
src/createRoom.ts
2021-07-01 12:47:34 +01:00
J. Ryan Stinnett
0551becafd
Fix long lines
2021-06-29 13:42:51 +01:00
J. Ryan Stinnett
ae0a8b8da4
Auto-fix lint errors
2021-06-29 13:11:58 +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
566b8af2a4
Initial support for MSC3083 via MSC3244
2021-06-18 12:18:23 +01:00
Michael Telatynski
e508ff003b
Clean up typing to Security Room Settings
2021-06-18 11:48:08 +01:00
Michael Telatynski
bf66a72054
Move JoinRule, GuestAccess, HistoryVisibility enums into the js-sdk
2021-06-18 10:05:46 +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
Robin Townsend
bd602e7089
Hide world readable history option in encrypted rooms
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-29 18:23:39 -04:00
J. Ryan Stinnett
4e7240ebc9
Add types to SecurityRoomSettingsTab
2021-04-27 11:56:45 +01:00
J. Ryan Stinnett
26bb7c08c2
Add join rule comment
2021-04-26 16:20:16 +01:00
J. Ryan Stinnett
d497d62db3
Use enums in SecurityRoomSettingsTab
2021-04-26 16:14:21 +01:00
J. Ryan Stinnett
a3a756fdb2
Rename history visibility type
2021-04-26 14:08:45 +01:00
J. Ryan Stinnett
b8a915bb76
Tweak private / underscores for fields and methods
2021-04-26 14:02:53 +01:00
J. Ryan Stinnett
f34489e2df
Actually fix indent lint errors
2021-04-23 18:11:54 +01:00
J. Ryan Stinnett
d7e6f4b4b5
Add basic types
2021-04-23 17:05:50 +01:00
J. Ryan Stinnett
31a28b1a9e
Update extensions for some files with types
...
This migrates one bucket of files using some amount of Flow typing to mark them
as TypeScript instead. The remaining type errors are fixed in subsequent
commits.
2021-04-23 16:05:30 +01:00
