Šimon Brandner
d206a0b8d3
Merge remote-tracking branch 'upstream/develop' into fix/quotes/18199
2021-07-23 18:39:42 +02:00
Šimon Brandner
c6df7e4e41
Style markdown quotes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-23 17:46:49 +02:00
Weblate
12aeab41d3
Merge branch 'origin/develop' into Weblate.
2021-07-23 15:23:43 +00: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
Weblate
e743167e23
Merge branch 'origin/develop' into Weblate.
2021-07-23 15:09:17 +00: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
Weblate
ec6cc9ca68
Merge branch 'origin/develop' into Weblate.
2021-07-23 13:53:03 +00:00
libexus
637121d8bb
Translated using Weblate (German)
...
Currently translated at 97.8% (3014 of 3080 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/de/
2021-07-23 13:53:03 +00:00
Michael Telatynski
c7a24746f5
Merge pull request #6462 from matrix-org/t3chguy/fix/18182
2021-07-23 14:52:56 +01:00
Germain Souquet
3ce6fcc64b
Fix reactions row pushing content on IRC layout
2021-07-23 14:58:27 +02:00
Weblate
5967bd9f23
Merge branch 'origin/develop' into Weblate.
2021-07-23 12:24:03 +00:00
Besnik Bleta
4382f4374d
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (3072 of 3080 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-07-23 12:24:03 +00: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
Weblate
e877fbcf5a
Merge branch 'origin/develop' into Weblate.
2021-07-23 10:48:40 +00:00
Danial Behzadi
81b7c32e7d
Translated using Weblate (Persian)
...
Currently translated at 93.6% (2885 of 3080 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fa/
2021-07-23 10:48:40 +00:00
random
cd646d22c4
Translated using Weblate (Italian)
...
Currently translated at 99.9% (3079 of 3080 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2021-07-23 10:48:37 +00: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
Germain Souquet
dcfd5d4793
Overlay avatar on top of bubbles
2021-07-23 12:12:52 +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
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
Weblate
28bfc7cc78
Merge branch 'origin/develop' into Weblate.
2021-07-23 08:09:26 +00:00
Priit Jõerüüt
a449fb2aba
Translated using Weblate (Estonian)
...
Currently translated at 99.2% (3026 of 3049 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-23 08:09:25 +00: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
Weblate
ac8d146b2d
Merge branch 'origin/develop' into Weblate.
2021-07-23 07:10:54 +00: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
Weblate
41e06c597e
Merge branch 'origin/develop' into Weblate.
2021-07-23 07:10:41 +00: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
Weblate
0aaaa07bc3
Merge branch 'origin/develop' into Weblate.
2021-07-23 05:12:10 +00:00
Jeff Huang
e58a2c31e0
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (3049 of 3049 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-23 05:12:10 +00:00
Michael Telatynski
d8d0a21e47
Merge pull request #6450 from SimonBrandner/fix/url-scroll/18028
2021-07-23 06:12:02 +01:00
Weblate
1781994f01
Merge branch 'origin/develop' into Weblate.
2021-07-22 21:56:09 +00:00
iaiz
8b511bf989
Translated using Weblate (Spanish)
...
Currently translated at 99.5% (3036 of 3049 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/es/
2021-07-22 21:56:09 +00: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
bb0be4ba72
Add customisation point for declaring widget variables
...
Fixes https://github.com/vector-im/element-web/issues/18035 (indirectly; issue is on a non-standard version of Element).
This has an isReady() step because the variable usage code path cannot be made async, so instead we let the async loading state happen in the prepare() stage. This is required for the intended usecase.
2021-07-22 15:43:18 -06: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
Weblate
361e03604f
Merge branch 'origin/develop' into Weblate.
2021-07-22 15:16:38 +00:00