Commit graph

35874 commits

Author SHA1 Message Date
Michael Telatynski
05a9023bac delint and tidy code 2021-07-23 18:31:31 +01:00
Michael Telatynski
1ba601ba22 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
 Conflicts:
	src/components/structures/SpaceRoomView.tsx
	src/components/views/dialogs/BetaFeedbackDialog.tsx
2021-07-23 18:28:21 +01:00
Weblate
13e6aabb48 Merge branch 'origin/develop' into Weblate. 2021-07-23 17:21:52 +00:00
Priit Jõerüüt
c87615c6a7 Translated using Weblate (Estonian)
Currently translated at 98.2% (3026 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-23 17:21:52 +00:00
Michael Telatynski
869a5fb5c7
Merge pull request #6467 from matrix-org/t3chguy/fix/18110 2021-07-23 18:21:43 +01:00
Š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
Michael Telatynski
b89434fcbc avoid abusing spans because you're too lazy to give things a class 2021-07-23 16:03:15 +01:00
Michael Telatynski
dec2c48155 remove unused import and revert removing some needed css 2021-07-23 15:56:00 +01:00
Michael Telatynski
1d1a396c1f get rid of spurious hr 2021-07-23 15:51:59 +01:00
Michael Telatynski
7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Michael Telatynski
9c7fa71a4a Remove spaces beta feedback prompts except a couple more strategic ones 2021-07-23 15:07:24 +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
43f809ccc8 Fix call events layout for message bubble 2021-07-23 15:15:44 +02: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
Michael Telatynski
010baabfe6 Improve subspaces and some utilities around room/space creation 2021-07-23 08:46:20 +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