Michael Telatynski
|
737aa1c55d
|
delint
|
2021-07-26 12:41:52 +01: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 |
|
Michael Telatynski
|
405fe436a6
|
Merge pull request #6469 from matrix-org/t3chguy/fix/18211
Fix editing of <sub> & <sup> & <u>
|
2021-07-26 09:27:30 +01:00 |
|
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 |
|
Michael Telatynski
|
fa550a65af
|
Fix editing of <sub> & <sup> & <u>
|
2021-07-23 19:01:12 +01: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 |
|
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
|
b89434fcbc
|
avoid abusing spans because you're too lazy to give things a class
|
2021-07-23 16:03:15 +01:00 |
|
Germain Souquet
|
3ce6fcc64b
|
Fix reactions row pushing content on IRC layout
|
2021-07-23 14:58:27 +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 |
|
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 |
|
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 |
|
Michael Telatynski
|
010baabfe6
|
Improve subspaces and some utilities around room/space creation
|
2021-07-23 08:46:20 +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 |
|
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 |
|
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 |
|
Germain
|
6765bb8f4c
|
Merge pull request #6418 from robintown/zoom-to-cursor
|
2021-07-22 15:22:04 +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 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 |
|
Travis Ralston
|
6b54f83b08
|
Merge branch 'develop' into travis/voice-messages/large
|
2021-07-22 04:16:53 -06:00 |
|
Travis Ralston
|
b3d14de181
|
Merge pull request #6435 from matrix-org/travis/voice-messages/duration
Fix duration placeholder parsing for audio files
|
2021-07-22 03:40:43 -06:00 |
|
Travis Ralston
|
0bb0c8105d
|
Merge pull request #6434 from matrix-org/travis/voice-messages/upload-failed
Handle upload errors in voice messages
|
2021-07-22 03:40:26 -06:00 |
|
Travis Ralston
|
98472b4fce
|
Merge pull request #6433 from matrix-org/travis/voice-messages/errors
Render error state for audio components
|
2021-07-22 03:39:47 -06: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 |
|
Michael Telatynski
|
e665e38b7b
|
Merge pull request #6413 from SimonBrandner/ts/address-stuff
|
2021-07-22 09:35:40 +01:00 |
|
Šimon Brandner
|
adc177b28f
|
Fix a naming nit
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
|
2021-07-22 10:30:12 +02:00 |
|
Michael Telatynski
|
9219661d7c
|
Merge pull request #5389 from matrix-org/t3chguy/fix/15536
Fix onPaste handler to work with copying files from Finder
|
2021-07-22 09:22:55 +01:00 |
|
Jaiwanth
|
517e8951ee
|
Apply suggestions from review
|
2021-07-22 08:30:18 +05:30 |
|
Jaiwanth
|
76040c652c
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into spaces-jump-to-room
|
2021-07-22 08:25:24 +05:30 |
|
Travis Ralston
|
05353d0fe5
|
Merge pull request #6388 from aaronraimist/matrix-url-permitted
Add matrix: to the list of permitted URL schemes
|
2021-07-21 20:38:45 -06:00 |
|
Travis Ralston
|
c384575375
|
Merge pull request #6261 from robintown/watch-show-timestamps
Add alwaysShowTimestamps and others to RoomView setting watchers
|
2021-07-21 19:44:04 -06:00 |
|
Travis Ralston
|
c53ed5be2e
|
Use a MediaElementSourceAudioNode to process large audio files
Fixes https://github.com/vector-im/element-web/issues/18149
See comment block contained within diff.
|
2021-07-21 17:53:49 -06:00 |
|
Travis Ralston
|
2addca1ca4
|
Fix duration placeholder parsing for audio files
|
2021-07-21 17:09:34 -06:00 |
|
Travis Ralston
|
079e75aae9
|
Handle upload errors in voice messages
Fixes https://github.com/vector-im/element-web/issues/17148
Mostly adding some try/catch blocks, and a generic dialog.
|
2021-07-21 16:11:10 -06:00 |
|