Šimon Brandner
|
b9e305daae
|
Delete mistake line
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 16:26:46 +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 |
|
David Baker
|
5ead53b36a
|
Merge pull request #6483 from SimonBrandner/fix/dont-anim-resize/18261
Fix PiP resize issues
|
2021-07-27 14:42:04 +01:00 |
|
Šimon Brandner
|
f532c302b6
|
Don't animate when resizing and move when the PiP changes size
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 15:31:54 +02:00 |
|
Šimon Brandner
|
001490f70d
|
Fix unused resize listener
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-27 15:30:44 +02:00 |
|
Germain Souquet
|
8104ba936c
|
Add data-layout to MELS for better CSS structure
|
2021-07-27 11:30:25 +02: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 |
|
Šimon Brandner
|
29b0d03fe4
|
Update copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-26 21:27:22 +02: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 |
|
Šimon Brandner
|
a2c7035163
|
Tweak copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:57:46 +02:00 |
|
Šimon Brandner
|
f7087d5148
|
Add declined state
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 10:30:53 +02:00 |
|
Šimon Brandner
|
4784ddc175
|
Add state for when the remote doesn't pick up
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-25 08:57:29 +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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 Souquet
|
472ead41fb
|
Make images fit inside message bubble
|
2021-07-22 16:05:09 +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
|
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 |
|
Šimon Brandner
|
f4287fc3ab
|
Simplifie sidebar showing logic
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 11:16:16 +02:00 |
|
Šimon Brandner
|
33abe83dad
|
Always hide all feeds
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 10:39:00 +02:00 |
|
Michael Telatynski
|
e665e38b7b
|
Merge pull request #6413 from SimonBrandner/ts/address-stuff
|
2021-07-22 09:35:40 +01: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 |
|
Šimon Brandner
|
89983820df
|
Fix dumb typo
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:49:37 +02:00 |
|
Šimon Brandner
|
6429b3c8bd
|
Only show toast about camera in video calls
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:23:37 +02:00 |
|
Šimon Brandner
|
37335b2c79
|
Show toast even for non-presenters
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-22 09:19:47 +02:00 |
|