72 commits

Author	SHA1	Message	Date
Michael Telatynski	e3e6b74272	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665 ... Conflicts: src/stores/SpaceStore.tsx	2021-06-22 17:38:05 +01:00
Michael Telatynski	4a66794236	update copy	2021-06-22 17:26:19 +01:00
Michael Telatynski	3c9cd938d0	remove spurious full stop	2021-06-22 15:29:53 +01:00
Šimon Brandner	686e7d18c3	Merge remote-tracking branch 'upstream/develop' into feature-surround-with ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-06-20 08:14:12 +02:00
David Teller	77a4d345bd	Submitting abuse reports to moderators (#6213) ... This patch is part of MSC3215. It implements `feature_report_to_moderator` to let end-users send report to room moderators instead of homeserver administrators. This only works if the room has been setup for moderation, something that does not have a UX yet. Signed-off-by: David Teller <davidt@element.io>	2021-06-18 18:09:02 +02:00
Michael Telatynski	7d90612371	Iterate PR	2021-06-17 16:22:40 +01:00
Germain Souquet	ae5cd9d7ac	Add new layout switcher UI ... Co-authored-by: Quirin Götz <codeworks@supercable.onl>	2021-06-17 14:11:44 +01:00
Michael Telatynski	b4fbc791bb	Add experimental options to the Spaces beta	2021-06-16 09:01:13 +01:00
Michael Telatynski	59f4c728c9	Initial cut of Pinned event card in the right panel	2021-05-25 16:10:44 +01:00
Šimon Brandner	7e165384fd	Merge branch 'develop' into reorganize-preferences	2021-05-22 17:25:04 +02:00
Robin Townsend	332412782e	Remove logo spinner ... Removed since design wants to avoid associating slowness with the brand. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-20 17:31:10 -04:00
Travis Ralston	018a75ea1e	Upgrade showChatEffects to room-level setting exposure	2021-05-20 09:10:21 -06:00
Michael Telatynski	607ca17971	Iterate beta feedback dialog	2021-05-12 16:11:38 +01:00
Michael Telatynski	ea9be0dd4c	Merge pull request #6012 from matrix-org/t3chguy/fix/17238 ... Add feedback mechanism for beta features, namely Spaces	2021-05-11 17:46:21 +01:00
Travis Ralston	92e30f0607	Merge remote-tracking branch 'origin/develop' into travis/voicemessages/indev	2021-05-11 10:13:21 -06:00
Michael Telatynski	bf4c8f048f	Add feedback mechanism for beta features	2021-05-11 15:58:19 +01:00
Michael Telatynski	cb13200c2d	last minute copy tweak	2021-05-07 11:56:41 +01:00
Michael Telatynski	90538c95aa	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021	2021-05-06 08:05:14 +01:00
Michael Telatynski	2435332d37	fix beta disabled behaviour	2021-04-30 12:42:16 +01:00
Michael Telatynski	158a0f90cb	Further design iteration	2021-04-29 22:02:18 +01:00
Michael Telatynski	279654cc9e	Design iterations based on PR feedback	2021-04-29 16:08:59 +01:00
Michael Telatynski	1802adb4d2	Iterate styling and decoration for the beta prompts	2021-04-28 22:47:08 +01:00

Renamed from src/settings/Settings.ts (Browse further)