28362 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	870c35be6f	Merge branch 'develop' into travis/ft-sep1620/09-enc-files	2020-09-18 10:56:20 -06:00
Travis Ralston	46f6c140e6	Merge pull request #5231 from matrix-org/travis/e2e-default-serverside ... Disable the e2ee toggle when creating a room on a server with forced e2e	2020-09-18 07:50:45 -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	ee4a5b2208	Merge pull request #5228 from matrix-org/t3chguy/15187 ... UI Feature Flag: 3PIDs	2020-09-18 11:34:52 +01:00
Michael Telatynski	9dbc1dbc85	Hide Advanced Appearance Settings ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-09-18 11:34:35 +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	1a965b1cb7	UIF 3PID implies UIF Identity Server ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2020-09-18 11:15:48 +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
J. Ryan Stinnett	ec4bf0c057	Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup ... Defer encryption setup until first E2EE room	2020-09-18 10:28:33 +01:00
Travis Ralston	38f8c0a835	Disable the e2ee toggle when creating a room on a server with forced e2e ... Fixes https://github.com/vector-im/element-web/issues/15186 Requires https://github.com/matrix-org/matrix-js-sdk/pull/1470	2020-09-17 22:46:01 -06:00
Michael Telatynski	d59a1fbd80	Merge pull request #5179 from matrix-org/t3chguy/tidy-dev-deps ... Tidy devDeps, all the webpack stuff lives in the layer above	2020-09-17 15:06:16 +01:00
Michael Telatynski	c6d76f2b55	Merge pull request #5214 from matrix-org/t3chguy/fix/15178 ... UI Feature Flag: Hide flair	2020-09-17 14:43: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	53ee5d82c7	Merge pull request #5218 from matrix-org/t3chguy/fix/15181 ... UI Feature Flag: Identity server	2020-09-17 14:07:56 +01:00
Michael Telatynski	25171347a0	i18n	2020-09-17 13:57:47 +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	5f324b19f0	Merge pull request #5221 from matrix-org/t3chguy/fix/15180 ... UI Feature Flag: Share dialog QR code and social icons	2020-09-17 13:51:19 +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	1ca20dffc8	Merge pull request #5204 from matrix-org/t3chguy/fix/15164 ... Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT	2020-09-17 13:34:07 +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	148a57c58e	Merge pull request #5217 from matrix-org/t3chguy/fix/15175 ... UI Feature Flag: Disable VoIP	2020-09-17 12:09:09 +01:00
Michael Telatynski	f52b267bd3	i18n	2020-09-17 12:07:17 +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
Travis Ralston	c3a3754432	Appease the linter	2020-09-16 17:27:45 -06:00
Travis Ralston	bfbbf44dfc	Add a note to use the desktop builds when seshat isn't available ... Fixes https://github.com/vector-im/element-web/issues/15184 This is currently temporary design for https://github.com/vector-im/element-web/issues/12896 but does not fix it.	2020-09-16 17:23:37 -06:00
Travis Ralston	2ad08c8394	Merge pull request #5224 from matrix-org/travis/ft-sep1620/05-directory ... Fix setState() usage in the constructor of RoomDirectory	2020-09-16 15:47:32 -06:00
Travis Ralston	815a1559ff	Fix setState() usage in the constructor of RoomDirectory ... React doesn't like it when we setState() in the constructor	2020-09-16 15:05:14 -06:00
J. Ryan Stinnett	b5000b236f	Fix lint error	2020-09-16 17:12:51 +01:00
J. Ryan Stinnett	a18d0271c3	Adjust tests for Secure Backup toast	2020-09-16 16:51:10 +01:00
Michael Telatynski	4db9ac16b5	Merge pull request #5211 from matrix-org/t3chguy/fix/15173 ... Hide Analytics sections if piwik config is not provided	2020-09-16 16:34:55 +01:00
Michael Telatynski	aeb30c08ca	Merge pull request #5213 from matrix-org/t3chguy/fix/15174 ... UI Feature Flag: Disable feedback button	2020-09-16 16:34:12 +01:00
Michael Telatynski	9be04f8a67	i18n	2020-09-16 16:10:43 +01:00
Michael Telatynski	93323febcb	undo change	2020-09-16 16:10:24 +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	4d15a44d61	Merge pull request #5220 from matrix-org/t3chguy/fix/15202 ... Clean up UserInfo to not show a blank Power Selector for users not in room	2020-09-16 16:04:15 +01:00
Michael Telatynski	4e2b6c2a30	Merge pull request #5212 from matrix-org/t3chguy/fix/15172 ... Also hide bug reporting prompts from the Error Boundaries	2020-09-16 15:59:07 +01:00
Michael Telatynski	06c4abd65e	Clean up UserInfo to not show a blank Power Selector for users not in room	2020-09-16 15:23:08 +01:00
Michael Telatynski	feb37878d8	tidy	2020-09-16 15:04:13 +01:00
J. Ryan Stinnett	7a5b0a964f	Adjust main encryption toast to reference Secure Backup ... This adjusts the main toast to focus on Secure Backup as suggested in designs. Part of https://github.com/vector-im/element-web/issues/13895	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	550a53e49c	Check cross-signing cached keys when showing setup button	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	6130d9e882	Delay encryption setup toasts until encrypted rooms present ... Part of https://github.com/vector-im/element-web/issues/13895	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	0d25f62a9a	Tweak diagnostics for session backup key	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	26b465f1fd	Remove room recovery reminder ... The Secure Backup toast replaces this with better UX. Part of https://github.com/vector-im/element-web/issues/13895	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	ada00a3535	Recheck security status on room encryption change ... This ensures we are alerted when you first interact with an encrypted room. Part of https://github.com/vector-im/element-web/issues/13895	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	46f37fb969	Create cross-signing keys during authentication ... With this change, Element now creates cross-signing keys during auth flows for password login. For other auth flows like token / SSO, it will not happen until a cross-signing / secret storage dialog flow as before.	2020-09-16 15:03:06 +01:00
J. Ryan Stinnett	7be27e70c9	Add component key to actions array	2020-09-16 15:03:06 +01:00