Commit Graph

28561 Commits

Author SHA1 Message Date
Michael Telatynski
229967aa33 Retry joinRoom up to 5 times in the case of a 504 GATEWAY TIMEOUT 2020-09-14 15:16:29 +01:00
Michael Telatynski
493d3ae288 Don't show Notifications Prompt Toast if user has master rule enabled 2020-09-14 14:35:08 +01:00
Michael Telatynski
73608c4aa9 Don't count widgets which no longer exist towards pinned count 2020-09-14 14:03:51 +01:00
Weblate
baa6e396a0 Merge branch 'origin/develop' into Weblate. 2020-09-14 12:44:20 +00:00
Nikita Epifanov
f6a405ffd7 Translated using Weblate (Russian)
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-14 12:44:20 +00:00
Szimszon
475ea4aa2a Translated using Weblate (Hungarian)
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-09-14 12:44:19 +00:00
Michael Albert
2317300a59 Translated using Weblate (German)
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-14 12:44:19 +00:00
Priit Jõerüüt
99811bfc74 Translated using Weblate (Estonian)
Currently translated at 100.0% (2375 of 2375 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-14 12:44:18 +00:00
RiotRobot
148cad6ea2 Reset matrix-js-sdk back to develop branch 2020-09-14 13:42:34 +01:00
RiotRobot
c652ca56da Merge branch 'master' into develop 2020-09-14 13:41:29 +01:00
RiotRobot
099f50b10e v3.4.0 2020-09-14 13:36:32 +01:00
RiotRobot
c6eda819f0 Prepare changelog for v3.4.0 2020-09-14 13:36:31 +01:00
RiotRobot
ba73847296 Upgrade matrix-js-sdk to 8.3.0 2020-09-14 13:31:41 +01:00
Weblate
07bcbc0d65 Merge branch 'origin/develop' into Weblate. 2020-09-14 08:45:09 +00:00
discapacidad5
06a8ab20fb Translated using Weblate (Spanish)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/es/
2020-09-14 08:45:09 +00:00
Kahina Messaoudi
e5e7c873bc Translated using Weblate (Kabyle)
Currently translated at 99.5% (2360 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/kab/
2020-09-14 08:44:51 +00:00
David Baker
c68a980c59
Merge pull request #5193 from matrix-org/dbkr/remove_jitsi_widget_on_call_button
Prompt to remove the jitsi widget when pressing the call button
2020-09-14 09:44:45 +01:00
random
6950159f22 Translated using Weblate (Italian)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/it/
2020-09-13 15:43:01 +00:00
Szimszon
b857b1a239 Translated using Weblate (Hungarian)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/hu/
2020-09-13 15:42:59 +00:00
@a2sc:matrix.org
91dc346e5b Translated using Weblate (German)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-13 15:42:58 +00:00
XoseM
0923eeb2ad Translated using Weblate (Galician)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/gl/
2020-09-13 15:42:58 +00:00
Safa Alfulaij
80f8a18c2a Translated using Weblate (Arabic)
Currently translated at 14.9% (354 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ar/
2020-09-13 15:42:57 +00:00
Travis Ralston
ac300a293e Add jsdoc 2020-09-11 21:09:42 -06:00
Travis Ralston
fc2173a789 Appease the linter
It's almost like I copy/pasted some stuff
2020-09-11 21:05:54 -06:00
Travis Ralston
763309ae80 Show a spinner when processing a registration email confirmation
See comment enclosed
2020-09-11 20:58:10 -06:00
Travis Ralston
525ec6b709 Ensure we obliterate 3pid invites on logout 2020-09-11 20:36:26 -06:00
Travis Ralston
803badba1b Show the user's 3PID invite after they've reloaded the page
This is a step towards https://github.com/vector-im/element-web/issues/13430

Since we've stored the invite, we can send the user to it once they reload the page or revisit Element. We currently only support one invite at a time, but this should be fine for most cases. 

We only do this restoration if the next screen isn't set to avoid breaking the user out of an expected flow.

As an added touch, this also ensures that the email address is pre-filled on the registration page if needed, just in case the user refreshes before getting to the submit button.
2020-09-11 20:20:33 -06:00
Travis Ralston
a5d7b24805 Add a note for why oob_data isn't threaded yet
See https://github.com/vector-im/element-web/issues/15157
2020-09-11 19:57:16 -06:00
Travis Ralston
b1cdf1bc9a Redirect to the registration page if there's a 3PID invite
Fixes https://github.com/vector-im/element-web/issues/15130
2020-09-11 19:53:52 -06:00
Travis Ralston
dc44b9ef59 Store and thread 3pid invite through the app
This doesn't do anything with the stored value (yet), but enables us to do something with it in a future commit.
2020-09-11 19:49:48 -06:00
Travis Ralston
fe0eea84dd
Merge pull request #5196 from matrix-org/travis/e2e-iconography
[Release] Show verification status in the room summary card
2020-09-11 10:05:38 -06:00
Weblate
8c35392b6e Merge branch 'origin/develop' into Weblate. 2020-09-11 15:12:51 +00:00
@a2sc:matrix.org
0721ff85fe Translated using Weblate (German)
Currently translated at 99.9% (2372 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 15:12:51 +00:00
Travis Ralston
77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
Travis Ralston
652c037380 Use hooks better (from develop) 2020-09-11 09:06:17 -06:00
Travis Ralston
8862b8298c Use hooks better 2020-09-11 09:04:06 -06:00
J. Ryan Stinnett
8f3469237a
Merge pull request #5200 from matrix-org/jryans/userinfo-scroll-release
Fix user info scrolling in new card view
2020-09-11 15:48:58 +01:00
felix adernog
7a26eb9840 Translated using Weblate (German)
Currently translated at 99.9% (2372 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 14:44:02 +00:00
toastbroot
d5b8588cb4 Translated using Weblate (German)
Currently translated at 99.9% (2372 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 14:39:44 +00:00
@a2sc:matrix.org
4c7d2363ce Translated using Weblate (German)
Currently translated at 99.9% (2372 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
2020-09-11 14:39:44 +00:00
J. Ryan Stinnett
acdabe3ca0 Fix user info scrolling in new card view
Fixes https://github.com/vector-im/element-web/issues/15148
2020-09-11 15:29:47 +01:00
J. Ryan Stinnett
35e71f4066
Merge pull request #5199 from matrix-org/jryans/stickerpicker-height-release
Fix sticker picker height
2020-09-11 15:08:12 +01:00
Weblate
8c643feb87 Merge branch 'origin/develop' into Weblate. 2020-09-11 13:52:15 +00:00
LinAGKar
d67ad473c3 Translated using Weblate (Swedish)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/sv/
2020-09-11 13:52:15 +00:00
Nikita Epifanov
ada8b8deec Translated using Weblate (Russian)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
2020-09-11 13:52:14 +00:00
Priit Jõerüüt
b1bdb06507 Translated using Weblate (Estonian)
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
2020-09-11 13:52:13 +00:00
Jeff Huang
277aefdd5d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (2373 of 2373 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/zh_Hant/
2020-09-11 13:52:13 +00:00
J. Ryan Stinnett
d53cbecbb1
Merge pull request #5198 from matrix-org/jryans/userinfo-scroll
Fix user info scrolling in new card view
2020-09-11 14:52:06 +01:00
David Baker
b633564bea unused import 2020-09-11 13:02:02 +01:00
David Baker
e54d4e665f Don't prompt to remove jitsi widget if the user don't have permission 2020-09-11 12:20:32 +01:00