36157 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Travis Ralston	a8ec8f4c4b	Appease the linter	2021-07-29 16:03:08 -06:00
Travis Ralston	b1090a35b5	Use new getter for content in MFileBody	2021-07-29 16:03:03 -06:00
Travis Ralston	ac1014ae3f	Fix file name not ellipsizing ... Turns out the tooltip component doesn't copy over class names.	2021-07-29 16:02:58 -06:00
Travis Ralston	15f6c6300a	Improve general style per design direction	2021-07-29 16:02:53 -06:00
Travis Ralston	790696a4bb	Change "Downloading" tooltip to "Decrypting" ... Fixes https://github.com/vector-im/element-web/issues/18239	2021-07-29 16:02:50 -06:00
Travis Ralston	bde2f757aa	Unify and improve download interactions ... With help from Palid. This does two major things: 1. Makes the tile part of a file body clickable to trigger a download. 2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed). The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.	2021-07-29 16:02:46 -06:00
Travis Ralston	761fb6e1d5	Appease the linter	2021-07-29 16:01:26 -06:00
Travis Ralston	455c103890	Use new getter for content in MFileBody	2021-07-29 15:57:54 -06:00
Travis Ralston	bb1b2d10c8	Fix file name not ellipsizing ... Turns out the tooltip component doesn't copy over class names.	2021-07-29 15:55:45 -06:00
Travis Ralston	c322761abb	Improve general style per design direction	2021-07-29 15:49:23 -06:00
Travis Ralston	d1e7c79333	Change "Downloading" tooltip to "Decrypting" ... Fixes https://github.com/vector-im/element-web/issues/18239	2021-07-29 15:37:09 -06:00
Travis Ralston	fb89b45c06	Unify and improve download interactions ... With help from Palid. This does two major things: 1. Makes the tile part of a file body clickable to trigger a download. 2. Refactors a lot of the recyclable code out of the DownloadActionButton in favour of a utility. It's not a perfect refactoring, but it sets the stage for future work in the area (if needed). The refactoring still has a heavy reliance on being supplied an iframe, but simplifies the DownloadActionButton and a hair of the MFileBody download code. In future, we'd probably want to make the iframe completely managed by the FileDownloader rather than have it only sometimes manage a hidden iframe.	2021-07-29 15:36:50 -06:00
Andrew Morgan	a7c15b2ac0	Fix DialPad and Call Menu buttons not working when a call is fullscreened. (#6496) ... This PR: * Moves the dialpad and hold/transfer menu buttons into the part of the DOM that's included when a call is fullscreen'd. * Tweaks `ContextMenu` to allow menu content to be mount as a child of the current component, rather than at the root of the DOM (which was not included in the full-screen'd content). <!-- Please read https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md before submitting your pull request --> <!-- Include a Sign-Off as described in https://github.com/matrix-org/matrix-js-sdk/blob/develop/CONTRIBUTING.md#sign-off --> `Signed-off-by: Andrew Morgan <andrewm@element.io>`	2021-07-29 17:51:27 +01:00
Michael Telatynski	02dbdc5c0a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18093 ... Conflicts: src/components/views/spaces/SpaceTreeLevel.tsx src/dispatcher/actions.ts src/i18n/strings/en_EN.json	2021-07-29 16:11:16 +01:00
Michael Telatynski	94af6db201	Merge pull request #6424 from matrix-org/t3chguy/fix/18071	2021-07-29 15:57:26 +01:00
Michael Telatynski	d587ae44af	Merge pull request #6466 from matrix-org/t3chguy/fix/18096	2021-07-29 15:53:57 +01:00
Michael Telatynski	3ee8f607c0	Switch dropdown out for radio interaction when leaving space	2021-07-29 15:50:18 +01:00
David Baker	0b9c422d47	Merge pull request #6508 from SimonBrandner/fix/pill-click/18283 ... Fix clicking pills inside replies	2021-07-29 15:40:27 +01:00
Michael Telatynski	251b6eb04e	update copy	2021-07-29 15:30:49 +01:00
Š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
Michael Telatynski	f69b4549dd	Re-add top border stroke in space create menu	2021-07-29 15:13:02 +01:00
James Salter	cd2bc79b6b	Remove comment	2021-07-29 14:43:19 +01:00
James Salter	a1ffd240e1	Use .instance pattern	2021-07-29 14:40:18 +01:00
Germain	dac3eda9e3	Merge pull request #6499 from matrix-org/gsouquet/fix-18195 ... Prevent timeline flickering on hover	2021-07-29 14:33:34 +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
David Baker	a7a84df49c	Merge pull request #6505 from matrix-org/fix/release-grecaptcha-regression ... Fix/release grecaptcha regression	2021-07-29 14:19:09 +01: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
Germain	3bd393f16b	Merge pull request #6501 from matrix-org/gsouquet/fix-18249 ... Restore pointer cursor for SenderProfile in message bubbles	2021-07-29 12:20:56 +01:00
Germain	44bab05b47	Merge pull request #6500 from matrix-org/gsouquet/fix-18143 ... Align event list summary read receipts when using message bubbles	2021-07-29 12:20:37 +01:00
Dariusz Niemczyk	f9f9aebef6	Merge pull request #6503 from matrix-org/fix/grecaptcha-regression ... Fix grecaptcha regression	2021-07-29 13:05:38 +02:00
Dariusz Niemczyk	7f6cf29766	Fix grecaptcha regression	2021-07-29 12:45:29 +02:00
Dariusz Niemczyk	7baa3284e3	Fix grecaptcha regression	2021-07-29 12:39:32 +02:00
Germain Souquet	6c68f779ec	Restore pointer cursor for SenderProfile in message bubbles	2021-07-29 11:58:32 +02:00
Germain Souquet	9c4101fa89	Align event list summary read receipts when using message bubbles	2021-07-29 11:48:22 +02:00
Germain Souquet	78a9117598	Prevent timeline flickering on hover	2021-07-29 11:12:07 +02:00
Germain	ef8d2e8257	Merge pull request #6477 from matrix-org/gsouquet/fix-18132	2021-07-29 09:51:13 +01:00
Germain Souquet	e140dd6ba1	Merge branch 'develop' into gsouquet/fix-18132	2021-07-29 10:27:00 +02:00
Šimon Brandner	152168ef2d	Add mic mute icons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-29 10:20:59 +02:00
Germain Souquet	ee7f3c000d	Merge branch 'develop' into gsouquet/fix-18144	2021-07-29 10:04:47 +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
Šimon Brandner	f16b1d46b7	Fix sizing issue of the screen picker ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-28 20:58:24 +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