Commit Graph
35528 Commits
Author SHA1 Message Date
Šimon Brandner ddd4b4bc12 Show a "Your camera is turned off" toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 18:22:47 +02:00
GermainandGitHub 0d8309c8fc Merge pull request #6429 from matrix-org/gsouquet/fix-18146 2021-07-21 17:17:51 +01: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
David BakerandGitHub 6afa3fa3ab Merge pull request #6430 from matrix-org/dbkr/yarn_upgrade_210721
yarn upgrade
2021-07-21 16:59:24 +01: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
David Baker a6c432d66f fix types
in varyingly hacky ways
2021-07-21 16:39:41 +01:00
Germain Souquet 26ca41f699 Cache room member count on the messagePanel 2021-07-21 17:26:41 +02:00
Šimon Brandner 0a8067506f Adjust hiding local feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 17:12:27 +02:00
Germain Souquet 43d62aa8c1 Use more performant getMembersCount to decide to hide or show sender 2021-07-21 16:43:57 +02:00
David Baker 35e74db25e yarn upgrade 2021-07-21 15:41:16 +01:00
Šimon Brandner 337664a1b4 Update sidebar behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:34:21 +02:00
Šimon Brandner 74649f1f92 Correct feed ordering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:21:52 +02:00
Šimon Brandner 2014517173 Always show screensharing feed as primary
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:20:09 +02:00
GermainandGitHub 80e64601a9 Merge pull request #6427 from matrix-org/gsouquet/fix-18120
Improve new layout switcher UI
2021-07-21 15:11:58 +01:00
GermainandGitHub 22375e2108 Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-21 15:11:49 +01:00
Germain Souquet e5bc5a933e Use cached value to read member count 2021-07-21 16:10:18 +02:00
Šimon Brandner 51cf426179 Update the toast
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 16:08:18 +02:00
Travis RalstonandGitHub 34b8870a95 Merge pull request #6417 from matrix-org/travis/voice-messages/play-1
Play only one audio file at a time
2021-07-21 07:58:46 -06:00
Šimon Brandner be52eba027 Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share 2021-07-21 15:56:08 +02:00
Michael TelatynskiandGitHub cdac3f9f5d Merge pull request #6404 from SimonBrandner/fix/file-label-behaviour 2021-07-21 14:38:47 +01:00
Šimon Brandner e8760736ba Merge remote-tracking branch 'upstream/develop' into fix/file-label-behaviour
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-21 15:33:06 +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
GermainandGitHub e4c6833085 Merge pull request #6425 from matrix-org/gsouquet/fix-18099 2021-07-21 12:02:51 +01:00
GermainandGitHub 32e7c58747 Merge branch 'develop' into gsouquet/fix-18099 2021-07-21 11:57:29 +01:00
GermainandGitHub 45967c80f3 Merge pull request #6426 from matrix-org/gsouquet/event-tile-null-guard
Add null guard for room prop in EventTile
2021-07-21 11:56:43 +01:00
GermainandGitHub 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
GermainandGitHub 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
Germain Souquet ae51653348 Add null guard for room prop in EventTile 2021-07-21 12:41:02 +02:00
Michael TelatynskiandGitHub 5a7fe60d0e Merge pull request #6416 from robintown/non-emoji-reactions 2021-07-21 11:30:15 +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
GermainandGitHub 6308dabcfe Remove forgotten code comment 2021-07-21 10:43:48 +01:00
Michael Telatynski a58edcb241 tweak copy 2021-07-21 10:43:12 +01:00
Germain Souquet ef002a2e22 Fix replies line clamping 2021-07-21 11:41:52 +02:00
GermainandGitHub dfa85b00d0 Merge pull request #6423 from matrix-org/gsouquet/fix-18077 2021-07-21 09:43:15 +01:00
GermainandGitHub 8e01080711 Merge pull request #6420 from matrix-org/gsouquet/fix-18079
Reintroduce grouped events padding on modern layout
2021-07-21 09:14:07 +01:00
b31b8f1b41 Remove old container sizing comment
Co-authored-by: James Salter <jamess@element.io>
2021-07-21 09:13:12 +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 794c49c5db Migrate MStickerBody to TypeScript 2021-07-21 09:52:09 +02:00
GermainandGitHub ae60692e88 Merge pull request #6412 from matrix-org/gsouqet/ts-migration-1 2021-07-21 08:36:08 +01:00
Germain Souquet 6d9ac1de17 Fix font slider preview for message bubbles 2021-07-21 09:34:30 +02:00
Germain Souquet 54841d63dc Fix wrench-tests by importing EmbeddedPage through sdk.getComponent 2021-07-21 09:29:33 +02:00
Robin Townsend 1d1d93ed14 Apply code review suggestion
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 03:17:55 -04: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
Robin Townsend 0497e0864f Fix types
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 02:42:30 -04:00
Robin Townsend 3911666c52 Zoom images to where the cursor points
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-21 02:25:34 -04:00
Travis Ralston 45f9f3e13e Name functions better 2021-07-20 23:34:27 -06:00