Commit graph

35770 commits

Author SHA1 Message Date
Šimon Brandner
8c635884d9
Add comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 11:05:52 +02:00
Šimon Brandner
456800af21
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:57:51 +02: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
7c805501bc
Cleanup hangup dialogs
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:56:04 +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
f63b6fc0a9
Support for getting reject info
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 10:28:27 +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
4aa8d8ff21
Add missed call icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:36:41 +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
Priit Jõerüüt
02d8a82f99 Translated using Weblate (Estonian)
Currently translated at 98.4% (3032 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-25 02:25:19 +00:00
Jeff Huang
571948d24a Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3080 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-07-25 02:25:16 +00:00
Michael Telatynski
fa550a65af Fix editing of <sub> & <sup> & <u> 2021-07-23 19:01:12 +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
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