PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
39128 commits 1 branch 0 tags 338 MiB
Commit graph

39128 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
adb2fa251a Merge branch 'origin/develop' into Weblate. 2021-10-15 14:45:10 +00:00
Germain
495f824f0f
Merge pull request #6957 from matrix-org/gsouquet/fix-appearance-settings 2021-10-15 15:45:05 +01:00
Germain Souquet
ac23afe9f1 Allow EventTile to be rendered with mock events 2021-10-15 15:36:06 +01:00
Weblate
d339398a7c Merge branch 'origin/develop' into Weblate. 2021-10-15 14:35:21 +00:00
Faye Duxovni
1b7277b8f0
Merge pull request #6943 from matrix-org/fayed/emoji-compare-buttons 
Update the button styling on the emoji comparison dialog during cross-signing
 2021-10-15 10:34:25 -04:00
Šimon Brandner
0a6e78fd38
Merge remote-tracking branch 'upstream/develop' into task/colors-4 2021-10-15 16:23:40 +02:00
Weblate
697319357b Merge branch 'origin/develop' into Weblate. 2021-10-15 14:00:25 +00:00
sr093906
9a9d152ada Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3231 of 3231 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-10-15 14:00:25 +00:00
Germain
cee0d6894f
Merge pull request #6951 from matrix-org/gsouquet/fix-thread-root-hidden 2021-10-15 15:00:17 +01:00
Germain Souquet
93fc24c875 Adding renderThreadInfo comment to explain data accessor 2021-10-15 14:47:02 +01:00
Germain Souquet
904147b194 Merge branch 'develop' into gsouquet/fix-thread-root-hidden 2021-10-15 14:45:11 +01:00
Šimon Brandner
ade53a5bd7
Do more re-ordering to keep things working 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:44:41 +02:00
Germain
3ec05c9cbd
Merge pull request #6952 from matrix-org/gsouquet/display-new-thread 2021-10-15 14:41:58 +01:00
Weblate
9ec1df0dfa Merge branch 'origin/develop' into Weblate. 2021-10-15 13:29:24 +00:00
Dariusz Niemczyk
f8c516d927
Add new thread message preview (#18958) (#6953) 
Closes https://github.com/vector-im/element-web/issues/18958
 2021-10-15 14:29:17 +01:00
Šimon Brandner
bc93954577
Remove repeated comment 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:24:19 +02:00
Šimon Brandner
71eeb836d9
Merge remote-tracking branch 'upstream/develop' into task/colors-4 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-10-15 15:23:32 +02:00
Weblate
f8b8b46852 Merge branch 'origin/develop' into Weblate. 2021-10-15 13:17:06 +00:00
Priit Jõerüüt
5a2c3fc702 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3229 of 3229 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-10-15 13:17:06 +00:00
waclaw66
ad16b10a68 Translated using Weblate (Czech) 
Currently translated at 100.0% (3229 of 3229 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-10-15 13:17:03 +00:00
sr093906
193720ff00 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3229 of 3229 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-10-15 13:17:01 +00:00
Glandos
f761723671 Translated using Weblate (French) 
Currently translated at 99.9% (3226 of 3229 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/fr/
 2021-10-15 13:17:00 +00:00
Andy Balaam
9c753765d5
Merge pull request #6955 from andybalaam/table-for-devicespanel 
Switch DevicesPanel to use table (for screen readers)
 2021-10-15 14:16:45 +01:00
Andy Balaam
690893ea6b Merge duplicate CSS selectors 2021-10-15 13:32:39 +01:00
Weblate
b7ab078cba Merge branch 'origin/develop' into Weblate. 2021-10-15 10:57:45 +00:00
Germain
f0ff3a26cc
Merge pull request #6954 from aaronraimist/download-tooltip 2021-10-15 11:57:39 +01:00
Andy Balaam
7edec291ac Switch DevicesPanel to use table (for screen readers) 2021-10-15 11:50:49 +01:00
Aaron Raimist
8cdb1c667d Fix tooltip when downloading unencrypted file 2021-10-15 05:23:59 -05:00
Germain Souquet
6baa6c8f65 Listen to new thread to render info on timeline 2021-10-15 11:08:33 +01:00
Weblate
52dfd8a417 Merge branch 'origin/develop' into Weblate. 2021-10-15 09:27:45 +00:00
Germain
af55ac7b8c
Merge pull request #6950 from matrix-org/gsouquet/threads-replies-compat 
Add 'm.thread' relation to replies when replying to a threaded event
 2021-10-15 10:27:40 +01:00
Germain Souquet
17c4cc91af Reconcile threads root with its children before displaying it 2021-10-15 10:26:04 +01:00
Germain Souquet
3dcf0d0b7e Fix incorrect logic to hide thread relations 2021-10-15 10:25:42 +01:00
Weblate
3b3a80f0af Merge branch 'origin/develop' into Weblate. 2021-10-15 07:59:22 +00:00
Jeff Huang
0f94d6d81c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (3228 of 3228 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2021-10-15 07:59:21 +00:00
waclaw66
6b61cd1267 Translated using Weblate (Czech) 
Currently translated at 100.0% (3228 of 3228 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
 2021-10-15 07:59:16 +00:00
Priit Jõerüüt
318f75fef3 Translated using Weblate (Estonian) 
Currently translated at 100.0% (3228 of 3228 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2021-10-15 07:59:10 +00:00
Germain
2ad11b3af7
Merge pull request #6949 from matrix-org/gsouquet/threads-relations 2021-10-15 08:58:57 +01:00
Germain Souquet
99ad603d91 Merge branch 'develop' into gsouquet/threads-relations 2021-10-15 08:43:51 +01:00
Germain Souquet
5fccbd4ef7 Remove auto-import 2021-10-14 17:40:00 +01:00
Germain Souquet
378536ee2a Add 'm.thread' relation for replies to a threaded event 2021-10-14 17:22:06 +01:00
Germain Souquet
d315641056 Make threads use 'm.thread' relation 2021-10-14 17:04:27 +01:00
Weblate
da1886f0ac Merge branch 'origin/develop' into Weblate. 2021-10-14 15:38:06 +00:00
sr093906
a7365f75b8 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (3228 of 3228 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-10-14 15:38:06 +00:00
Dariusz Niemczyk
2dd6dddc67
Fix incorrect liveTimeline reference (#6948) 
Fixes https://github.com/vector-im/element-web/issues/19400
 2021-10-14 15:37:56 +00:00
Weblate
26557930fa Merge branch 'origin/develop' into Weblate. 2021-10-14 14:43:02 +00:00
sr093906
f8b45aca0f Translated using Weblate (Chinese (Simplified)) 
Currently translated at 99.5% (3212 of 3228 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2021-10-14 14:43:02 +00:00
Dariusz Niemczyk
c31bd8c647
Remove unnecessary adapter in ThreadPanel-test.tsx (#6946) 2021-10-14 15:42:54 +01:00
Weblate
f40559edd8 Merge branch 'origin/develop' into Weblate. 2021-10-14 13:27:45 +00:00
Leonidas Shear
748fe59eaa Translated using Weblate (Russian) 
Currently translated at 98.3% (3158 of 3210 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2021-10-14 13:27:45 +00:00