3774 commits

Author	SHA1	Message	Date
Michael Telatynski	9d909dcdf8	tweaks	2021-08-13 15:44:43 +01:00
Dariusz Niemczyk	5f9b55eaa9	Merge remote-tracking branch 'origin/develop' into gsouquet/fix-backdrop-filter ... * origin/develop: (1278 commits) Add a little padding Keep number field in focus when pressing dialpad buttons (#6520) Remove old version Fix video call persisting when widget removed Update link to matrix-js-sdk CONTRIBUTING file (#6557) $toast-bg-color -> $system $system-... -> $system Iterate PR based on feedback Remove unnecessary code Use AccessibleTooltipButton Just upload the PR object itself Edit PR Description instead of commenting publish the right directory Fix Netflify builds from fork PRs This doesn't need to be here as it was moved into CallViewButtons Make scrollbar dot transparent Iterate PR based on feedback Don't set hidden RRs labs setting at account level Add a comment for weirdly placed div Add full class names to animations.scss ...	2021-08-13 15:12:07 +02:00
Michael Telatynski	5e38b8b3b3	try fix tests s'more	2021-08-13 13:29:25 +01:00
Šimon Brandner	cda91e44e0	Use new call state icons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-13 11:37:17 +02:00
Šimon Brandner	c79852a9f0	Left align call tiles ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-13 10:59:59 +02:00
Šimon Brandner	5ac5640939	Add a little padding ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-13 10:35:31 +02:00
Šimon Brandner	39bb253d1f	Merge remote-tracking branch 'upstream/develop' into feature/narrow-voip-tiles/18398	2021-08-13 10:30:21 +02:00
Šimon Brandner	25a3a8ddfd	$roomlist-header-color -> $tertiary-content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:31 +02:00
Šimon Brandner	4604d817c4	$roomlist-filter-active-bg-color -> $background ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:31 +02:00
Šimon Brandner	8e610e5947	$dialpad-button-bg-color -> $quinary-content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:31 +02:00
Šimon Brandner	0faedebb92	$roomheader-bg-color -> $background ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:30 +02:00
Šimon Brandner	a3a6f73049	$avatar-bg-color -> $background ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:30 +02:00
Šimon Brandner	8b59bf3d18	$tertiary-fg-color -> $tertiary-content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:29 +02:00
Šimon Brandner	10bc85724a	$secondary-fg-color -> $secondary-content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:19:26 +02:00
Šimon Brandner	e5fd19c332	$primary-fg-color -> $primary-content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:18:18 +02:00
Šimon Brandner	9ecd3b03f1	$quaternary-fg-color -> $quaternary-content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:17:37 +02:00
Šimon Brandner	2afee596a9	$primary-bg-color -> $background ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 17:17:34 +02:00
Michael Telatynski	0414ea27b8	Iterate PR based on feedback	2021-08-12 15:53:10 +01:00
Šimon Brandner	7ce88c9966	$toast-bg-color -> $system ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-12 16:20:30 +02:00
Jaiwanth	e88edba650	Merge branch 'develop' into export-conversations	2021-08-12 17:10:13 +05:30
Michael Telatynski	57bf64bd28	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ... Conflicts: src/components/views/spaces/SpacePanel.tsx	2021-08-12 12:05:55 +01:00
Michael Telatynski	85b1f166e8	post-merge tidy up	2021-08-12 12:03:14 +01:00
Dariusz Niemczyk	fbc5729daf	Merge pull request #6590 from matrix-org/palid/fix/images-loading-ux ... Make loading encrypted images look snappier	2021-08-12 12:55:52 +02:00
Michael Telatynski	0a209afdc2	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: res/css/structures/_SpaceHierarchy.scss src/components/structures/SpaceHierarchy.tsx src/i18n/strings/en_EN.json	2021-08-12 11:41:03 +01:00
Michael Telatynski	228d623024	Merge pull request #6543 from matrix-org/t3chguy/fix/18092	2021-08-12 11:28:14 +01:00
Michael Telatynski	9d3569a577	Iterate PR based on feedback	2021-08-12 10:58:56 +01:00
Michael Telatynski	09ffad96ff	Merge pull request #6569 from matrix-org/t3chguy/fix/spaces-a11y	2021-08-11 23:18:52 +01:00
Travis Ralston	2e6da2dc6e	Merge pull request #6596 from SimonBrandner/fix/scrollbar-dot/18474 ... Remove tiny scrollbar dot from code blocks	2021-08-11 13:54:47 -06:00
Michael Telatynski	38dbe89316	Merge branch 't3chguy/fix/18092' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088 ... Conflicts: src/components/views/spaces/SpaceCreateMenu.tsx src/i18n/strings/en_EN.json	2021-08-11 20:53:41 +01:00
Michael Telatynski	5f54abc7e5	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088	2021-08-11 20:51:47 +01:00
David Baker	abba7983ce	Merge pull request #6578 from SimonBrandner/task/export-call-view-buttons ... Move Call View Buttons into a separate component	2021-08-11 18:09:48 +01:00
Travis Ralston	a149108a7d	Merge pull request #6353 from SimonBrandner/feature/improved-composer ... Improve handling of pills in the composer	2021-08-11 10:55:13 -06:00
Šimon Brandner	5bc165f2ac	Make scrollbar dot transparent ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-11 18:33:16 +02:00
Michael Telatynski	d74e9c4f90	Remove impossible space hierarchy size string	2021-08-11 16:47:14 +01:00
Michael Telatynski	54d85a3864	Iterate PR based on feedback	2021-08-11 16:32:48 +01:00
Michael Telatynski	be85dcd1bf	Delabs Spaces, keeping it as a default-on preference for the time being	2021-08-11 14:52:40 +01:00
Dariusz Niemczyk	ef3737d179	Add full class names to animations.scss	2021-08-11 10:52:22 +02:00
Dariusz Niemczyk	c872609ed3	Modify encrypted images loading for better UX ... Adds proper react css transition to encrypted images placeholders, so that we can animate it's entrance and exit properly. In addition, adds simple css animations file to properly handle all of the animations in one place, so that it's much easier to properly handle prefers-reduced-motion media query.	2021-08-10 19:24:17 +02:00
Michael Telatynski	f98de18427	Add blue beta dot to the space panel create button	2021-08-10 16:45:56 +01:00
Michael Telatynski	1272b375d5	Tweak space panel new/cancel button colouring	2021-08-10 16:45:21 +01:00
Germain Souquet	d971802789	Create ThreadView phase in RightPanel	2021-08-10 14:30:12 +02:00
Michael Telatynski	77cf5bf613	Update space create menu copy and add link to community migrator	2021-08-10 11:30:00 +01:00
Michael Telatynski	195b8714fc	Iterate PR based on feedback	2021-08-10 09:55:51 +01:00
Michael Telatynski	db951b43a3	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092	2021-08-10 09:48:22 +01:00
Michael Telatynski	0f49fe92c6	iterate spaces treeview stuff	2021-08-09 14:01:34 +01:00
Jaiwanth	45ce352d02	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-08-09 10:44:13 +05:30
Šimon Brandner	d43eac7722	Add bubble highlight styling ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-08 15:00:25 +02:00
Šimon Brandner	d0e76a0ecd	Use CallViewButtons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-08 11:20:17 +02:00
Šimon Brandner	0cad9ed14a	Add _CallViewButtons.scss ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-08 11:15:18 +02:00
Travis Ralston	92a60497d2	Merge pull request #6572 from matrix-org/travis/voice-messages/stop-left ... Move stop button to the left of the waveform	2021-08-07 09:09:21 -06:00
Dariusz Niemczyk	390a3ebcbd	Merge pull request #6579 from SimonBrandner/family-friendly-branch-name ... Fix source picker sizing issues (again)	2021-08-07 15:50:17 +02:00
Šimon Brandner	54b5c8554a	Fix source picker sizing issues (again) ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-07 12:00:50 +02:00
Šimon Brandner	fe1dfa209a	rethemendex ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-07 10:13:27 +02:00
Dariusz Niemczyk	b6f7c4fe95	Merge pull request #6475 from matrix-org/jitsi-picture-in-picture ... Refactor Calls components into smaller pieces for future Widgets work	2021-08-06 18:03:30 +02:00
Travis Ralston	fbe8f04942	Fix height jump of recording states ... Fixes https://github.com/vector-im/element-web/issues/18431	2021-08-06 09:04:36 -06:00
Travis Ralston	cab4f2e402	Move stop button to the left of the waveform ... Fixes https://github.com/vector-im/element-web/issues/18416	2021-08-06 09:00:18 -06:00
Dariusz Niemczyk	4328083ea7	Rename css	2021-08-06 16:31:04 +02:00
Germain	3153e11761	Merge pull request #6566 from SimonBrandner/task/export-layout	2021-08-06 14:45:54 +01:00
Michael Telatynski	41475a3b94	fix keyboard focus issue around the space hierarchy	2021-08-06 14:12:55 +01:00
Michael Telatynski	381108a9c2	Merge pull request #6227 from SimonBrandner/feature/copy-version/17603	2021-08-06 12:56:38 +01:00
Dariusz Niemczyk	35386078a4	Post-merge changes	2021-08-06 13:25:27 +02:00
Dariusz Niemczyk	3b002c4c1f	Merge remote-tracking branch 'origin/develop' into jitsi-picture-in-picture ... * origin/develop: (100 commits) Add comments to isRegionalIndicator Stop voice messages that are playing when starting a recording Properly set style attribute on shared usercontent iframe Fix in-call context menus when in PiP mode (#6552) Extract tooltipYOffset to a const Increase yOffset by 4px away i18n Post-merge conflict resolution and improve alignment of tooltips Fix image & blurhash info when skipping thumbnail due to thresholds Skip sending a thumbnail if it is not a sufficient saving over the original Null guard space inviter to prevent the app exploding Remove seams from pin icon Appease Jest Fix worklet reference for new webpack pipeline i18n Update copy Fix wrong cursor being used in PiP Fix voice feed cut-off Use flex-start as it has more universal support Wrap cases in {} ...	2021-08-06 13:25:14 +02:00
Michael Telatynski	f7818e0169	iterate PR based on feedback	2021-08-06 12:05:14 +01:00
Michael Telatynski	64995dfae7	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092	2021-08-06 11:39:24 +01:00
Šimon Brandner	6afd75ac3c	Update/fix licenses ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 10:40:26 +02:00
Šimon Brandner	25c6b216b0	Move LayoutSwitcher CSS to a separate file ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 10:37:42 +02:00
Šimon Brandner	3c0ac487da	Remove comment ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 09:06:24 +02:00
Šimon Brandner	f57bffad3c	Soften border color ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 09:05:33 +02:00
Šimon Brandner	3677d0c5f2	Merge remote-tracking branch 'upstream/develop' into feature/improved-composer	2021-08-06 08:02:28 +02:00
Šimon Brandner	6e688b3c3a	Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn	2021-08-06 07:53:07 +02:00
Šimon Brandner	4f0c800cad	Merge remote-tracking branch 'upstream/develop' into feature/improved-composer ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 07:45:17 +02:00
Travis Ralston	27d7daeceb	Merge pull request #6550 from SimonBrandner/fix/voice-cutoff ... Fix voice feed being cut-off	2021-08-05 15:46:42 -06:00
Travis Ralston	9ad72d6daf	Merge pull request #6549 from SimonBrandner/fix/dont-use-start ... Use `flex-start` instead of `start`	2021-08-05 15:46:12 -06:00
Travis Ralston	4dcf2c7038	Merge pull request #6498 from SimonBrandner/fix/screen-picker-sizing/18281 ... Fix sizing issues of the screen picker	2021-08-05 15:39:12 -06:00
Travis Ralston	280c017238	Merge pull request #6530 from matrix-org/travis/voice-messages/uploading ... Improve voice messages uploading state	2021-08-05 08:36:53 -06:00
Travis Ralston	51bd740936	Merge pull request #6538 from matrix-org/travis/voice-messages/ui-polish-aug3-21 ... Polish up more of the voice messages UI	2021-08-05 08:34:31 -06:00
Šimon Brandner	443db125a9	Merge remote-tracking branch 'upstream/develop' into fix/replies-bubble/18184 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-05 14:36:55 +02:00
Šimon Brandner	efeae3a84c	Top align the avatar ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-05 13:39:39 +02:00
Šimon Brandner	5fa6ef83d2	Fix button alighnment ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-05 12:35:44 +02:00
Šimon Brandner	9e4f5719a4	Handle narrow layouts ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-05 11:47:58 +02:00
Šimon Brandner	91b4b50969	Fix wrong cursor being used in PiP ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 17:25:12 +02:00
Šimon Brandner	e2bc76a129	Fix voice feed cut-off ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 17:17:21 +02:00
Šimon Brandner	fe643b2401	Use flex-start as it has more universal support ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 17:09:48 +02:00
Michael Telatynski	2d3211ccf6	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18092	2021-08-04 12:14:29 +01:00
Michael Telatynski	a6e5112be0	Offer a way to create a space based on existing community	2021-08-04 10:37:35 +01:00
Germain Souquet	b4b788e8d5	Fix right margin for events on IRC layout ... Fixes vector-im/element-web#18354	2021-08-04 11:21:52 +02:00
Šimon Brandner	d479373af9	Merge remote-tracking branch 'upstream/develop' into feature/incoming-call-toast ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-04 09:21:45 +02:00
Travis Ralston	24da0291a0	Re-center recording LED ... Fixes https://github.com/vector-im/element-web/issues/18375	2021-08-03 13:34:04 -06:00
Travis Ralston	7b565db02d	Update uploading state designs	2021-08-03 12:52:21 -06:00
Dariusz Niemczyk	3ab54bce6e	Move CallViewHeader css to separate file	2021-08-03 15:21:14 +02:00
James Salter	1b87ffb7cb	Merge pull request #6527 from SimonBrandner/fix/font-topic/18339 ... Fix the wrong font being used in the room topic field	2021-08-03 10:06:58 +01:00
Travis Ralston	c5d11a9f17	Improve voice messages uploading state ... Fixes https://github.com/vector-im/element-web/issues/18226 Fixes https://github.com/vector-im/element-web/issues/18224	2021-08-02 23:29:46 -06:00
Jaiwanth	46e2f67f54	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-08-03 10:03:16 +05:30
David Baker	3ea0571c5f	Merge pull request #6486 from SimonBrandner/feature/muting ... Show an avatar/a turned off microphone icon for muted users	2021-08-02 17:20:55 +01:00
Šimon Brandner	2dc13dedf0	Fix font ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-02 15:38:45 +02:00
Šimon Brandner	9ef70f027e	Make the version box smaller ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-02 11:36:53 +02:00
Šimon Brandner	44258fd278	Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603	2021-08-02 11:32:57 +02:00
Andrew Morgan	442992b30e	Fix symbol entry in the in-call dialpad (#6521) ... The field had RTL direction set on it, which meant symbols, like *, appeared at the beginning of the field instead of the end. RTL was introduced in https://github.com/matrix-org/matrix-react-sdk/pull/5786, however its removal seems to have had no adverse affects from testing.	2021-08-02 10:18:17 +01:00
Travis Ralston	dd53324981	Merge pull request #6509 from matrix-org/travis/voice-messages/download-2 ... Improve download interactions	2021-07-30 10:50:27 -06:00
Jano Garcia	27e432df4b	Merge pull request #6513 from matrix-org/jano/fix-link-decoration ... Fix inconsistent styling for links on hover	2021-07-30 14:08:15 +02:00
Michael Telatynski	42d6afd4b1	Merge pull request #6497 from matrix-org/t3chguy/fix/18093	2021-07-30 12:25:44 +01:00
Michael Telatynski	9eb0986353	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: src/i18n/strings/en_EN.json	2021-07-30 11:34:52 +01:00
Michael Telatynski	259627fba2	Clean up SpaceHierarchy	2021-07-30 11:01:49 +01:00
janogarcia	adfbcdce40	Fix the inconsistent styling between non-markdown and markdown parsed links on hover. ... It also improves accessibility by not relying exclusively on color for the hover state. That is even more evident for links that are contained within a parent block link (e.g., a quoted message block linking to the source message). https://webaim.org/techniques/hypertext/link_text#underlining	2021-07-30 09:54:28 +02:00
Germain Souquet	11322b8999	Appease linter	2021-07-30 09:19:34 +02:00
Germain	375f7b670a	Merge branch 'develop' into gsouquet/fix-18144	2021-07-30 08:10:15 +01:00
Jaiwanth	17e9cf4d2a	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-07-30 12:17:31 +05:30
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
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	3ee8f607c0	Switch dropdown out for radio interaction when leaving space	2021-07-29 15:50:18 +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
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	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	56cd0e1c4f	Merge branch 't3chguy/fix/18091' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18089 ... Conflicts: src/components/structures/SpaceRoomDirectory.tsx	2021-07-29 12:52:01 +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 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 Souquet	e140dd6ba1	Merge branch 'develop' into gsouquet/fix-18132	2021-07-29 10:27:00 +02:00
Germain Souquet	ee7f3c000d	Merge branch 'develop' into gsouquet/fix-18144	2021-07-29 10:04:47 +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	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	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
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	cdf0d98c3f	Fix IconizedContextMenuCheckbox layout	2021-07-28 17:39:02 +01: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	e445c9c3ff	Merge remote-tracking branch 'upstream/develop' into public-e2ee-warn ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-28 13:28:11 +02:00
Germain	771dda0341	Merge pull request #6472 from SimonBrandner/fix/call-view/18221	2021-07-28 11:10:37 +01:00
Germain Souquet	a4cf147d72	Merge branch 'develop' into gsouquet/fix-18264	2021-07-28 10:30:29 +02:00
Robin Townsend	3694006d05	Realign reactions row with messages in modern layout ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-07-27 23:48:51 -04:00
Travis Ralston	9707797d45	Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163 ... Don't set `font-family` explicitly	2021-07-27 11:04:23 -06: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	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
Germain Souquet	3037be11c4	Restore padding for single person state events	2021-07-27 16:24:05 +02:00
Michael Telatynski	39d9ec3ced	Merge branch 'develop' into t3chguy/fix/18071	2021-07-27 15:02:59 +01:00
David Baker	148571828b	Merge pull request #6474 from matrix-org/gsouquet/fix-18017 ... Make new reply UI clickable	2021-07-27 13:57:41 +01:00
David Baker	72becb73e1	Merge pull request #6473 from matrix-org/gsouquet/fix-18208 ... Fix deleted message left offset in the timeline	2021-07-27 13:40:20 +01:00
Michael Telatynski	59e9704ee8	Merge pull request #6481 from matrix-org/t3chguy/fix/18250 ... Fix broken layout of the space hierarchy view	2021-07-27 13:19:04 +01:00
Germain	50aee28bf0	Merge pull request #6480 from matrix-org/gsouquet/fix-18137 ... Add data-layout to MELS for better CSS structure	2021-07-27 13:15:02 +01:00
Michael Telatynski	0c79aec19d	Fix broken layout of the space hierarchy view ... Not sure what this min-height was trying to achieve but removing it prevents the grid layout collapsing on itself	2021-07-27 13:09:43 +01:00
Germain Souquet	8104ba936c	Add data-layout to MELS for better CSS structure	2021-07-27 11:30:25 +02:00
Germain	80bf7d1675	Merge pull request #6468 from SimonBrandner/fix/quotes/18199	2021-07-27 09:48:19 +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
Jaiwanth	b91309be82	Apply suggestions from review	2021-07-26 23:40:27 +05:30
Germain Souquet	e2688cd5e0	Left align unbubbled events	2021-07-26 16:53:37 +02:00
Germain Souquet	486d576b23	Merge branch 'develop' into gsouquet/fix-18132	2021-07-26 15:49:55 +02:00
Germain Souquet	88bd22ded3	Make new reply UI clickable	2021-07-26 13:50:04 +02: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	7ed5dee74b	Make colors a bit clearer ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-26 13:17:06 +02:00
Šimon Brandner	277fdf1711	voipcall-plinth-color -> quinary-content-color ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-26 12:42:18 +02: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 Souquet	46a370a818	Fix deleted message left offset in the timeline	2021-07-26 11:01:37 +02:00
Germain Souquet	2577211855	Make CallEvent tiles the same width all the time	2021-07-26 09:42:17 +02:00
Jaiwanth	06d84a16d0	Delint	2021-07-26 12:58:17 +05:30
Germain Souquet	468887415a	Merge branch 'develop' into gsouquet/fix-18144	2021-07-26 09:25:31 +02:00
Germain	774e743741	Update res/css/views/rooms/_EventBubbleTile.scss	2021-07-26 08:16:13 +01:00
Jaiwanth	30a64a1b5a	Gray out and hide some options during export	2021-07-26 12:41:36 +05:30
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
Jaiwanth	b04bfeda33	Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations	2021-07-26 00:18:56 +05:30
Jaiwanth	3d4d1d32d9	Modify design according to the design team	2021-07-26 00:09:59 +05:30
Š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	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	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	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	f2204aa1ff	Remove nonsense comment ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 21:12:29 +02:00
Šimon Brandner	1f9cd79bcf	Fix some spacing and other tiny things ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 20:59:15 +02:00
Šimon Brandner	396fd2d012	Move silence button ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 20:39:44 +02:00
Šimon Brandner	064544369a	Add call type icon ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 19:30:37 +02:00
Šimon Brandner	25d62983de	Add button icons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 19:12:12 +02:00
Šimon Brandner	a6f10a4aaa	Move around some CSS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 18:59:54 +02:00
Šimon Brandner	dd800549d7	Fix the silence icon color ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 14:06:52 +02:00
Šimon Brandner	24e6fc96f6	Reorganize content ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 14:04:22 +02:00
Šimon Brandner	c00174aacc	Correct button sizes ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 13:46:28 +02:00
Šimon Brandner	af22588682	Don't use a spacer ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-24 13:46:28 +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
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
Šimon Brandner	d206a0b8d3	Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199	2021-07-23 18:39:42 +02:00
Šimon Brandner	c6df7e4e41	Style markdown quotes ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-23 17:46:49 +02:00
Michael Telatynski	4fe0e216d6	Use div instead of span for mx_MImageBody to not violate spec	2021-07-23 16:22:35 +01:00
Michael Telatynski	5f2582395f	Fix blurhash rounded corners missing regression	2021-07-23 16:21:59 +01: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
Michael Telatynski	c7a24746f5	Merge pull request #6462 from matrix-org/t3chguy/fix/18182	2021-07-23 14:52:56 +01:00
Germain Souquet	43f809ccc8	Fix call events layout for message bubble	2021-07-23 15:15:44 +02:00
Germain Souquet	3ce6fcc64b	Fix reactions row pushing content on IRC layout	2021-07-23 14:58:27 +02:00
Germain Souquet	42b213ba8c	Fix clipped avatar in room list	2021-07-23 14:17:26 +02:00
Michael Telatynski	2b133deb63	fix scroll behaviour to match that of prior to the spinner fix	2021-07-23 12:19:54 +01:00
Michael Telatynski	4a4ec596bd	Fix position of the space hierarchy spinner	2021-07-23 11:27:00 +01:00
Germain Souquet	dcfd5d4793	Overlay avatar on top of bubbles	2021-07-23 12:12:52 +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
Germain Souquet	f99c0fad3e	Make inline events feel less claustrophobic in bubble layout	2021-07-23 11:40:34 +02:00
Michael Telatynski	358a4e5d3f	Merge pull request #6212 from matrix-org/t3chguy/fix/17686	2021-07-23 09:09:17 +01:00
Michael Telatynski	010baabfe6	Improve subspaces and some utilities around room/space creation	2021-07-23 08:46:20 +01:00
Germain	ffcc9631df	Merge pull request #6449 from matrix-org/gsouquet/fix-18153 ... Add event selected state for message bubbles	2021-07-23 08:10:50 +01:00
Šimon Brandner	2fd221bc18	Update animation speed ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-23 08:00:51 +02:00
Michael Telatynski	d8d0a21e47	Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028	2021-07-23 06:12:02 +01:00
Šimon Brandner	1b00b304bb	Give image view panel a loading animation ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 21:25:11 +02:00
Šimon Brandner	2529b88bf6	Give lightbox a background load animation ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 21:24:24 +02:00
Šimon Brandner	4d5565b9e8	Fix sender profile alignment in replies ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 18:18:37 +02:00
Šimon Brandner	8e7a60a612	Fix replies on the bubble layout ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 17:58:18 +02:00
Šimon Brandner	bd46275ec6	Don't show scrollbar for url previews ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 17:48:17 +02:00
Germain	248a758ad6	Merge pull request #6439 from matrix-org/gsouquet/fix-18142 ... Fix avatar obstructing membership and state changes	2021-07-22 16:16:33 +01:00
Germain Souquet	0768f03097	Migrate ViewSourceEvent to TypeScript	2021-07-22 17:11:23 +02:00
Šimon Brandner	2841383e82	rethemendex ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 17:10:57 +02:00
Germain Souquet	224a9db3ec	Add event selected state for message bubbles	2021-07-22 16:48:55 +02:00
Germain	09186f8ee9	Merge pull request #6446 from matrix-org/gsouquet/fix-18145 ... Always display the Sender in the reply tile	2021-07-22 15:12:09 +01:00
Germain Souquet	02b08888b5	Use modern layout in file and notification panel	2021-07-22 16:00:41 +02:00
Germain	78ae4ebc1e	Merge pull request #6444 from matrix-org/gsouquet/fix-18121 ... Add right padding for event replies	2021-07-22 14:28:13 +01:00
Germain Souquet	229d139568	Always display the Sender in the reply tile	2021-07-22 15:23:08 +02:00
Germain Souquet	8a9d89ae85	Fix event tile cut off in share preview	2021-07-22 15:05:44 +02:00
Germain Souquet	2e173d7810	Add right padding for event replies	2021-07-22 14:38:57 +02:00
Michael Telatynski	18bb4bce35	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/stores/SpaceStore.tsx	2021-07-22 12:44:27 +01:00
Michael Telatynski	88884bbaad	Merge pull request #6441 from SimonBrandner/feature/smaller-quotes	2021-07-22 12:20:27 +01:00
Germain	951ceb194c	Merge pull request #6438 from matrix-org/gsouquet/fix-18074 ... Prevent action bar to overlap the event content	2021-07-22 12:14:29 +01:00
Šimon Brandner	6ae320831a	Make quotes thinner ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 13:10:25 +02:00
Travis Ralston	c4b08d7eca	Merge pull request #6440 from SimonBrandner/fix/codeblocks ... Revert 100% on codeblocks	2021-07-22 03:49:11 -06:00
Šimon Brandner	85e08d5074	Revert 100% ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 11:43:29 +02:00
Travis Ralston	b9b37f59f1	Merge pull request #6432 from matrix-org/travis/voice-messages/colours ... Clean up visual style of files and voice messages	2021-07-22 03:39:29 -06:00
Germain Souquet	8da2d0fe72	Fix avatar obstructing membership and state changes	2021-07-22 11:31:46 +02:00
Germain Souquet	9180d478eb	Prevent action bar to overlap the event content	2021-07-22 11:00:34 +02:00
Šimon Brandner	8695beb7ca	Fix overflow issues ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 10:03:22 +02:00
Šimon Brandner	2873bf6c3c	Make feeds bit a smaller ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 09:50:56 +02:00
Šimon Brandner	72948b9167	Keep aspect ratio for voice feeds ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 09:45:33 +02:00
Germain	51178735c9	Merge pull request #6428 from matrix-org/gsouquet/fix-18129	2021-07-22 08:44:40 +01:00
Šimon Brandner	7ad62a8b1a	Reorganize some CSS ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-22 09:06:20 +02:00
Travis Ralston	fd9241a854	Merge pull request #6355 from SimonBrandner/fix/diff-colors ... Make diff colors in codeblocks more pleasant	2021-07-21 20:02:03 -06:00
Travis Ralston	ca1a1e488a	Take out the jump when recording a voice message	2021-07-21 14:47:42 -06:00
Travis Ralston	56290f3d01	Force padding overrides to take precedence over MediaBody styles	2021-07-21 14:47:27 -06:00
Travis Ralston	87ac2d7cc5	Move padding and width to MediaBody styles	2021-07-21 14:47:02 -06:00
Travis Ralston	3023fda497	Make MFileBody inherit the MediaBody styles	2021-07-21 14:46:25 -06:00
Travis Ralston	5386d23008	Fix voice message tile taking up a couple extra px at the bottom ... ... by returning it to the default block shape.	2021-07-21 14:43:26 -06:00
Šimon Brandner	d243f7bad8	Move some CSS to a more correct place ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-21 18:30:25 +02:00
Šimon Brandner	3fac4adfc7	Fix feed sizing issues ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-21 18:14:21 +02:00
Šimon Brandner	dc7f6d8286	Show sidebar in PiP mode ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-21 17:45:21 +02:00
Germain	22375e2108	Update res/css/views/rooms/_EventBubbleTile.scss	2021-07-21 15:11:49 +01:00
Šimon Brandner	be52eba027	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-07-21 15:56:08 +02:00
Germain Souquet	0fb210cadb	Increase hit area for timestamp in message bubbles	2021-07-21 15:31:10 +02:00
Germain Souquet	c155382445	Improve new layout switcher UI	2021-07-21 14:55:30 +02:00
Germain	32e7c58747	Merge branch 'develop' into gsouquet/fix-18099	2021-07-21 11:57:29 +01:00
Germain	a4ca52255d	Merge pull request #6421 from matrix-org/gsouquet/fix-18084 ... Fix font slider preview for message bubbles	2021-07-21 11:56:33 +01:00
Germain	e33163c837	Merge pull request #6419 from matrix-org/gsouquet/fix-18125 ... Add spoiler support for message bubbles	2021-07-21 11:54:30 +01:00
Michael Telatynski	d147aaa984	delint and fix min-height issue	2021-07-21 11:27:36 +01:00
Michael Telatynski	fd64d37305	Add iconography to Create Room Dialog dropdown ... Remove unused old stale feather-customised/globe.svg	2021-07-21 11:20:41 +01:00
Michael Telatynski	390b05617c	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/dialogs/CreateRoomDialog.tsx src/components/views/dialogs/RoomUpgradeDialog.tsx src/components/views/dialogs/RoomUpgradeWarningDialog.tsx src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx	2021-07-21 10:46:41 +01:00
Germain	6308dabcfe	Remove forgotten code comment	2021-07-21 10:43:48 +01:00
Germain Souquet	ef002a2e22	Fix replies line clamping	2021-07-21 11:41:52 +02:00
Michael Telatynski	880dc26847	don't force height if the height can't change (no children edge)	2021-07-21 10:39:04 +01:00
Michael Telatynski	1b2d70d816	Prompt user to leave rooms/subspaces in a space when leaving space	2021-07-21 09:57:10 +01:00
Germain	dfa85b00d0	Merge pull request #6423 from matrix-org/gsouquet/fix-18077	2021-07-21 09:43:15 +01:00
Germain Souquet	a7cd5fc49b	Shift thumbnail dislay to use object-fit to preserve aspect-ratio	2021-07-21 10:03:10 +02:00
Germain Souquet	6d9ac1de17	Fix font slider preview for message bubbles	2021-07-21 09:34:30 +02:00
Germain Souquet	fee69884a6	Reintroduce grouped events padding on modern layout	2021-07-21 08:57:09 +02:00
Germain Souquet	a6308229fb	Add spoiler support for message bubbles	2021-07-21 08:42:42 +02:00
Jaiwanth	1ed316851a	Merge upstream and resolve conflicts	2021-07-21 11:35:27 +05:30
Šimon Brandner	3993e698bd	Put the call controls close togather ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 17:22:36 +02:00
Travis Ralston	5994111e5d	Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download	2021-07-20 08:55:53 -06:00
Šimon Brandner	0af64504b1	Reverse sidebar order ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 16:53:53 +02:00
Šimon Brandner	15406eaff2	Put the sidebar to the bottom rather than the top ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 16:18:48 +02:00
Šimon Brandner	fadb13e9fb	Center all buttons ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 16:02:02 +02:00
Šimon Brandner	c25feb9b9f	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share	2021-07-20 15:48:25 +02:00
Travis Ralston	4a877300da	Merge pull request #6405 from matrix-org/travis/files-hover ... Remove hover effect from files in the files panel	2021-07-20 07:38:04 -06:00
Šimon Brandner	9e5b149291	Fix event highlighthing ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 14:23:28 +02:00
Šimon Brandner	66a3b0fe5f	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 13:24:05 +02:00
Šimon Brandner	c16827272d	Merge remote-tracking branch 'upstream/develop' into feature/copy-version/17603 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 13:19:31 +02:00
Šimon Brandner	dd6379cf4b	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 13:15:04 +02:00
Germain	53ae7817bc	Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635	2021-07-20 10:22:41 +01:00
Germain Souquet	06c9a060b4	Merge branch 'develop' into gsouquet/message-bubbles-4635	2021-07-20 10:16:21 +02:00
Šimon Brandner	5db20d9431	Fix placeholder centering ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-20 08:54:32 +02:00
Travis Ralston	097cc858ce	Remove hover effect from files in the files panel	2021-07-19 10:07:16 -06:00
Michael Telatynski	de42a00ca4	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 ... Conflicts: src/components/views/avatars/RoomAvatar.tsx test/stores/SpaceStore-test.ts test/test-utils.js	2021-07-19 16:47:31 +01:00
David Baker	863f4d4f9f	Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox ... Fix bug where 'other homeserver' would unfocus	2021-07-19 10:09:03 +01:00
Jaiwanth	fe2cac56f9	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations	2021-07-19 12:57:27 +05:30
Šimon Brandner	e3eac48d05	Cleanup _ReplyPreview.scss ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-17 15:25:54 +02:00
Šimon Brandner	96acd6c9ef	Cleanup _ReplyThread.scss ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-17 15:06:31 +02:00
Šimon Brandner	75fc1299fb	Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies	2021-07-17 08:26:28 +02:00
Šimon Brandner	5c5b79a972	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-17 08:13:51 +02:00
Travis Ralston	d2de9b432c	Apply suggestions from code review ... Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>	2021-07-16 23:50:06 -06:00
Travis Ralston	942cadc8a3	Merge branch 'develop' into travis/notifications-2	2021-07-16 16:20:23 -06:00
Travis Ralston	31d7de628e	Small tweaks	2021-07-16 16:04:23 -06:00
Travis Ralston	b57fff5739	Update visual style and sandbox properly	2021-07-16 15:55:07 -06:00
David Baker	f9b45677d6	Fix bug where 'other homeserver' would unfocus ... It turns out the answer to this was not all that complex: we had two nested <label>s: one for the radio button and one for the Field, which presumably causes both of them to generate click events and focus something and what ends up focused is some kind of race condition depending on, apparently, how fast you click. Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.	2021-07-16 22:27:31 +01:00
Šimon Brandner	16ed5c6645	Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-16 21:43:33 +02:00
Šimon Brandner	18ba7a280d	Give sources a little padding ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-16 21:30:50 +02:00
Šimon Brandner	31f5d012b8	Improve the look and feel of the picker ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-16 21:16:07 +02:00
Šimon Brandner	d512a83a6c	Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-16 19:37:57 +02:00
Šimon Brandner	41d5865dd7	Cleanup _ReplyTile.scss ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-07-16 19:26:04 +02:00
James Salter	9cb3c71afe	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room	2021-07-16 09:34:30 +01:00
James Salter	a1c658f187	Set Menu icon to link	2021-07-16 09:07:52 +01:00