36283 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dariusz Niemczyk	cba87f433b	Fix merge conflicts	2021-08-06 16:31:04 +02: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
Germain	225ac0ae5a	Merge pull request #6568 from benneti/develop ... allow customizing the bubble layout colors	2021-08-06 14:43:33 +01:00
Germain	da79581744	Merge pull request #6567 from SimonBrandner/fix/connecting-states/18404 ... Don't flash "Missed call" when accepting a call	2021-08-06 14:42:31 +01:00
Germain	40eb9ae452	Merge pull request #6571 from SimonBrandner/fix/reply-whitespace/18327 ... Fix clicking whitespaces on replies	2021-08-06 14:34:31 +01:00
Travis Ralston	2c601e0ff1	Merge pull request #6562 from matrix-org/travis/voice-messages/disable-composer ... Fix disabled state for voice messages + send button tooltip	2021-08-06 07:19:58 -06:00
Šimon Brandner	0e041f2e77	Fix clicking whitespaces on replies ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 15:06:11 +02:00
Michael Telatynski	81b70c6955	Merge pull request #6570 from SimonBrandner/feature/call-length/18405	2021-08-06 13:44:14 +01:00
Šimon Brandner	8368aa13ca	length -> duration ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 14:38:53 +02:00
Šimon Brandner	43325eb866	date -> delta ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 14:24:14 +02:00
Dariusz Niemczyk	8ac82457e8	Update src/components/views/voip/PictureInPictureDragger.tsx ... Co-authored-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 14:10:59 +02:00
Šimon Brandner	c1449ff01a	Show call length ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 13:59:26 +02:00
Dariusz Niemczyk	efc63f1f77	Merge pull request #6560 from matrix-org/palid/fix/18384 ... Fix [object Object] in Widget Permissions	2021-08-06 13:59:14 +02:00
Šimon Brandner	5a284b62eb	Add formatCallTime ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 13:57:27 +02:00
Michael Telatynski	381108a9c2	Merge pull request #6227 from SimonBrandner/feature/copy-version/17603	2021-08-06 12:56:38 +01:00
Dariusz Niemczyk	6d4ef6b1a4	Fix [object Object] in Widget Permissions	2021-08-06 13:54:00 +02:00
Dariusz Niemczyk	f6c4412b5f	Remove old translations	2021-08-06 13:30:20 +02:00
Dariusz Niemczyk	e8762fbe5b	Fix merge conflicts	2021-08-06 13:28:53 +02: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
Benedikt Tissot	02be0fd300	allow customizing the bubble layout colors ... - correct fallback values in the _legacy_dark.scss files - read variables to override default values	2021-08-06 13:10:33 +02:00
Michael Telatynski	f7818e0169	iterate PR based on feedback	2021-08-06 12:05:14 +01:00
Šimon Brandner	6d6fa46541	Add connecting states ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 12:42:38 +02: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	b05038ebd5	i18n ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 10:47:59 +02: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	186acf92a9	Wrap in () ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 10:30:38 +02:00
Šimon Brandner	85f5ec3a94	Move LayoutSwitcher into a separate component ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 10:27:18 +02:00
Šimon Brandner	67fdbf97e5	Round percentageOfViewport ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 09:17:00 +02:00
Šimon Brandner	44acded0a0	Use snake case ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 07:55:08 +02:00
Šimon Brandner	f7e750df60	i18n ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 07:54:56 +02:00
Šimon Brandner	015e0b6d77	Make into a labs feature ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 07:51:57 +02:00
Šimon Brandner	5f68ad92d1	Merge remote-tracking branch 'upstream/develop' into feature/collapse-pinned-mels/17938 ... Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>	2021-08-06 07:43:19 +02:00
Travis Ralston	7c1d9b4eda	Merge pull request #6490 from robintown/regional-indicators ... Add regional indicators to emoji picker	2021-08-05 16:02:00 -06:00
Robin Townsend	fef2d408f6	Add comments to isRegionalIndicator ... Signed-off-by: Robin Townsend <robin@robin.town>	2021-08-05 17:56:16 -04: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
Robin Townsend	4ace2353e3	Merge branch 'develop' into regional-indicators	2021-08-05 17:41:37 -04: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	3b73c17465	Merge pull request #6181 from pvagner/voip-a11y ... Make call control buttons accessible to screen reader users	2021-08-05 13:36:17 -06:00
Michael Telatynski	e9b1db6518	Merge pull request #6559 from matrix-org/t3chguy/fix/17906	2021-08-05 20:00:11 +01:00
Travis Ralston	b967465498	Merge pull request #6563 from matrix-org/travis/voice-messages/stop-playing ... Stop voice messages that are playing when starting a recording	2021-08-05 12:56:44 -06:00
Travis Ralston	17a3dc5e6d	Stop voice messages that are playing when starting a recording ... Fixes https://github.com/vector-im/element-web/issues/18410	2021-08-05 12:44:12 -06:00
Travis Ralston	fea30e5f5f	Fix disabled state for voice messages + send button tooltip ... Fixes https://github.com/vector-im/element-web/issues/18413	2021-08-05 12:38:15 -06:00
Travis Ralston	570c2b3292	Merge pull request #6561 from matrix-org/travis/fix-download-frame ... Properly set style attribute on shared usercontent iframe	2021-08-05 11:27:31 -06:00
Travis Ralston	81ddaf2efa	Properly set style attribute on shared usercontent iframe ... Fixes https://github.com/vector-im/element-web/issues/18414	2021-08-05 11:21:22 -06:00
Andrew Morgan	df888a1886	Fix in-call context menus when in PiP mode (#6552) ... Mounting them as children when in PiP mode doesn't work. Condition mounting the context menus as children of the current component based on whether PiP mode is active.	2021-08-05 16:33:22 +01: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