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

29975 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Merrick
cf8c98e076 More explicit reference checking 2020-12-02 12:34:43 +13:00
Weblate
04001e22f9 Merge branch 'origin/develop' into Weblate. 2020-12-01 20:40:33 +00:00
Hassan Algoz
89eaa9654f Translated using Weblate (Arabic) 
Currently translated at 53.9% (1458 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ar/
 2020-12-01 20:40:32 +00:00
MSG-maniac
58ed858f40 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 83.2% (2250 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hans/
 2020-12-01 20:40:23 +00:00
Nikita Epifanov
3a3e42e439 Translated using Weblate (Russian) 
Currently translated at 88.1% (2383 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-12-01 20:40:20 +00:00
Travis Ralston
3b9a1d90af
Merge pull request #5459 from matrix-org/travis/pinned-fixes 
Add sanity checking around widget pinning
 2020-12-01 13:40:09 -07:00
Travis Ralston
5df6932051 Add various amounts of sanity checking for widget pinning 
This should also help https://github.com/vector-im/element-web/issues/15705 by either implicitly fixing the problem, causing chaos as described in the issue, or by forcing a crash to identify the problem more easily.
 2020-12-01 13:19:51 -07:00
Travis Ralston
bd1de8d45b Require a room ID for WidgetStore's pinned widget contracts 
This should alleviate https://github.com/vector-im/element-web/issues/15705 from happening, though the cause is still unknown.

Requiring a room ID is safe for this because only room widgets can be pinned, and widget IDs are not globally unique which means from a logical standpoint the contract still makes sense here.
 2020-12-01 13:05:48 -07:00
Michael Telatynski
d8e46c7797 Merge remote-tracking branch 'origin/t3chguy/socials' into t3chguy/socials 
# Conflicts:
#	src/i18n/strings/en_EN.json
 2020-12-01 16:39:51 +00:00
Michael Telatynski
e0b68441bc i18n 2020-12-01 16:39:26 +00:00
nurjinn jafar
111515e794 fixed linter problem 2020-12-01 17:37:28 +01:00
Michael Telatynski
eb25c39318 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials 
 Conflicts:
	src/i18n/strings/en_EN.json
 2020-12-01 16:33:29 +00:00
nurjinn jafar
1bf7ff8994 null check added 
path to confetti fixed after refactoring
 2020-12-01 17:15:02 +01:00
Michael Telatynski
ba542f291b
Merge branch 'develop' into t3chguy/socials 2020-12-01 15:50:07 +00:00
David Baker
31044b68d1 Merge remote-tracking branch 'origin/develop' into dbkr/hold_ui 2020-12-01 15:09:25 +00:00
David Baker
d3b1ec0648 Revert unintentional part of 4ca35fabef 2020-12-01 15:08:59 +00:00
David Baker
4ca35fabef Visual tweaks 2020-12-01 13:44:24 +00:00
Michael Telatynski
26e1cdb82c Update i18n 2020-12-01 12:04:41 +00:00
Weblate
f6532859fd Merge branch 'origin/develop' into Weblate. 2020-11-30 20:43:09 +00:00
Travis Ralston
2d74bb0dcc
Merge pull request #5457 from CodingAnonymous/patch-1 
Update i18n for Appearance User Settings
 2020-11-30 13:43:01 -07:00
Travis Ralston
9b6f93da5f Update i18n 2020-11-30 13:42:29 -07:00
anonym
b1b0e93d5e
Update i18n for Appearance User Settings 
The variable has to be added to the i18n files as well (I don't know how to do that)
 2020-11-30 21:33:52 +01:00
Weblate
8a0c1248cb Merge branch 'origin/develop' into Weblate. 2020-11-30 16:20:53 +00:00
Nikita Epifanov
f2c79c1e8c Translated using Weblate (Russian) 
Currently translated at 87.9% (2376 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
 2020-11-30 16:20:53 +00:00
David Baker
9f42d3e549
Merge pull request #5455 from matrix-org/dbkr/answered_elsewhere 
Only show 'answered elsewhere' if we tried to answer too
 2020-11-30 16:20:35 +00:00
David Baker
3a3775b523 Only show 'answered elsewhere' if we tried to answer too 
and don't play the hangup tone

Fixes https://github.com/vector-im/element-web/issues/15735
 2020-11-30 15:17:20 +00:00
Weblate
909b0af934 Merge branch 'origin/develop' into Weblate. 2020-11-30 09:49:12 +00:00
Michael Telatynski
d4ed4a135c
Merge pull request #5442 from RinkiyaKeDad/avatar-fix 
Fixed Avatar for 3PID invites
 2020-11-30 09:49:05 +00:00
MamasLT
9e48493f67 Translated using Weblate (Lithuanian) 
Currently translated at 70.6% (1909 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-11-30 06:14:19 +00:00
strix aluco
35b720e8ef Translated using Weblate (Ukrainian) 
Currently translated at 53.3% (1442 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/uk/
 2020-11-30 06:14:16 +00:00
Jeff Huang
2a50de1536 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
 2020-11-30 06:14:14 +00:00
Priit Jõerüüt
f6a377e5af Translated using Weblate (Estonian) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
 2020-11-29 18:50:26 +00:00
Besnik Bleta
bfe800fc35 Translated using Weblate (Albanian) 
Currently translated at 99.7% (2695 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
 2020-11-29 18:50:23 +00:00
MamasLT
53535f0db8 Translated using Weblate (Lithuanian) 
Currently translated at 70.2% (1899 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/lt/
 2020-11-29 18:50:20 +00:00
XoseM
302f284b9d Translated using Weblate (Galician) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
 2020-11-29 18:50:18 +00:00
Marcelo Filho
7ad46cb6eb Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2702 of 2702 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
 2020-11-29 18:50:15 +00:00
Simon Merrick
e92ac67152 Use room alias in generated permalink for rooms 
Signed-off-by: Simon Merrick <s.m3rrick@gmail.com>
 2020-11-28 21:50:51 +13:00
Steffen Kolmer
0e53e220d0
Fixed copy paste error 2020-11-27 17:25:34 +01:00
nurjinn jafar
2f72c9ee55 update translation file 2020-11-27 16:47:07 +01:00
nurjinn jafar
82023dcf42 Merge branch 'feature_confetti#14676' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 2020-11-27 16:33:15 +01:00
nurjinn jafar
6ce5d3b044 refactored effects dir and changed effects exported name 2020-11-27 16:32:04 +01:00
Steffen Kolmer
d9c7148182 Merge remote-tracking branch 'upstream/develop' into feature_confetti#14676 2020-11-27 16:20:35 +01:00
Weblate
73ccc40295 Merge branch 'origin/develop' into Weblate. 2020-11-27 14:41:14 +00:00
David Baker
bb1d52919a
Merge pull request #5449 from matrix-org/dbkr/user_media_error 
Slightly better error if we can't capture user media
 2020-11-27 14:41:06 +00:00
David Baker
4f35bc0865 Merge remote-tracking branch 'origin/develop' into dbkr/user_media_error 2020-11-27 14:29:22 +00:00
Weblate
2d8c103f0c Merge branch 'origin/develop' into Weblate. 2020-11-27 14:07:24 +00:00
Travis Ralston
f4979065e4
Merge pull request #5445 from matrix-org/travis/hide-rooms 
Make it possible in-code to hide rooms from the room list
 2020-11-27 07:07:18 -07:00
Weblate
b52c900bb5 Merge branch 'origin/develop' into Weblate. 2020-11-27 14:06:43 +00:00
Travis Ralston
ced68a6fbc
Merge pull request #5447 from matrix-org/travis/fix-stickerpicker 
Fix the stickerpicker
 2020-11-27 07:06:35 -07:00
David Baker
9a5f2c85cd i18n 2020-11-27 14:04:27 +00:00