13450 commits

Author	SHA1	Message	Date
Michael Telatynski	2c2d95560b	Linkify topics in space room directory results	2021-05-12 10:05:53 +01:00
Travis Ralston	7bd1a2b87f	Merge pull request #5972 from SimonBrandner/fix/17164/remember-collapsed-state ... Persistent space collapsed states	2021-05-11 23:23:48 -06:00
Šimon Brandner	262fc40afb	Move comment to the correct place ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-12 07:12:00 +02:00
Travis Ralston	9842bcde50	Merge pull request #6010 from ndarilek/develop ... Catch another instance of unlabeled avatars.	2021-05-11 21:44:15 -06:00
Michael Telatynski	7396ce76e5	Tweak the feedbacks a tad	2021-05-11 17:30:33 +01:00
Michael Telatynski	7de626824e	Sprinkle some more feedback prompts in the spaces beta	2021-05-11 17:01:31 +01:00
Michael Telatynski	bf4c8f048f	Add feedback mechanism for beta features	2021-05-11 15:58:19 +01:00
Nolan Darilek	006aa2d5b9	Catch another instance of unlabeled avatars. ... Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>	2021-05-11 09:39:06 -05:00
Michael Telatynski	df72fbb22a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17179 ... Conflicts: src/i18n/strings/en_EN.json	2021-05-11 14:07:47 +01:00
Michael Telatynski	2e19c7fd24	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx	2021-05-11 13:40:28 +01:00
Michael Telatynski	f0342b0ea7	Merge pull request #6009 from matrix-org/t3chguy/fix/15359 ... Improve permissions error when adding new server to room directory	2021-05-11 12:36:40 +01:00
Michael Telatynski	b0f23aa65b	Improve permissions error when adding new server to room directory	2021-05-11 12:20:18 +01:00
Šimon Brandner	1b877f2b7c	Make SpaceTreeLevelLayoutStore into a singleton ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-11 11:16:14 +02:00
Šimon Brandner	4115fd8695	Rewrite SpaceTreeLevelLayoutStore to save paths ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-11 11:13:13 +02:00
Michael Telatynski	23001cb10d	remove unused import	2021-05-11 10:11:51 +01:00
Michael Telatynski	de04d82395	Switch to using forms for implicit submission	2021-05-11 10:01:40 +01:00
Michael Telatynski	5eed9f6cba	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17227	2021-05-11 09:14:01 +01:00
Šimon Brandner	965af1a642	Initial SpaceTreeLevelLayoutStore implementation ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-11 08:08:02 +02:00
Šimon Brandner	bc0ff5bbea	Merge branch 'develop' into fix/17164/remember-collapsed-state	2021-05-11 07:38:08 +02:00
Travis Ralston	7ac12d14af	Merge pull request #5865 from jaiwanth-v/edit-slashcommands ... Add slash commands support to edit message composer	2021-05-10 20:16:44 -06:00
Travis Ralston	12657f0fbc	Merge branch 'develop' into edit-slashcommands	2021-05-10 20:09:33 -06:00
Travis Ralston	beef07bdef	Merge branch 'develop' into err	2021-05-10 20:08:19 -06:00
Travis Ralston	122565b3ac	Update src/components/views/rooms/EditMessageComposer.js	2021-05-10 20:03:20 -06:00
Travis Ralston	379d19e2e0	Lint	2021-05-10 19:56:30 -06:00
Michael Telatynski	70d7a59ea2	Merge pull request #5969 from matrix-org/t3chguy/fix/17044.1 ... Switch the Home Space out for an All rooms space	2021-05-10 16:26:05 +01:00
Michael Telatynski	95b43d1284	Merge pull request #5985 from aaronraimist/blank-device-name ... Show device ID in UserInfo when there is no device name	2021-05-10 16:19:56 +01:00
Michael Telatynski	c96bb374ea	Allow user to progress through space setup wizard using Enter/Return	2021-05-10 16:06:23 +01:00
Michael Telatynski	3a75eb1226	Fix handling of enter/return in space creation menu	2021-05-10 14:39:10 +01:00
J. Ryan Stinnett	4311d91372	Merge pull request #5982 from SimonBrandner/fix/17184/dont-use-event-meta ... Don't use the event's metadata to calc the scale of an image	2021-05-10 13:06:08 +01:00
J. Ryan Stinnett	45acf70b00	Merge pull request #5981 from matrix-org/jryans/upload-preview-mimetype ... Adjust MIME type of upload confirmation if needed	2021-05-10 10:21:35 +01:00
Aaron Raimist	fa307ee14c	Update src/components/views/right_panel/UserInfo.tsx ... Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>	2021-05-07 18:41:47 -05:00
Robin Townsend	119c14c3f9	Forbid redaction of encryption events ... Redacting m.room.encryption events will leave the room in a broken state, and so we shouldn't allow the user to do this. Signed-off-by: Robin Townsend <robin@robin.town>	2021-05-07 12:49:37 -04:00
Ayush PS	32edbc155f	Merge remote-tracking branch 'origin/develop' into err	2021-05-07 19:16:00 +05:30
Michael Telatynski	cb13200c2d	last minute copy tweak	2021-05-07 11:56:41 +01:00
Michael Telatynski	a8c4aabb52	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17021 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/i18n/strings/en_EN.json	2021-05-07 11:50:49 +01:00
Michael Telatynski	6338ced8a3	Merge pull request #5977 from matrix-org/t3chguy/fix/17176 ... Iterate Spaces admin UX around room management	2021-05-07 11:47:45 +01:00
Michael Telatynski	6137162786	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17044.1 ... Conflicts: src/stores/room-list/RoomListStore.ts	2021-05-07 10:40:07 +01:00
Michael Telatynski	4079b03ae0	Bring back filter all spaces behaviour	2021-05-07 10:39:35 +01:00
Michael Telatynski	6f28964b49	Merge pull request #5979 from matrix-org/t3chguy/spaces-logs ... Guard all isSpaceRoom calls behind the labs flag	2021-05-07 10:28:14 +01:00
Aaron Raimist	1f2895dbe9	Merge branch 'develop' into blank-device-name	2021-05-06 20:19:49 -05:00
Aaron Raimist	5d7535738a	Show device ID in UserInfo when there is no device name ... Signed-off-by: Aaron Raimist <aaron@raim.ist>	2021-05-06 20:01:53 -05:00
Šimon Brandner	7ad270928a	Simplifie code a bit ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-06 16:41:09 +02:00
Šimon Brandner	bb9803a94e	Don't try to use the event's metadata to calc the scale ... That has lead to https://github.com/vector-im/element-web/issues/17184 Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-05-06 16:40:33 +02:00
J. Ryan Stinnett	06a9577858	Merge remote-tracking branch 'origin/develop' into jryans/upload-preview-mimetype	2021-05-06 14:45:48 +01:00
J. Ryan Stinnett	dc50d27985	Adjust MIME type of upload confirmation if needed ... This filters the MIME type of uploaded files to ensure we display safely.	2021-05-06 14:39:44 +01:00
J. Ryan Stinnett	437f13cf76	Convert UploadConfirmDialog to TSX	2021-05-06 14:11:34 +01:00
Michael Telatynski	d9912651d6	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17176 ... Conflicts: src/components/structures/SpaceRoomDirectory.tsx	2021-05-06 13:06:50 +01:00
Michael Telatynski	d47eecbd24	Make button sizes more consistent and fix untrapped behaviour of join button leaking to parent	2021-05-06 13:05:58 +01:00
J. Ryan Stinnett	683aec1066	Merge pull request #5833 from SimonBrandner/feed ... Support for multiple streams (not MSC3077)	2021-05-06 11:20:09 +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