Commit graph

31225 commits

Author SHA1 Message Date
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
macekj
200c061968 remove unnecessary plus checks in emoji regexes
Signed-off-by: macekj <macekj@umich.edu>
2020-11-27 19:41:45 -05: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
David Baker
522c2d9dc7
Typo
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2020-11-27 14:03:52 +00:00
Jason Robinson
cdf8aa13cc Merge branch 'develop' into jaywink/hosting-provider-iframe 2020-11-27 16:01:29 +02:00
Weblate
65afa01725 Merge branch 'origin/develop' into Weblate. 2020-11-27 14:01:22 +00:00
Michael Telatynski
e5047e7f83
Merge pull request #5436 from SimonBrandner/feature-change-password-validation
Add live password validation to change password dialog
2020-11-27 14:01:15 +00:00
Šimon Brandner
eb64e5b2af Merge branch 'develop' into feature-change-password-validation 2020-11-27 14:46:08 +01:00
Jason Robinson
ad49dedec3 Document hosting_signup config option in source 2020-11-27 15:10:35 +02:00
Jason Robinson
835e417333 Translate all the strings 2020-11-27 15:10:35 +02:00
Jason Robinson
5ad9b83870 Fix copyright strings 2020-11-27 15:10:35 +02:00
Jason Robinson
94fba82227 Fix hostingSignupIFrame rendering in UserMenu after latest develop changes 2020-11-27 15:10:35 +02:00
Jason Robinson
c818a719bf Try a slightly larger HostingSignupDialog
Make HostingSignupBaseDialog larger
2020-11-27 15:10:35 +02:00
Jason Robinson
2aa36acae0 Change some messageHandler actions
setup_complete does not close the dialog but
just allows marking the setup as completed.

close_dialog closes the dialog immediately.
2020-11-27 15:10:35 +02:00
Richard Lewis
116f109a62 Improve setup initiation link 2020-11-27 15:10:35 +02:00
Jason Robinson
d089eb720f Remove the signup iframe link text from the ProfileSettings.js 2020-11-27 15:10:35 +02:00
Jason Robinson
bdab1faf16 Fix hosting signup dialog height 2020-11-27 15:10:35 +02:00
Jason Robinson
d607999cff Send also domain and user localpart to HostingSignupDialog iframe 2020-11-27 15:10:35 +02:00
Jason Robinson
b3b3f5ebeb Fix HostingSignupDialog layouting inside dialog 2020-11-27 15:10:35 +02:00
Jason Robinson
1e699b7ef3 Enable token request for HostingSignupDialog
Needed for the last part of setup which is triggering
a migration process to the new host.
2020-11-27 15:10:35 +02:00
Jason Robinson
a37e0db3e1 Move HostingSignupDialog to the dialogs folder 2020-11-27 15:10:35 +02:00
Jason Robinson
e6582c140f Dont' allow HostingSignupDialog to close
Except via confirmed cancel action or host setup success postmessage.
2020-11-27 15:10:35 +02:00
Jason Robinson
a1d750a4aa Rename a few things, make hosting signup config an object 2020-11-27 15:10:35 +02:00
Jason Robinson
54b22290e7 Add hosting_signup_domains for controlling which users see the hosting signup dialog 2020-11-27 15:10:35 +02:00