Commit graph

29358 commits

Author SHA1 Message Date
Michael Telatynski
db3f125e26 Change how we expose Role in User Info and hide in DMs 2020-11-10 12:03:50 +00:00
David Baker
50bce642d5
Merge pull request #5366 from matrix-org/dbkr/call_hold
Implement call hold
2020-11-10 08:41:34 +00:00
Michael Telatynski
a67da01419
Merge pull request #5407 from matrix-org/t3chguy/fix/15670
Fix Skeleton UI showing up when not intended.
2020-11-10 01:34:33 +00:00
Michael Telatynski
a5d827c446
Update src/components/views/rooms/RoomList.tsx
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-11-10 01:22:30 +00:00
Michael Telatynski
73eb43d32a
Merge pull request #5406 from matrix-org/t3chguy/fix/home-button-ctx-menu
Close context menu when user clicks the Home button
2020-11-10 01:19:33 +00:00
Michael Telatynski
0b10ab6ef2
Merge pull request #5410 from matrix-org/t3chguy/fix/11684
Skip e2ee warn logout prompt if user has no megolm sessions to lose
2020-11-10 01:18:40 +00:00
RiotRobot
46e01196f0 Reset matrix-js-sdk back to develop branch 2020-11-09 16:33:48 +00:00
RiotRobot
318ff1914a Merge branch 'master' into develop 2020-11-09 16:33:01 +00:00
RiotRobot
8edbc7c654 v3.8.0 2020-11-09 16:31:48 +00:00
RiotRobot
e8d18b8b11 Prepare changelog for v3.8.0 2020-11-09 16:31:47 +00:00
RiotRobot
6f3cdadcdb Upgrade matrix-js-sdk to 9.1.0 2020-11-09 16:26:36 +00:00
Michael Telatynski
5bed02b6e8 Skip e2ee warn logout prompt if user has no megolm sessions to lose 2020-11-09 15:50:35 +00:00
Michael Telatynski
27d276715e Fix Skeleton UI showing up when not intended. 2020-11-09 13:53:28 +00:00
Michael Telatynski
462be2b6a0 Close context menu when user clicks the Home button 2020-11-09 13:45:33 +00:00
Michael Telatynski
e404934794
Merge pull request #5405 from aaronraimist/translate-country-names
Allow country names to be translated
2020-11-09 10:48:29 +00:00
Aaron Raimist
d121f8a357
Allow country names to be translated
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-11-08 22:33:15 -06:00
David Baker
a7e6d8e7f0
Merge pull request #5396 from matrix-org/dbkr/query_for_phone_numbers
Support thirdparty lookup for phone numbers
2020-11-06 15:22:53 +00:00
David Baker
cf2d8d2f1f Wrench createNewMatrixCall straight out of call
rather than importing browser-index
2020-11-05 17:59:02 +00:00
David Baker
6953aed70a
Copyright
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-11-05 09:51:02 +00:00
David Baker
9f456a2acf accidentally committed commenting 2020-11-05 09:50:12 +00:00
David Baker
5cccb2848e make quotes consistent 2020-11-05 09:49:14 +00:00
David Baker
9be3ce928f explicitly retuen null
and also sort out formatting from a different time
2020-11-05 09:47:43 +00:00
David Baker
90bbc082dc
Copyright
Co-authored-by: Travis Ralston <travpc@gmail.com>
2020-11-05 09:25:52 +00:00
Travis Ralston
cbd568a1e8
Merge pull request #5371 from resynth1943/change-password-to-new-password-in-forgot-password
Change "Password" to "New Password"
2020-11-04 12:15:49 -07:00
Bruno Windels
067b4ca93e
Merge pull request #5397 from matrix-org/bwindels/customise-dehydration-key
Add customisation point for dehydration key
2020-11-04 17:25:52 +00:00
Bruno Windels
41cb51e044 add interface import 2020-11-04 17:09:21 +01:00
Bruno Windels
f3743f3ca1 fix spelling 2020-11-04 16:53:58 +01:00
Bruno Windels
625e03cde3 allow customising the source of dehydration key 2020-11-04 16:51:45 +01:00
David Baker
333b13802f Support thirdparty lookup for phone numbers
As per MSC2845. Hidden behind /query for now, until we hook it up
to a dial pad.
2020-11-04 15:32:21 +00:00
Travis Ralston
971ade57bc
Merge pull request #5386 from matrix-org/travis/element-permalink
Rebrand Riot -> Element in the permalink classes
2020-11-04 08:14:26 -07:00
Matthew Hodgson
ced58b9ecf apostrophe!! 2020-11-04 14:54:53 +00:00
RiotRobot
8257470383 v3.8.0-rc.1 2020-11-04 14:16:13 +00:00
RiotRobot
6752e1f8d7 Prepare changelog for v3.8.0-rc.1 2020-11-04 14:16:13 +00:00
RiotRobot
1b55eb5f44 Upgrade matrix-js-sdk to 9.1.0-rc.1 2020-11-04 14:10:56 +00:00
Michael Telatynski
5a8525dd93
Merge pull request #5387 from matrix-org/t3chguy/fix/13066
Invite / Create DM UX tweaks
2020-11-04 14:01:21 +00:00
Michael Telatynski
5c9acc364f
Merge pull request #5383 from matrix-org/t3chguy/fix/15604
Tweaks to toasts and post-registration landing
2020-11-04 13:59:51 +00:00
David Baker
e0929298c6
Merge pull request #5394 from matrix-org/dbkr/log_profile_save_error_2
Log when saving profile
2020-11-04 13:52:53 +00:00
J. Ryan Stinnett
05d4193ff7
Merge pull request #5395 from RiotTranslateBot/weblate-element-web-matrix-react-sdk
Translations update from Weblate
2020-11-04 13:50:25 +00:00
random
e3f7931051 Translated using Weblate (Italian)
Currently translated at 99.9% (2374 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/it/
2020-11-04 13:49:35 +00:00
David Baker
28a64cd56c Log when saving profile
We had a bug report with this failing but there's nothing useful because nothing is logged.
2020-11-04 11:33:14 +00:00
Weblate
2495b136d0 Merge branch 'origin/develop' into Weblate. 2020-11-04 09:19:49 +00:00
Priit Jõerüüt
808e6eb6d9 Translated using Weblate (Estonian)
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2020-11-04 09:19:49 +00:00
XoseM
addd5cd62c Translated using Weblate (Galician)
Currently translated at 99.9% (2374 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/gl/
2020-11-04 09:19:47 +00:00
Jeff Huang
4b5b927912 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2020-11-04 09:19:45 +00:00
Nikita Epifanov
c4f5e147bb Translated using Weblate (Russian)
Currently translated at 99.8% (2371 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/ru/
2020-11-04 09:19:43 +00:00
Marcelo Filho
f389de0aaa Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2020-11-04 09:19:40 +00:00
Michael Telatynski
f583978c42
Merge pull request #5392 from matrix-org/t3chguy/fix/15543
Hide prompt to add email for notifications if 3pid ui feature is off
2020-11-04 09:19:29 +00:00
Michael Telatynski
a51307af25 i18n 2020-11-03 23:25:06 +00:00
Michael Telatynski
2fccde0e8d Hide prompt to add email for notifications if 3pid ui feature is off 2020-11-03 23:09:23 +00:00
Weblate
839fd864fc Merge branch 'origin/develop' into Weblate. 2020-11-03 16:23:44 +00:00