Commit graph

21663 commits

Author SHA1 Message Date
Travis Ralston
c4b7e3866f Merge branch 'develop' into travis/update-qr-code 2020-01-29 14:58:16 +00:00
Bruno Windels
44bc0d9fb1 phase is a prop now 2020-01-29 15:45:36 +01:00
Weblate
8d3ebd7ec5 Merge branch 'origin/develop' into Weblate. 2020-01-29 14:37:11 +00:00
J. Ryan Stinnett
c76dd0f67e
Merge pull request #3977 from matrix-org/jryans/cs-polish
Adjust icons with in person with design
2020-01-29 14:37:05 +00:00
J. Ryan Stinnett
6d47f9620f Adjust icons with in person with design 2020-01-29 14:28:19 +00:00
Bruno Windels
3590c97d96 unrelated fix: rerender hidden event tile when decrypted
to get accurate type
2020-01-29 15:27:55 +01:00
Bruno Windels
59dc3cfb97 update immediately, don't wait until verification is done
this can deadlock, as you can't finish the verification without the UI
2020-01-29 15:27:55 +01:00
Bruno Windels
c4f1659116 don't dismiss toasts for device verification
as they are immediately started
2020-01-29 15:27:26 +01:00
Michael Telatynski
00dd1a4a8f Re-use existing classes to fix font-size matching
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:22:20 +00:00
Michael Telatynski
19e7c768b6 Replace Verify button in UserInfo verification with "Learn more"
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 14:11:50 +00:00
Weblate
27fdb573c5 Merge branch 'origin/develop' into Weblate. 2020-01-29 14:09:14 +00:00
Michael Telatynski
64e96331ca
Merge pull request #3973 from matrix-org/t3chguy/update_copy
Update copy for right panel verification
2020-01-29 14:09:09 +00:00
Weblate
33e85746a3 Merge branch 'origin/develop' into Weblate. 2020-01-29 14:04:54 +00:00
random
8418625026 Translated using Weblate (Italian)
Currently translated at 98.2% (2060 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2020-01-29 14:04:54 +00:00
Kévin C
042bffc5e2 Translated using Weblate (French)
Currently translated at 100.0% (2098 of 2098 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-29 14:04:52 +00:00
J. Ryan Stinnett
c0e88bede9
Merge pull request #3972 from matrix-org/jryans/missing-timeline-uisi
Check for timeline in pre-join UISI path
2020-01-29 14:04:45 +00:00
Michael Telatynski
957e862939 Update copy some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:58:02 +00:00
Michael Telatynski
920daa3125 Get rid of custom enter handling and protect handlers, disabling button isn't foolproof
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:43:08 +00:00
Michael Telatynski
fe71fe6033 Sprinkle forms and new-password designators to make autofill and password completion less wild
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:38:50 +00:00
Michael Telatynski
cb0392b78d use forms to wrap password fields so Chrome doesn't go wild and prefill all the things
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 13:24:45 +00:00
Michael Telatynski
227e6f6376 regen i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 12:16:42 +00:00
Michael Telatynski
a549c42022 Update copy for right panel verification
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-29 12:10:50 +00:00
J. Ryan Stinnett
336f623aa9 Check for timeline in pre-join UISI path
Somehow, live events can be missing a timeline, even though that should not
happen... This restores @uhoreg's previous version where we test for this case.

Fixes https://github.com/vector-im/riot-web/issues/12120
2020-01-29 12:00:04 +00:00
Travis Ralston
a8cfde72e1 Merge branch 'develop' into travis/update-qr-code 2020-01-29 11:47:59 +00:00
Weblate
1f0e5f31bd Merge branch 'origin/develop' into Weblate. 2020-01-29 11:45:27 +00:00
Travis Ralston
45735d5ae3
Merge pull request #3970 from matrix-org/travis/user-lists/fix-paste
Let users paste text if they've already started filtering invite targets
2020-01-29 11:45:21 +00:00
Weblate
8cf4e20b72 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:40:37 +00:00
Travis Ralston
e200988dbf
Merge pull request #3969 from matrix-org/travis/user-lists/suggestions
Filter event types when deciding on activity metrics for DM suggestions
2020-01-29 11:40:32 +00:00
Weblate
159a7a7ce2 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:32:19 +00:00
J. Ryan Stinnett
8fd174f1d5
Merge pull request #3971 from matrix-org/foldleft/fix-login-loop
Revert a change causing a login loop
2020-01-29 11:32:14 +00:00
Zoe
7d6981ba1a Revert "reload on enabling cross-signing just to make things generally happier"
This reverts commit 2aa21d9199.

It was causing a login loop
2020-01-29 11:29:56 +00:00
Travis Ralston
95a78538e0
Break after getting timestamp 2020-01-29 11:23:48 +00:00
Travis Ralston
a138a66e77 Let users paste text if they've already started filtering invite targets
Fixes https://github.com/vector-im/riot-web/issues/11814
2020-01-29 11:22:03 +00:00
Damir Jelić
ce7b860d61 Merge branch 'poljar/eventindex-docs' into develop 2020-01-29 12:17:48 +01:00
Weblate
8098f12277 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:17:01 +00:00
Weblate
5b651ee984 Merge branch 'origin/develop' into Weblate. 2020-01-29 11:14:53 +00:00
Travis Ralston
95edadbfa1
Merge pull request #3968 from matrix-org/travis/user-lists/autofocus
Automatically focus on the invite dialog input
2020-01-29 11:14:48 +00:00
Travis Ralston
8d12657483 Filter event types when deciding on activity metrics for DM suggestions
Fixes https://github.com/vector-im/riot-web/issues/12083
2020-01-29 11:14:33 +00:00
Travis Ralston
610354220e Automatically focus on the invite dialog input
Fixes https://github.com/vector-im/riot-web/issues/12070
2020-01-29 11:01:00 +00:00
Weblate
f4a2304c65 Merge branch 'origin/develop' into Weblate. 2020-01-29 09:55:56 +00:00
David Baker
fa1f2cd7e0
Merge pull request #3966 from matrix-org/dbkr/restore_key_backup_in_complete_security
Restore key backup in Complete Security dialog
2020-01-29 09:55:50 +00:00
Weblate
1d1c40fd32 Merge branch 'origin/develop' into Weblate. 2020-01-29 09:46:29 +00:00
Michael Telatynski
b24c7f3a04
Merge pull request #3967 from matrix-org/t3chguy/cs_verification_decoration
Right Panel Verification improvements
2020-01-29 09:46:24 +00:00
David Baker
e9854f5e44 i18n 2020-01-29 09:32:09 +00:00
Travis Ralston
7d1c61fa55 Use new constant for QR code verification 2020-01-29 09:29:45 +00:00
Michael Telatynski
37e568448d delint 2020-01-29 08:08:52 +00:00
Michael Telatynski
0bb423fd5a Add console log on unhandled error to track down rageshake 2020-01-29 08:00:32 +00:00
Michael Telatynski
61d0021c8e Fix styling special case for DialogButtons 2020-01-29 07:58:43 +00:00
Michael Telatynski
2aa21d9199 reload on enabling cross-signing just to make things generally happier 2020-01-29 07:54:28 +00:00
Michael Telatynski
d824145638 show as pending whilst in an empty state until told better to prevent a flash 2020-01-29 07:54:10 +00:00