Michael Telatynski
|
869a5fb5c7
|
Merge pull request #6467 from matrix-org/t3chguy/fix/18110
|
2021-07-23 18:21:43 +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
|
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 |
|
Germain Souquet
|
472ead41fb
|
Make images fit inside message bubble
|
2021-07-22 16:05:09 +02: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
|
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 |
|
Travis Ralston
|
5994111e5d
|
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
|
2021-07-20 08:55:53 -06:00 |
|
Michael Telatynski
|
d3934ff7da
|
Merge branch 'develop' into t3chguy/eslint
|
2021-07-20 11:08:13 +01:00 |
|
Šimon Brandner
|
5db20d9431
|
Fix placeholder centering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 08:54:32 +02:00 |
|
Michael Telatynski
|
ce78cdf4ad
|
Conform to new react and typescript eslint rules
|
2021-07-19 22:43:11 +01:00 |
|
Šimon Brandner
|
5d5b9f6022
|
Better labeling of images and stickers
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-19 18:04:33 +02:00 |
|
Travis Ralston
|
4d38218e24
|
Appease the linter
|
2021-07-16 16:11:27 -06:00 |
|
Travis Ralston
|
623f2e7613
|
Only show download link below media if it's not in the timeline
|
2021-07-16 15:12:36 -06:00 |
|
Travis Ralston
|
d156a56603
|
Share body prop types with an interface
|
2021-07-16 15:12:36 -06:00 |
|
Travis Ralston
|
5fce0ccd9d
|
Convert images, audio, and voice messages over to the new helper
|
2021-07-16 15:12:36 -06:00 |
|
Šimon Brandner
|
4afd985e7e
|
Kill off _afterComponentWillUnmount
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-14 09:55:14 +02:00 |
|
Šimon Brandner
|
bde26a809a
|
Omit onFinished
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-14 09:54:33 +02:00 |
|
Šimon Brandner
|
866a11d7e3
|
Fix image alignment issues
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 11:49:49 +02:00 |
|
Šimon Brandner
|
ef1a1ebe12
|
TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:21:33 +02:00 |
|
Šimon Brandner
|
e4d1859fb7
|
Ret type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:21:05 +02:00 |
|
Šimon Brandner
|
4cf4ab2266
|
Return type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:20:40 +02:00 |
|
Šimon Brandner
|
af7769ce93
|
Types!
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:20:13 +02:00 |
|
Šimon Brandner
|
86580f3f20
|
current target
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:19:45 +02:00 |
|
Šimon Brandner
|
6193bc2a82
|
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:19:19 +02:00 |
|
Šimon Brandner
|
fa4977c4da
|
Use current target
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:18:34 +02:00 |
|
Šimon Brandner
|
bdbd03c4ff
|
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:18:05 +02:00 |
|
Šimon Brandner
|
2a403f6cfe
|
Remove additional ?
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:17:18 +02:00 |
|
Šimon Brandner
|
5fc35565df
|
More TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:16:53 +02:00 |
|
Šimon Brandner
|
8f8377a71c
|
Types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 09:16:01 +02:00 |
|
Šimon Brandner
|
2e295a94ed
|
Don't export IProps
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-13 08:17:51 +02:00 |
|
Šimon Brandner
|
b7af39ffff
|
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-08 17:17:34 +02:00 |
|
Šimon Brandner
|
5d78eb4a75
|
Member delimiter rules
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 14:01:30 +02:00 |
|
Šimon Brandner
|
5f49b2d374
|
Missing args
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 13:55:39 +02:00 |
|
Šimon Brandner
|
869f31deef
|
Convert MImageBody to TS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 13:46:42 +02:00 |
|