Commit graph

25 commits

Author SHA1 Message Date
Travis Ralston
a501d698aa Add a UI Feature flag for room history settings 2020-10-28 09:00:36 -06:00
Travis Ralston
5630f35715 Add a UI feature to disable advanced encryption options 2020-09-18 11:33:02 -06:00
Travis Ralston
189233447b Merge branch 'develop' into t3chguy/fix/15182 2020-09-18 11:06:32 -06:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-18 12:34:38 +01:00
Michael Telatynski
687a2e56b2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179
 Conflicts:
	src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-18 11:29:38 +01:00
Michael Telatynski
598c982f02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-18 11:14:36 +01:00
Michael Telatynski
c904b4f416 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 14:10:51 +01:00
Michael Telatynski
c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181
 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:55:11 +01:00
Michael Telatynski
ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
Michael Telatynski
1e9e0dee87
Merge pull request #5227 from matrix-org/t3chguy/fix/15188
UI Feature Flag: Registration, Password Reset, Deactivate
2020-09-17 13:40:06 +01:00
Michael Telatynski
5bf6697e48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f UI Feature Flag: 3PIDs 2020-09-17 13:25:18 +01:00
Michael Telatynski
4213a557f2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15175
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 11:58:26 +01:00
Michael Telatynski
d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01:00
Michael Telatynski
a784e29622 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15174
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-16 16:09:08 +01:00
Michael Telatynski
c11abb74e0 UI Feature Flag: Share dialog QR code and social icons 2020-09-16 16:06:17 +01:00
Michael Telatynski
d3c84e25f5 UI Feature Flag: Identity server 2020-09-16 14:45:34 +01:00
Michael Telatynski
d1070c05dd UI Feature Flag: Disable VoIP 2020-09-16 13:40:27 +01:00
Michael Telatynski
2bea8457e9 UI Feature Flag: Communities 2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc UI Feature Flag: Disable advanced options and tidy up some copy 2020-09-16 12:14:33 +01:00
Michael Telatynski
f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Michael Telatynski
9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Michael Telatynski
04d7aebad0 UI Feature Flag: Disable feedback button 2020-09-16 10:59:14 +01:00
Travis Ralston
60c6e23b94 Match intended case for settings 2020-09-15 08:55:03 -06:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
2020-09-14 22:28:02 -06:00