OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
24,134 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

24134 Commits (aea17818e93abefcbeec382c1f197cd63f239b07)

Author SHA1 Message Date
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
David Baker aa9da54bed yarn i18n 2020-04-30 09:45:11 +01:00
David Baker 5ecd874e82 yarn i18n 2020-04-30 09:44:15 +01:00
Weblate ede1e1026c Merge branch 'origin/develop' into Weblate. 2020-04-30 08:26:30 +00:00
yuuki-san 9a2a57fe99 Translated using Weblate (Slovak) 
Currently translated at 62.5% (1438 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
 2020-04-30 08:26:30 +00:00
grrgui fec4429d7d 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 08:26:29 +00:00
Louis e33a4a2452 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 08:26:29 +00:00
axel simon 2a4c6f3da9 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 08:26:29 +00:00
yuuki-san 87cd39109f Translated using Weblate (Czech) 
Currently translated at 93.6% (2151 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-04-30 08:26:29 +00:00
Jeff Huang feee969edc Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2299 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-04-30 08:26:29 +00:00
Slavi Pantaleev 4d66e251ae Translated using Weblate (Bulgarian) 
Currently translated at 86.3% (1984 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2020-04-30 08:26:28 +00:00
Bruno Windels 00d7e77379
Merge pull request #4518 from matrix-org/bwindels/recheckthemeonlogin 
Re-apply theme after login
 2020-04-30 08:26:15 +00:00
Priit Jõerüüt 8be07abf6c Translated using Weblate (Estonian) 
Currently translated at 28.6% (657 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 21:49:29 +00:00
Priit Jõerüüt 49ac4963c5 Translated using Weblate (Estonian) 
Currently translated at 28.1% (647 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 21:24:48 +00:00
Priit Jõerüüt dab4ca64fc Translated using Weblate (Estonian) 
Currently translated at 26.8% (617 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 20:51:34 +00:00
Priit Jõerüüt 9d699c66d0 Translated using Weblate (Estonian) 
Currently translated at 24.1% (553 of 2299 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/et/
 2020-04-29 19:40:14 +00:00
David Baker c97eab24c7 Update toast copy again 
Fixes https://github.com/vector-im/riot-web/issues/13447
 2020-04-29 19:08:08 +01:00