14937 commits

Author	SHA1	Message	Date
Šimon Brandner	f0f2d3621e	Fix clicking pills inside replies ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-29 16:30:07 +02:00
Michael Telatynski	af851f7f44	fix merge conflict resolution issue	2021-07-29 15:24:42 +01:00
Michael Telatynski	493cd01ed3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071 ... Conflicts: res/css/views/dialogs/_AddExistingToSpaceDialog.scss src/utils/space.tsx	2021-07-29 15:22:52 +01:00
Michael Telatynski	efd8a2f9b0	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/components/views/spaces/SpaceCreateMenu.tsx src/i18n/strings/en_EN.json	2021-07-29 15:16:53 +01:00
James Salter	a1ffd240e1	Use .instance pattern	2021-07-29 14:40:18 +01:00
Šimon Brandner	871f1b7a5c	Handle all possible playMedia() in componentDidUpdate() ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-29 15:31:25 +02:00
Šimon Brandner	38a1b922bd	Add missing await ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-29 15:26:04 +02:00
Šimon Brandner	cb89dd408c	Use mic mute icons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-29 15:05:26 +02:00
Michael Telatynski	ab56a16907	Merge pull request #6458 from matrix-org/t3chguy/fix/18091	2021-07-29 13:20:19 +01:00
Michael Telatynski	08c883ed07	Update all copy of subspace to space	2021-07-29 13:02:07 +01:00
Dariusz Niemczyk	7baa3284e3	Fix grecaptcha regression	2021-07-29 12:39:32 +02:00
Germain Souquet	e140dd6ba1	Merge branch 'develop' into gsouquet/fix-18132	2021-07-29 10:27:00 +02:00
Šimon Brandner	cf973cdb95	Merge remote-tracking branch 'upstream/develop' into feature/muting	2021-07-29 09:06:24 +02:00
Šimon Brandner	ae64765870	playMedia only if necessary ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-29 08:45:32 +02:00
Michael Telatynski	67b8c0a811	remove unused import	2021-07-28 19:33:54 +01:00
Michael Telatynski	9fb1c8e4cd	Iterate PR	2021-07-28 19:33:07 +01:00
Michael Telatynski	ac800ad94d	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093	2021-07-28 19:24:26 +01:00
Michael Telatynski	40493634ae	Iterate PR	2021-07-28 19:23:33 +01:00
Michael Telatynski	ed950875e7	Fix space hierarchy not updating when user mutates it	2021-07-28 19:08:59 +01:00
Michael Telatynski	5d9e421de0	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091	2021-07-28 17:58:34 +01:00
Michael Telatynski	a5606c72de	Update feedback prompt to match designs	2021-07-28 17:56:57 +01:00
James Salter	07eaee25d2	Default properties to {} to avoid passing it superfluously for events with no properties	2021-07-28 17:54:35 +01:00
Michael Telatynski	6123ccb2eb	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096	2021-07-28 17:45:15 +01:00
Michael Telatynski	67ef263940	Refactor SpaceButton to be more reusable and add context menu to Home button	2021-07-28 17:40:33 +01:00
Michael Telatynski	b3a28bde89	Factor out useEventEmitterState hook	2021-07-28 17:39:56 +01:00
Michael Telatynski	cdf0d98c3f	Fix IconizedContextMenuCheckbox layout	2021-07-28 17:39:02 +01:00
James Salter	b1bd5f57a4	Document IEvent.properties, fix IWelcomeScreenLoad ... IEvent.properties is a placeholder that needs to be overriden by extenders for type validation to take place. IWelcomeScreenLoad should have had properties declared for it. Because it didn't, a faulty call using it was possible.	2021-07-28 16:43:13 +01:00
Šimon Brandner	537ce40f42	Add a TODO ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-28 16:32:55 +02:00
Michael Telatynski	07b9d6b30b	Fix styling of setting flag descriptions in preferences ... and add description to spaces all/home setting and make it an account setting rather than device one and hide it from the Beta card	2021-07-28 14:39:19 +01:00
Šimon Brandner	7c4e3efbff	Extend PureComponent to avoid unnecessary renders ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-28 15:11:31 +02:00
Šimon Brandner	91e65534fa	await setState to avoid races where we would try to play media without an HTMLVideoElement ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-28 15:04:33 +02:00
James Salter	bd7e2dee3d	Merge remote-tracking branch 'origin' into posthog-analytics	2021-07-28 11:13:22 +01:00
Germain	771dda0341	Merge pull request #6472 from SimonBrandner/fix/call-view/18221	2021-07-28 11:10:37 +01:00
James Salter	1d81bdc6f9	Interface changes and anonymity fixes	2021-07-28 09:37:08 +01:00
Michael Telatynski	98f3a5120c	Merge pull request #6492 from matrix-org/t3chguy/fix/18275.1	2021-07-28 09:10:00 +01:00
Michael Telatynski	52e50863f8	Fix CreateRoomDialog exploding when making public room outside of a space	2021-07-28 08:39:59 +01:00
Michael Telatynski	0a9d3302ba	Fix home vs all rooms requiring app reload and change default to home ... Consolidate ALL_ROOMS and HOME_SPACE storage Fix behaviour when recalled room is no longer part of the target space Improve tests	2021-07-27 21:11:47 +01:00
Germain	f82744db97	Merge pull request #6487 from matrix-org/gsouquet/fix-18265	2021-07-27 17:20:02 +01:00
Germain	7e453d7745	Typo ... Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>	2021-07-27 17:14:39 +01:00
Šimon Brandner	bc11e215b8	Merge remote-tracking branch 'upstream/develop' into feature/muting	2021-07-27 18:14:23 +02:00
Šimon Brandner	36607fa8a2	Fix call crashing because element was undefined ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 18:05:50 +02:00
Germain Souquet	30ce7b5eab	Make link within replies clickable	2021-07-27 17:57:46 +02:00
Šimon Brandner	6f77d3bbab	Correctly hide the dialpad ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 17:52:13 +02:00
Šimon Brandner	8294d324e3	Merge remote-tracking branch 'upstream/develop' into fix/call-view/18221	2021-07-27 16:55:59 +02:00
Šimon Brandner	371de23b00	Merge remote-tracking branch 'upstream/develop' into feature/muting	2021-07-27 16:40:47 +02:00
David Baker	3e7aee3a87	Merge pull request #5992 from SimonBrandner/fix/12652/screen-share ... Add support for screen sharing in 1:1 calls	2021-07-27 15:34:27 +01:00
Šimon Brandner	b9e305daae	Delete mistake line ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 16:26:46 +02:00
Šimon Brandner	24f0c760ce	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 16:25:38 +02:00
Travis Ralston	93f42182c0	Merge pull request #6479 from matrix-org/travis/voice-messages/fix-placeholder-ui ... Fix timing of voice message recording UI appearing	2021-07-27 08:05:28 -06:00
Michael Telatynski	39d9ec3ced	Merge branch 'develop' into t3chguy/fix/18071	2021-07-27 15:02:59 +01:00
David Baker	5ead53b36a	Merge pull request #6483 from SimonBrandner/fix/dont-anim-resize/18261 ... Fix PiP resize issues	2021-07-27 14:42:04 +01:00
Šimon Brandner	f532c302b6	Don't animate when resizing and move when the PiP changes size ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 15:31:54 +02:00
Šimon Brandner	001490f70d	Fix unused resize listener ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 15:30:44 +02:00
David Baker	7733ee2578	Merge pull request #6478 from matrix-org/dbkr/scrollpanel_loop_breaker ... Fix infinite pagination loop when offline	2021-07-27 13:54:30 +01:00
Šimon Brandner	5dd34de5fe	Handle mute state changes ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-27 14:31:42 +02:00
Germain Souquet	8104ba936c	Add data-layout to MELS for better CSS structure	2021-07-27 11:30:25 +02:00
David Baker	e5d538412b	Typo ... Co-authored-by: Germain <germain@souquet.com>	2021-07-27 09:29:32 +01:00
Germain	788abac74d	Merge pull request #6471 from SimonBrandner/fix/voip-event-tiles/18216 ... Fix VoIP event tile issues	2021-07-27 08:17:31 +01:00
Travis Ralston	7f01e31040	Fix timing of voice message recording UI appearing ... Fixes https://github.com/vector-im/element-web/issues/18223 We delay the composer's state until a recording is truly ready here, preventing buttons from disappearing while we're still figuring things out.	2021-07-26 23:33:21 -06:00
David Baker	f20da6d3de	Fix infinite pagination loop when offline ... I'm not really sure how this is meant to work - and I'm not sure how it was working before, but this is causing fairly bad infinite loops if I start element with no homeserver connection. This is a fairly crude fix, only thing I can think that would be better is some awareness of when network requests were failing and intentionally backing off. Fixes https://github.com/vector-im/element-web/issues/18242	2021-07-26 22:05:35 +01:00
Šimon Brandner	29b0d03fe4	Update copy ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-26 21:27:22 +02:00
Germain Souquet	486d576b23	Merge branch 'develop' into gsouquet/fix-18132	2021-07-26 15:49:55 +02:00
Michael Telatynski	737aa1c55d	delint	2021-07-26 12:41:52 +01:00
Michael Telatynski	2114e854f9	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091 ... Conflicts: src/components/structures/SpaceRoomView.tsx	2021-07-26 12:36:00 +01:00
Šimon Brandner	40947a2a68	Simplifie toast handling ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-26 12:21:58 +02:00
Germain	c7bbb497f9	Merge branch 'develop' into gsouquet/fix-18128	2021-07-26 07:41:42 +01:00
Germain	93ae5c20d6	Merge pull request #6464 from matrix-org/gsouquet/fix-18172 ... Fix reactions row pushing content on IRC layout	2021-07-26 07:40:49 +01:00
Šimon Brandner	3ef20174f3	Fix issues with the controls disappearing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 18:11:29 +02:00
Šimon Brandner	1754602613	Increase CONTROLS_HIDE_DELAY ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 17:30:59 +02:00
Šimon Brandner	03a8308ae8	Fix call type icon ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 17:24:18 +02:00
Šimon Brandner	a8d27746b4	Show dialpad only when PSTN supported ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 17:07:18 +02:00
Šimon Brandner	a2c7035163	Tweak copy ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 10:57:46 +02:00
Šimon Brandner	f7087d5148	Add declined state ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 10:30:53 +02:00
Šimon Brandner	f63b6fc0a9	Support for getting reject info ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 10:28:27 +02:00
Šimon Brandner	4784ddc175	Add state for when the remote doesn't pick up ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 08:57:29 +02:00
Šimon Brandner	aedd535c92	Correct iconography for missed calls ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 08:37:25 +02:00
Šimon Brandner	50c27ebed7	Add myself to the license header as I need to re-run the CI ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 08:16:55 +02:00
Šimon Brandner	b762303102	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-25 08:10:01 +02:00
Šimon Brandner	410928745f	IncomingCallBox -> IncomingCallToast ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 13:46:22 +02:00
Šimon Brandner	07be6dd780	Allow suppliing whole body to toasts ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 13:35:54 +02:00
Šimon Brandner	ff37b8cc79	Remove IncomingCallBox ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 12:47:30 +02:00
Michael Telatynski	64e3c72f65	Fix bad import due to naming clash	2021-07-23 18:51:27 +01:00
Michael Telatynski	70d8378a66	delint	2021-07-23 18:50:25 +01:00
Michael Telatynski	05a9023bac	delint and tidy code	2021-07-23 18:31:31 +01:00
Michael Telatynski	1ba601ba22	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 ... Conflicts: src/components/structures/SpaceRoomView.tsx src/components/views/dialogs/BetaFeedbackDialog.tsx	2021-07-23 18:28:21 +01:00
Michael Telatynski	869a5fb5c7	Merge pull request #6467 from matrix-org/t3chguy/fix/18110	2021-07-23 18:21:43 +01:00
James Salter	5e0a397631	Refactor anonymity derivation	2021-07-23 17:58:31 +01:00
Michael Telatynski	e78a1adb6f	Merge pull request #6459 from matrix-org/t3chguy/eslint1	2021-07-23 16:23:38 +01:00
Michael Telatynski	4fe0e216d6	Use div instead of span for mx_MImageBody to not violate spec	2021-07-23 16:22:35 +01:00
Travis Ralston	2c4ab507d6	Merge pull request #6453 from matrix-org/travis/voice-messages/code-cleanup-1 ... Clean up voice messages code	2021-07-23 09:09:12 -06:00
Michael Telatynski	b89434fcbc	avoid abusing spans because you're too lazy to give things a class	2021-07-23 16:03:15 +01:00
Michael Telatynski	dec2c48155	remove unused import and revert removing some needed css	2021-07-23 15:56:00 +01:00
Michael Telatynski	1d1a396c1f	get rid of spurious hr	2021-07-23 15:51:59 +01:00
Michael Telatynski	7ccc429bea	Change spaces beta feedback to not be so beta-centric	2021-07-23 15:47:11 +01:00
Michael Telatynski	9c7fa71a4a	Remove spaces beta feedback prompts except a couple more strategic ones	2021-07-23 15:07:24 +01:00
Germain Souquet	3ce6fcc64b	Fix reactions row pushing content on IRC layout	2021-07-23 14:58:27 +02:00
Germain Souquet	1ba5f19f2e	Put avatar is right place when sender isnt displayed in message bubbles	2021-07-23 12:10:34 +02:00
Michael Telatynski	5ccd02dd6e	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/messages/MImageBody.tsx	2021-07-23 10:42:46 +01:00
Michael Telatynski	f5630acea7	Adhere to better eslint rules	2021-07-23 10:35:10 +01:00
Michael Telatynski	358a4e5d3f	Merge pull request #6212 from matrix-org/t3chguy/fix/17686	2021-07-23 09:09:17 +01:00