Commit Graph

35527 Commits (50c27ebed7744423ee4799bcf2d4d597d90810b7)

Author SHA1 Message Date
Š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
Michael Telatynski 869a5fb5c7
Merge pull request #6467 from matrix-org/t3chguy/fix/18110 2021-07-23 18:21:43 +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
Michael Telatynski 5f2582395f Fix blurhash rounded corners missing regression 2021-07-23 16:21:59 +01:00
Michael Telatynski 3c1902c26a Update matrix-org-eslint-plugin 2021-07-23 16:09:41 +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 5fb96eba05 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1 2021-07-23 16:08:37 +01:00
Michael Telatynski c7a24746f5
Merge pull request #6462 from matrix-org/t3chguy/fix/18182 2021-07-23 14:52:56 +01:00
Germain 3556384d80
Merge pull request #6463 from matrix-org/gsouquet/fix-18100
Fix clipped avatar in room list
2021-07-23 13:23:49 +01: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
Germain 3429f73efc
Merge pull request #6460 from matrix-org/gsouquet/fix-18126
Make inline events feel less claustrophobic in bubble layout
2021-07-23 11:48:21 +01:00
Michael Telatynski 4a4ec596bd Fix position of the space hierarchy spinner 2021-07-23 11:27:00 +01: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
Germain Souquet f99c0fad3e Make inline events feel less claustrophobic in bubble layout 2021-07-23 11:40:34 +02: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
Michael Telatynski cd77b9f1af merge two opposing if statements 2021-07-23 08:55:16 +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
Germain aac01171b2
Merge pull request #6448 from matrix-org/gsouquet/fix-18162
Make images fit inside message bubble
2021-07-23 08:10:37 +01:00
Michael Telatynski d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028 2021-07-23 06:12:02 +01:00
David Baker 46646eed06
Merge pull request #6456 from matrix-org/dbkr/fix_images_without_thumbnail
Fix display of image messages that lack thumbnails
2021-07-22 22:55:58 +01:00
David Baker d38f2cf5b5 Fix display of image messages that lack thumbnails
Fixes https://github.com/vector-im/element-web/issues/18175
2021-07-22 22:49:30 +01:00
Travis Ralston c427612c24 de-dupe audio player
Fixes https://github.com/vector-im/element-web/issues/18161
2021-07-22 12:14:38 -06: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
Travis Ralston e1bb04f45a Remove answered TODOs 2021-07-22 09:27:38 -06:00
Travis Ralston eec63574e6 Move src/voice to src/audio for better naming
Many of these files are used by Audio and Voice messages.

Fixes https://github.com/vector-im/element-web/issues/18131
2021-07-22 09:26:26 -06: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
Š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 6765bb8f4c
Merge pull request #6418 from robintown/zoom-to-cursor 2021-07-22 15:22:04 +01: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 324037298a
Merge pull request #6447 from matrix-org/gsouquet/fix-18176
Use modern layout in file and notification panel
2021-07-22 15:11:27 +01:00
Germain Souquet 472ead41fb Make images fit inside message bubble 2021-07-22 16:05:09 +02:00
Germain Souquet 02b08888b5 Use modern layout in file and notification panel 2021-07-22 16:00:41 +02:00
Robin Townsend 5d4b293e0a Add comment about modulo operator
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-22 09:56:26 -04:00
Robin Townsend 9e0720a6c4 Rename zoom anchor variables for clarity
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-22 09:48:56 -04:00
Robin Townsend 875b46bacb Don't zoom images when the cursor isn't over the image
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-22 09:46:29 -04:00
Robin Townsend b99a6a8d54 Use typeof to check for presence of parameters
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-22 09:41:39 -04:00
Robin Townsend 3bf742f7aa Merge branch 'develop' into zoom-to-cursor 2021-07-22 09:39:52 -04: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 f9e8e66ac6
Merge pull request #6445 from matrix-org/gsouquet/fix-18127
Fix event tile cut off in share preview
2021-07-22 14:28:06 +01:00
Germain 817482700c
Merge pull request #6443 from matrix-org/gsouquet/fix-18178
Remove excessive padding after url previews
2021-07-22 14:27:38 +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
Germain Souquet 552770c15a Remove excessive padding after url previews 2021-07-22 14:24:49 +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