mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 15:42:17 +03:00
Code Issues Projects Releases Packages Wiki Activity
29335 commits 219 branches 562 tags 474 MiB
Commit graph

29335 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
1042a84248 Merge branch 'origin/develop' into Weblate. 2020-10-05 23:32:10 +00:00
Michael Telatynski
1e34365caa
Merge pull request #5268 from matrix-org/t3chguy/fix/15349 
Fix right panel for peeking rooms
 2020-10-06 00:32:05 +01:00
Weblate
da7c0258c2 Merge branch 'origin/develop' into Weblate. 2020-10-05 21:40:55 +00:00
Hubert Chathi
f5f0686586
Merge pull request #5239 from uhoreg/dehydration 
Add support for dehydrated devices
 2020-10-05 17:40:49 -04:00
Weblate
98212b225e Merge branch 'origin/develop' into Weblate. 2020-10-05 13:46:19 +00:00
random
882648a918 Translated using Weblate (Italian) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
 2020-10-05 13:46:19 +00:00
Michael Telatynski
fdb8cb78f9
Merge pull request #5277 from matrix-org/t3chguy/fix/9551 
Use Own Profile Store for the Profile Settings
 2020-10-05 14:46:12 +01:00
Michael Telatynski
cf37f0abf2 Fix the AvatarSetting avatar getting crushed by the flexbox 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-05 12:54:01 +01:00
Weblate
7a2ef99d54 Merge branch 'origin/develop' into Weblate. 2020-10-05 11:31:08 +00:00
Jeff Huang
d149548d13 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-10-05 11:31:08 +00:00
Michael Telatynski
4f52afdb3c
Merge pull request #5270 from matrix-org/t3chguy/rs/3620 
null-guard defaultAvatarUrlForString
 2020-10-05 12:31:01 +01:00
Sorunome
34c15b5221
fix img tags not always being rendered correctly 2020-10-05 09:50:19 +02:00
sagu
c791330145 Translated using Weblate (Slovenian) 
Currently translated at 0.9% (22 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sl/
 2020-10-04 17:05:09 +00:00
@a2sc:matrix.org
dcb4771d61 Translated using Weblate (German) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-04 17:05:09 +00:00
Xose M
46266cb739 Translated using Weblate (Galician) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
 2020-10-04 17:05:09 +00:00
Priit Jõerüüt
73a2c18e87 Translated using Weblate (Estonian) 
Currently translated at 100.0% (2371 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-10-04 17:05:08 +00:00
Hubert Chathi
49cc62ca43 Oh right. Run i18n again. 2020-10-02 17:48:13 -04:00
Hubert Chathi
c1765c857e apply changes from review 2020-10-02 17:43:49 -04:00
Weblate
7210b8e80a Merge branch 'origin/develop' into Weblate. 2020-10-02 21:15:53 +00:00
Nikita Epifanov
f5a3915046 Translated using Weblate (Russian) 
Currently translated at 99.9% (2370 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-10-02 21:15:52 +00:00
Michael Telatynski
01031e33cb
Merge pull request #5257 from matrix-org/t3chguy/fix/14112 
Choose first result on enter in the emoji picker
 2020-10-02 22:15:47 +01:00
Weblate
d03d228411 Merge branch 'origin/develop' into Weblate. 2020-10-02 17:29:23 +00:00
Michael Telatynski
489c5b9b0a
Merge pull request #5276 from michel-zimmer/room-directory-clipped-uris 
Fix room directory clipping links in the room's topic
 2020-10-02 18:29:19 +01:00
Weblate
aeba605816 Merge branch 'origin/develop' into Weblate. 2020-10-02 17:19:10 +00:00
Michael Telatynski
a6246a7e9f
Merge pull request #5278 from matrix-org/t3chguy/fix/15362 
Decorate failed e2ee downgrade attempts better
 2020-10-02 18:19:05 +01:00
Weblate
5ca3b8648e Merge branch 'origin/develop' into Weblate. 2020-10-02 17:18:40 +00:00
Michael Telatynski
6caf53bd1e
Merge pull request #5262 from matrix-org/t3chguy/fix/15286 
MELS use latest avatar rather than the first avatar
 2020-10-02 18:18:36 +01:00
Weblate
4e095fb57b Merge branch 'origin/develop' into Weblate. 2020-10-02 17:18:25 +00:00
Michael Telatynski
f01ea32397
Merge pull request #5261 from matrix-org/t3chguy/fix/15279 
Fix Encryption Panel close button clashing with Base Card
 2020-10-02 18:18:20 +01:00
Michel Zimmer
58bbbf31b9 Fix room directory clipping links in the room's topic 
Signed-off-by: Michel Zimmer <opensource@michel-zimmer.de>
 2020-10-02 18:00:58 +02:00
Michael Telatynski
cc43de6ebf add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:46:27 +01:00
Michael Telatynski
7d11c3092d Decorate failed e2ee downgrade attempts better 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 16:38:02 +01:00
Michael Telatynski
d3cbb51ecb Use Own Profile Store for the Profile Settings 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-10-02 15:39:34 +01:00
Weblate
d7d3003366 Merge branch 'origin/develop' into Weblate. 2020-10-02 13:30:30 +00:00
@a2sc:matrix.org
62a62b0289 Translated using Weblate (German) 
Currently translated at 100.0% (2370 of 2370 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-10-02 13:30:30 +00:00
FeralMeow
b50fcd98f6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 97.3% (2307 of 2371 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-10-02 13:30:30 +00:00
Travis Ralston
fd441f7bba
Merge pull request #5275 from matrix-org/travis/e2e/skip-if-not-possible 
Wrap canEncryptToAllUsers in a try/catch to handle server errors
 2020-10-02 07:30:23 -06:00
Hubert Chathi
bd9cebe35d oh right, I need to run the i18n script too 2020-10-01 21:52:28 -04:00
Hubert Chathi
dd57e94c68 Merge remote-tracking branch 'upstream/develop' into dehydration 2020-10-01 21:42:28 -04:00
Hubert Chathi
0db81e4093 add a feature flag for dehydration 2020-10-01 21:41:03 -04:00
Hubert Chathi
503f32948c try to unlock secret storage with dehydration key 2020-10-01 21:40:49 -04:00
Travis Ralston
60d5e732d9 Wrap canEncryptToAllUsers in a try/catch to handle server errors 
Fixes https://github.com/vector-im/element-web/issues/12266
 2020-10-01 18:58:13 -06:00
Weblate
ee230cfbdb Merge branch 'origin/develop' into Weblate. 2020-10-01 20:02:11 +00:00
Travis Ralston
c6834fd428
Merge pull request #5274 from matrix-org/travis/fix-community-join 
Fix conditional on communities prototype room creation dialog
 2020-10-01 14:02:06 -06:00
Travis Ralston
153e63b6aa Fix conditional on communities prototype room creation dialog 2020-10-01 13:44:16 -06:00
Weblate
f30ae8af12 Merge branch 'origin/develop' into Weblate. 2020-10-01 16:59:32 +00:00
Michael Telatynski
e52e33f5a1
Merge pull request #5271 from matrix-org/t3chguy/fix/14851 
Fix ensureDmExists for encryption detection
 2020-10-01 17:59:27 +01:00
Weblate
36ea650717 Merge branch 'origin/develop' into Weblate. 2020-10-01 16:16:07 +00:00
Travis Ralston
cca9b91aca
Merge pull request #5171 from matrix-org/travis/widget-api 
Switch to using the Widget API SDK for widget messaging
 2020-10-01 10:16:01 -06:00
Travis Ralston
d640490595 Fix iframe reference 2020-10-01 10:03:52 -06:00