Commit graph

36719 commits

Author SHA1 Message Date
Germain Souquet
46a370a818 Fix deleted message left offset in the timeline 2021-07-26 11:01:37 +02:00
Šimon Brandner
1d629f2557
More TS
Co-authored-by: Germain <germain@souquet.com>
2021-07-26 10:34:59 +02:00
Weblate
62d16c9adf Merge branch 'origin/develop' into Weblate. 2021-07-26 08:27:35 +00:00
Michael Telatynski
405fe436a6
Merge pull request #6469 from matrix-org/t3chguy/fix/18211
Fix editing of <sub> & <sup> & <u>
2021-07-26 09:27:30 +01:00
Germain Souquet
2577211855 Make CallEvent tiles the same width all the time 2021-07-26 09:42:17 +02:00
Jaiwanth
ad1da9ea82 Delint2 2021-07-26 13:03:15 +05:30
Jaiwanth
06d84a16d0 Delint 2021-07-26 12:58:17 +05:30
Germain Souquet
468887415a Merge branch 'develop' into gsouquet/fix-18144 2021-07-26 09:25:31 +02:00
Germain
774e743741
Update res/css/views/rooms/_EventBubbleTile.scss 2021-07-26 08:16:13 +01:00
Jaiwanth
30a64a1b5a Gray out and hide some options during export 2021-07-26 12:41:36 +05:30
Weblate
8b33616aef Merge branch 'origin/develop' into Weblate. 2021-07-26 06:46:56 +00:00
Germain
dbe24fab70
Merge pull request #6461 from matrix-org/gsouquet/fix-18128 2021-07-26 07:46:52 +01:00
Germain
c7bbb497f9
Merge branch 'develop' into gsouquet/fix-18128 2021-07-26 07:41:42 +01:00
Weblate
ae0078c7ba Merge branch 'origin/develop' into Weblate. 2021-07-26 06:41:04 +00:00
Priit Jõerüüt
418aee4c4c Translated using Weblate (Estonian)
Currently translated at 98.7% (3043 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-07-26 06:41:04 +00:00
jelv
92394ac996 Translated using Weblate (Dutch)
Currently translated at 99.0% (3052 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-07-26 06:41:00 +00:00
a5r0n
ee92c09927 Translated using Weblate (Hebrew)
Currently translated at 83.7% (2581 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
2021-07-26 06:40:57 +00:00
NetanelHarris
2c2031a07b Translated using Weblate (Hebrew)
Currently translated at 83.7% (2581 of 3080 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/he/
2021-07-26 06:40:57 +00: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
Jaiwanth
9fe64c34a5 Delint 2021-07-26 00:24:04 +05:30
Jaiwanth
b04bfeda33 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations 2021-07-26 00:18:56 +05:30
Jaiwanth
2487fe7380 Delint 2021-07-26 00:13:52 +05:30
Jaiwanth
3d4d1d32d9 Modify design according to the design team 2021-07-26 00:09:59 +05:30
Šimon Brandner
3ef20174f3
Fix issues with the controls disappearing
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 18:11:29 +02:00
Šimon Brandner
1754602613
Increase CONTROLS_HIDE_DELAY
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:30:59 +02:00
Šimon Brandner
03a8308ae8
Fix call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:24:18 +02:00
Šimon Brandner
a8d27746b4
Show dialpad only when PSTN supported
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 17:07:18 +02:00
Š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
Šimon Brandner
3287d51b17
Add some return types
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-25 08:06:11 +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
Šimon Brandner
f2204aa1ff
Remove nonsense comment
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:12:29 +02:00
Šimon Brandner
379101e3ff
Remove an unused member
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:09:00 +02:00
Šimon Brandner
85095df4b9
i18n
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 21:03:26 +02:00
Šimon Brandner
1f9cd79bcf
Fix some spacing and other tiny things
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:59:15 +02:00
Šimon Brandner
396fd2d012
Move silence button
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 20:39:44 +02:00
Šimon Brandner
064544369a
Add call type icon
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:30:37 +02:00
Šimon Brandner
25d62983de
Add button icons
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 19:12:12 +02:00
Šimon Brandner
a6f10a4aaa
Move around some CSS
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 18:59:54 +02:00
Šimon Brandner
dd800549d7
Fix the silence icon color
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-24 14:06:52 +02:00