Commit graph

38634 commits

Author SHA1 Message Date
Germain Souquet
65c7657e3c Pass replacingEventId for edits to appear in thread's view 2021-10-01 14:49:08 +01:00
Šimon Brandner
2571de29bb
Merge remote-tracking branch 'upstream/develop' into fix/auto-avatars 2021-10-01 15:46:35 +02:00
Weblate
94293e6d6d Merge branch 'origin/develop' into Weblate. 2021-10-01 13:35:59 +00:00
Dariusz Niemczyk
1331e960fa
Add ability to properly edit messages in Threads. (#6877)
* Fix infinite rerender loop when editing message

* Refactor "edit_event" to Action.EditEvent

* Make up-arrow edit working in Threads

* Properly handle timeline events edit state

* Properly traverse messages to be edited

* Add MatrixClientContextHOC

* Refactor RoomContext to use AppRenderingContext

* Typescriptify test

Co-authored-by: Germain <germains@element.io>
2021-10-01 15:35:54 +02:00
Weblate
e5fa7c85ac Merge branch 'origin/develop' into Weblate. 2021-10-01 11:29:28 +00:00
Michael Telatynski
5dede230f1
Merge pull request #6891 from matrix-org/t3chguy/fix/18455 2021-10-01 12:29:23 +01:00
Weblate
53ba596a75 Merge branch 'origin/develop' into Weblate. 2021-10-01 11:26:58 +00:00
Michael Telatynski
616dfaebc0
Merge pull request #6892 from matrix-org/t3chguy/ctx-menu-propagation 2021-10-01 12:26:53 +01:00
Weblate
4b40664b1c Merge branch 'origin/develop' into Weblate. 2021-10-01 09:52:45 +00:00
Germain
b86d646fa7
Merge pull request #6893 from jaiwanth-v/voice-export 2021-10-01 10:52:41 +01:00
Jaiwanth
5568d533c0 Handle newer voice message format 2021-10-01 14:52:37 +05:30
Weblate
cb378b0166 Merge branch 'origin/develop' into Weblate. 2021-10-01 09:04:28 +00:00
Besnik Bleta
5a1234b69d Translated using Weblate (Albanian)
Currently translated at 99.7% (3191 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-10-01 09:04:28 +00:00
Dariusz Niemczyk
17f59131d8
Merge pull request #6868 from SimonBrandner/task/colors-3-mk2
Color clean-up #3 mk2
2021-10-01 11:04:15 +02:00
Michael Telatynski
898e4acb4f Don't let click events propagate out of context menus 2021-10-01 10:00:53 +01:00
Michael Telatynski
273a895caa fix logic 2021-10-01 09:25:47 +01:00
Weblate
882dd53c21 Merge branch 'origin/develop' into Weblate. 2021-10-01 08:01:33 +00:00
Ihor Hordiichuk
fa0586af9d Translated using Weblate (Ukrainian)
Currently translated at 66.3% (2121 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2021-10-01 08:01:33 +00:00
Jeff Huang
5f751569ae Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (3198 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-10-01 08:01:29 +00:00
Michael Telatynski
2c42946409
Merge pull request #6876 from matrix-org/t3chguy/fix/space-hierarchy-filter 2021-10-01 09:01:14 +01:00
Michael Telatynski
b84a0300aa Fix leaving space via other client leaving you in undefined-land 2021-10-01 08:58:46 +01:00
Weblate
254bce3ffd Merge branch 'origin/develop' into Weblate. 2021-09-30 18:48:29 +00:00
Travis Ralston
fe0a68b71e
Merge pull request #6869 from SimonBrandner/task/src-ts
Convert `/src` to TS
2021-09-30 12:48:23 -06:00
Weblate
2ef1af8336 Merge branch 'origin/develop' into Weblate. 2021-09-30 16:19:45 +00:00
Priit Jõerüüt
1ddee2f855 Translated using Weblate (Estonian)
Currently translated at 99.9% (3197 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-09-30 16:19:45 +00:00
Germain
88ebbabbd5
Merge pull request #6867 from SimonBrandner/task/custom-compound 2021-09-30 17:19:33 +01:00
Weblate
8f1498beff Merge branch 'origin/develop' into Weblate. 2021-09-30 15:34:39 +00:00
waclaw66
140d11f959 Translated using Weblate (Czech)
Currently translated at 100.0% (3198 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-09-30 15:34:39 +00:00
sr093906
32c4ae53eb Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (3198 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
2021-09-30 15:34:31 +00:00
Szimszon
6268f5deb0 Translated using Weblate (Hungarian)
Currently translated at 99.7% (3191 of 3198 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-09-30 15:34:23 +00:00
Michael Telatynski
7e14601858
Merge pull request #6889 from jaiwanth-v/colour-variable-export 2021-09-30 16:34:11 +01:00
Jaiwanth
1e90043eb3 Change colour variable for export dialog subheading 2021-09-30 20:58:03 +05:30
Michael Telatynski
8ac77c498f Add progress bar to Community to Space migration tool
and invite-one-by-one to workaround Synapse ratelimits
2021-09-30 13:43:59 +01:00
Weblate
88c0d15d54 Merge branch 'origin/develop' into Weblate. 2021-09-30 11:49:38 +00:00
waclaw66
c81c01978e Translated using Weblate (Czech)
Currently translated at 100.0% (3163 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-09-30 11:49:38 +00:00
Ihor Hordiichuk
d068cee54c Translated using Weblate (Ukrainian)
Currently translated at 66.6% (2108 of 3163 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
2021-09-30 11:49:36 +00:00
Michael Telatynski
5eaf0e7e25
Merge pull request #6081 from jaiwanth-v/export-conversations 2021-09-30 12:49:24 +01:00
Jaiwanth
e0267258a4 Initialize css string 2021-09-30 16:24:31 +05:30
Jaiwanth
d264f5f98e Change js-sdk import style 2021-09-29 20:55:09 +05:30
Weblate
25cfd31265 Merge branch 'origin/develop' into Weblate. 2021-09-29 15:06:26 +00:00
Michael Telatynski
c23e698d22
Merge pull request #6885 from matrix-org/t3chguy/fix/19030 2021-09-29 16:06:22 +01:00
Weblate
9101b93ded Merge branch 'origin/develop' into Weblate. 2021-09-29 15:06:19 +00:00
Michael Telatynski
fbf74bea1b
Merge pull request #6886 from matrix-org/t3chguy/fix/19223 2021-09-29 16:06:14 +01:00
Weblate
3684109da4 Merge branch 'origin/develop' into Weblate. 2021-09-29 14:10:59 +00:00
Michael Telatynski
7e47211d4f
Merge pull request #6878 from matrix-org/t3chguy/fix/19192 2021-09-29 15:10:54 +01:00
Jaiwanth
6ccb7e9145 Space after brand 2021-09-29 19:37:31 +05:30
Michael Telatynski
c0b6c001ca Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19192 2021-09-29 15:04:14 +01:00
Jaiwanth
208b914cb0 Merge branch 'develop' into export-conversations 2021-09-29 19:32:05 +05:30
Michael Telatynski
56745f29c0 Fix spaces null-guard breaking the dispatcher settings watching 2021-09-29 15:01:58 +01:00
Michael Telatynski
ad5842c87a Allow closing Dropdown via its chevron 2021-09-29 14:24:12 +01:00