mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
24150 commits 216 branches 561 tags 417 MiB
Commit graph

24150 commits

This branch
This branch
All branches
Author SHA1 Message Date
RiotRobot
b5cb912cfd Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:24:59 +01:00
David Baker
df7c32187b
Merge pull request #4538 from matrix-org/dbkr/wait_for_user_verified_rel 
Wait for user to be verified in e2e setup
 2020-05-01 11:41:13 +01:00
Weblate
8aebf02dc4 Merge branch 'origin/develop' into Weblate. 2020-05-01 10:37:31 +00:00
random
a89d3f986d Translated using Weblate (Italian) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-05-01 10:37:31 +00:00
Slavi Pantaleev
d4005b6238 Translated using Weblate (Bulgarian) 
Currently translated at 86.3% (1987 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-05-01 10:37:31 +00:00
David Baker
934a7726c5
Merge pull request #4539 from matrix-org/dbkr/verify_wait_prevent_race 
Guard against race when waiting for cross-signing to be ready
 2020-05-01 11:37:25 +01:00
David Baker
a04564d1e3 Guard against race when waiting for cross-signing to be ready 
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
 2020-05-01 11:26:54 +01:00
Zoe
8a02e064bd Don't erase password confirm on registration error 
Fixes: https://github.com/vector-im/riot-web/issues/11395

Problem here was that the form gets re-mounted but there wasn't a facility
to preserve the password confirmation field.  Since the form validates
that the passwords are equal, if we mount with a password supplied we
just copy it over.
 2020-05-01 11:03:48 +01:00
David Baker
bc6aeef824 Guard against race when waiting for cross-signing to be ready 
Check to see if cross-signing is already set up after a verification
is done to make sure it doesn't race and we end up waiting forever.
 2020-05-01 10:58:00 +01:00
David Baker
4377e4161f Clear more state in DeviceListener 
Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
 2020-05-01 10:42:10 +01:00
David Baker
a291f6c2c5 Wait for user to be verified in e2e setup 
Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.

Fixes part of https://github.com/vector-im/riot-web/issues/13464
 2020-05-01 10:42:05 +01:00
Weblate
e9a36daa52 Merge branch 'origin/develop' into Weblate. 2020-05-01 09:41:29 +00:00
Kévin C
36cf07c975 Translated using Weblate (French) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-01 09:41:29 +00:00
Jeff Huang
6ca9630a3a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2302 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-05-01 09:41:28 +00:00
David Baker
bff2130b2d
Merge pull request #4537 from matrix-org/dbkr/wait_for_user_verified 
Wait for user to be verified in e2e setup
 2020-05-01 10:41:22 +01:00
David Baker
064d90c4b5 Merge remote-tracking branch 'origin/develop' into dbkr/wait_for_user_verified 2020-04-30 22:27:39 +01:00
David Baker
d241ceea56 Clear more state in DeviceListener 
Especially the devices at start, otherwise they'll just be wrong
if you log in after logging out.
 2020-04-30 22:21:48 +01:00
David Baker
124740a63c Wait for user to be verified in e2e setup 
Wait for our user to become verified and cross-signing to be ready
before declaring that we're finsihed, otherwise we could end up
prompting the user to verify again if we just wait for the verification
itself to complete.

Fixes part of https://github.com/vector-im/riot-web/issues/13464
 2020-04-30 22:08:00 +01:00
Weblate
3b52c05e1f Merge branch 'origin/develop' into Weblate. 2020-04-30 16:48:47 +00:00
Michael Telatynski
c19338b1d3
Merge pull request #4462 from matrix-org/t3chguy/app_load4 
Convert MatrixChat to a TypeScript class
 2020-04-30 17:48:42 +01:00
Michael Telatynski
9c916cc544 Merge branches 'develop' and 't3chguy/app_load4' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 
 Conflicts:
	src/components/structures/MatrixChat.tsx
 2020-04-30 17:41:14 +01:00
Weblate
04d73fcec9 Merge branch 'origin/develop' into Weblate. 2020-04-30 16:40:56 +00:00
Travis Ralston
7b775a8d93
Merge pull request #4271 from aaronraimist/esc-mark-as-read 
Mark room as read when escape is pressed
 2020-04-30 10:40:50 -06:00
Weblate
d583bd7614 Merge branch 'origin/develop' into Weblate. 2020-04-30 16:21:19 +00:00
@a2sc:matrix.org
834be6f796 Translated using Weblate (German) 
Currently translated at 77.8% (1792 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-30 16:21:19 +00:00
J. Ryan Stinnett
e56ce8d885
Merge pull request #4534 from matrix-org/jryans/key-backup-network-fail 
Only show key backup reminder when confirmed by server to be missing
 2020-04-30 17:21:13 +01:00
Weblate
5d6b88e40b Merge branch 'origin/develop' into Weblate. 2020-04-30 15:37:11 +00:00
David Baker
0cb7573643
Merge pull request #4536 from matrix-org/dbkr/a_toast_to_you_sir_rel 
Add device name to unverified session toast
 2020-04-30 16:37:10 +01:00
@a2sc:matrix.org
fced07682e Translated using Weblate (German) 
Currently translated at 77.8% (1791 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-30 15:37:10 +00:00
SophieKrueger
fb2b37f0fe Translated using Weblate (German) 
Currently translated at 77.8% (1791 of 2302 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-04-30 15:37:10 +00:00
David Baker
c7e663832a
Merge pull request #4535 from matrix-org/dbkr/a_toast_to_you_sir 
Add device name to unverified session toast
 2020-04-30 16:37:04 +01:00
David Baker
6ef5b78806 Add device name to unverified session toast 2020-04-30 16:10:46 +01:00
David Baker
3240b3bd60 Add device name to unverified session toast 2020-04-30 16:09:38 +01:00
J. Ryan Stinnett
d3ce4072d4 Only show key backup reminder when confirmed by server to be missing 
The key backup reminder was being shown too eagerly in cases when we hadn't
actually checked with the homeserver on key backup status. This changes to only
show the reminder when we're sure a backup doesn't exist.

Fixes https://github.com/vector-im/riot-web/issues/13404
 2020-04-30 15:41:49 +01:00
Weblate
8ce1b3d367 Merge branch 'origin/develop' into Weblate. 2020-04-30 13:09:53 +00:00
Zoe
3acb952d9a
Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress 
Show progress when loading keys
 2020-04-30 14:09:47 +01:00
Priit Jõerüüt
126b71dd30 Translated using Weblate (Estonian) 
Currently translated at 30.1% (692 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-30 11:35:00 +00:00
RiotRobot
619fbd6adc v2.5.0-rc.5 2020-04-30 11:30:14 +01:00
RiotRobot
b7f2c7b813 Prepare changelog for v2.5.0-rc.5 2020-04-30 11:30:13 +01:00
RiotRobot
5a29bf569d Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:21:33 +01:00
David Baker
19d0bf0d3b
Merge pull request #4533 from matrix-org/dbkr/remove_unnecessary_return_rel 
Fix device verification toasts not disappearing
 2020-04-30 11:13:21 +01:00
Weblate
ad83318da7 Merge branch 'origin/develop' into Weblate. 2020-04-30 10:13:20 +00:00
Louis
6f844977f5 Translated using Weblate (French) 
Currently translated at 99.9% (2298 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-04-30 10:13:20 +00:00
David Baker
e210f570f0
Merge pull request #4532 from matrix-org/dbkr/remove_unnecessary_return 
Fix device verification toasts not disappearing
 2020-04-30 11:13:14 +01:00
David Baker
4f95c89ffc Fix device verification toasts not disappearing 
recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself).
 2020-04-30 11:05:31 +01:00
David Baker
e845409167 Fix device verification toasts not disappearing 
recheck in DeviceListener returned early if cross-signing wasn't
ready, but this was unnecessary and prevented it from hiding the
device verification toasts (which also appeared above the toast
to verify yourself).
 2020-04-30 11:00:35 +01:00
J. Ryan Stinnett
db36b7e1d5
Merge pull request #4526 from matrix-org/jryans/reset-from-access-rc 
Allow resetting storage from the access dialog
 2020-04-30 10:17:12 +01:00
David Baker
3d996a91a7
Merge pull request #4530 from matrix-org/dbkr/toast_copy_update_again_rel 
Update toast copy again
 2020-04-30 10:01:25 +01:00
Weblate
99538b2033 Merge branch 'origin/develop' into Weblate. 2020-04-30 09:01:21 +00:00
David Baker
0eb39d8756
Merge pull request #4529 from matrix-org/dbkr/toast_copy_update_again 
Update toast copy again
 2020-04-30 10:01:16 +01:00