Commit graph

44651 commits

Author SHA1 Message Date
Kegan Dougal
676c65b55c More tests 2023-01-20 13:27:03 +00:00
Weblate
9c2e2c397c Merge branch 'origin/develop' into Weblate. 2023-01-20 12:55:43 +00:00
Kegan Dougal
744abd935e Linting 2023-01-20 12:46:51 +00:00
RiotRobot
97831d528a Reset matrix-js-sdk back to develop branch 2023-01-20 12:43:40 +00:00
RiotRobot
9e3de5129d v3.64.2 2023-01-20 12:40:54 +00:00
RiotRobot
84984bc18e Prepare changelog for v3.64.2 2023-01-20 12:40:54 +00:00
Kegan Dougal
6a75054e1a More tests 2023-01-20 12:38:58 +00:00
Weblate
91089cc667 Merge branch 'origin/develop' into Weblate. 2023-01-20 12:37:24 +00:00
RiotRobot
e3692ce2e4 v3.64.2 2023-01-20 12:34:04 +00:00
RiotRobot
dd34fe74e0 Prepare changelog for v3.64.2 2023-01-20 12:34:01 +00:00
Weblate
32a9f78d04 Merge branch 'origin/develop' into Weblate. 2023-01-20 12:33:06 +00:00
Michael Weimann
234061c847
Use useTypedEventEmitterState for broadcasts (#9947) 2023-01-20 13:33:00 +01:00
RiotRobot
325cca670c Upgrade matrix-js-sdk to 23.1.1 2023-01-20 12:30:52 +00:00
Weblate
6977dc54e2 Merge branch 'origin/develop' into Weblate. 2023-01-20 10:55:51 +00:00
alunturner
9dbc5f3773
Add quotes to rich text editor (#9932)
* bump rich text editor to 0.20.0
* add new svg for the button
* show the button
* make the composer display look like the timeline display
2023-01-20 10:55:46 +00:00
Kegan Dougal
8e774e1924 Prettier 2023-01-20 10:45:55 +00:00
Kegan Dougal
66d4715e84 Remove accidental import 2023-01-20 10:41:32 +00:00
Kegan Dougal
769fd4a786 TS errors 2023-01-20 10:32:53 +00:00
Kegan Dougal
c685c8e856 Point cypress at a newer version of the proxy 2023-01-20 10:32:53 +00:00
Weblate
60e02edb12 Merge branch 'origin/develop' into Weblate. 2023-01-20 10:21:55 +00:00
Suguru Hirahara
a32d9e63b5 Translated using Weblate (Japanese)
Currently translated at 91.8% (3410 of 3712 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ja/
2023-01-20 10:21:55 +00:00
Florian Duros
ad500973f4
Merge pull request #9948 from matrix-org/florianduros/fix/clear-RTE-earlier
Clear the RTE before sending a message
2023-01-20 11:21:39 +01:00
Florian Duros
075df4d1b3
Call Action.ClearAndFocusSendMessageComposer before sending a message 2023-01-20 10:42:25 +01:00
kegsay
fcde4b7880
Merge branch 'develop' into kegan/lists-as-keys 2023-01-19 16:52:06 +00:00
Weblate
5f9c9c9987 Merge branch 'origin/develop' into Weblate. 2023-01-19 15:49:27 +00:00
alunturner
a63da74f06
Add code blocks to rich text editor (#9921)
* Applies small changes to code block display in timeline
* Makes the composer code block look like the timeline display, but without line numbers
* Adds a button to allow code blocks to be implemented
* Adds tests for the new button
2023-01-19 15:49:21 +00:00
Weblate
ee81e126a9 Merge branch 'origin/develop' into Weblate. 2023-01-19 15:19:13 +00:00
devonh
422802ea6d
Add credentials when calling bootstrapCrossSigning in Cypress tests (#9919) 2023-01-19 16:19:07 +01:00
Kegan Dougal
eed7340663 Add additional tests 2023-01-19 15:02:48 +00:00
Weblate
72e4b46f23 Merge branch 'origin/develop' into Weblate. 2023-01-19 13:43:10 +00:00
Balázs Meskó
a6c34e130d Translated using Weblate (Hungarian)
Currently translated at 100.0% (3712 of 3712 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2023-01-19 13:43:10 +00:00
Florian Duros
314b2e7ba6
Add new style for inline code (#9936)
Add new style for inline code
2023-01-19 13:42:59 +00:00
Kegan Dougal
4db1928bcd Prettier and strict 2023-01-19 12:49:20 +00:00
Kegan Dougal
7c2dd7224f unbreak jest tests 2023-01-19 11:15:08 +00:00
Kegan Dougal
186938d32a prettier 2023-01-19 11:02:43 +00:00
Weblate
467bef1ab1 Merge branch 'origin/develop' into Weblate. 2023-01-19 09:24:34 +00:00
alunturner
8a2e386531
Add disabled button state to rich text editor (#9930)
* add disabled css state
* conditionally apply disabled css state
* hides disabled tooltips
2023-01-19 09:24:29 +00:00
Weblate
c95a5b975a Merge branch 'origin/develop' into Weblate. 2023-01-19 09:17:29 +00:00
waclaw66
cafaf601f6 Translated using Weblate (Czech)
Currently translated at 100.0% (3712 of 3712 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2023-01-19 09:17:29 +00:00
Glandos
07d7255230 Translated using Weblate (French)
Currently translated at 100.0% (3712 of 3712 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
2023-01-19 09:17:27 +00:00
Florian Duros
b47588fc5c
Fix {enter} press in RTE (#9927)
Fix enter combination in RTE
2023-01-19 09:17:18 +00:00
Weblate
92052b42a0 Merge branch 'origin/develop' into Weblate. 2023-01-19 08:03:58 +00:00
Jeff Huang
bc0f53e43d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3712 of 3712 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2023-01-19 08:03:58 +00:00
Michael Weimann
eb43f3449e
Fix the problem that the password reset email has to be confirmed twice (#9926) 2023-01-19 09:03:48 +01:00
RiotRobot
576d103159 Reset matrix-js-sdk back to develop branch 2023-01-18 21:57:43 +00:00
RiotRobot
81d937cd68 Merge branch 'master' into develop 2023-01-18 21:57:18 +00:00
RiotRobot
8219e44596 v3.64.1 2023-01-18 21:57:02 +00:00
RiotRobot
8d4705647b Prepare changelog for v3.64.1 2023-01-18 21:57:00 +00:00
Weblate
d39e2054aa Merge branch 'origin/develop' into Weblate. 2023-01-18 21:54:39 +00:00
Weblate
44a0462bfb Merge branch 'origin/develop' into Weblate. 2023-01-18 21:53:44 +00:00