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
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
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
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
Michael Telatynski
3d47e25955
improve PropTypes for better rageshakes
2020-01-29 07:53:45 +00:00
Michael Telatynski
83fdeeb180
Fix MemberInfo handling User objects without crashing
2020-01-29 07:53:23 +00:00
Michael Telatynski
2fbda42374
Fix buttons in right panel verif
2020-01-29 07:53:06 +00:00
Travis Ralston
797b23ecfa
Merge branch 'develop' into travis/update-qr-code
2020-01-29 00:19:47 +00:00
Weblate
99a26e9338
Merge branch 'origin/develop' into Weblate.
2020-01-28 23:57:53 +00:00
Michael Telatynski
2c973f7467
Merge pull request #3950 from matrix-org/t3chguy/cs_verification_decoration
...
Cross Signing Right Panel Verification Decoration
2020-01-28 23:57:48 +00:00
Michael Telatynski
5c44ff8f8a
other PR iteration based on feedback
2020-01-28 23:48:00 +00:00
Michael Telatynski
c632c72f25
tidy up right-panel if-else-if statement
2020-01-28 23:43:09 +00:00
David Baker
4a26a72684
Restore key backup in Complete Security dialog
...
Fixes https://github.com/vector-im/riot-web/issues/11889
2020-01-28 22:46:21 +00:00
Weblate
76baf33461
Merge branch 'origin/develop' into Weblate.
2020-01-28 22:13:34 +00:00
Michael Telatynski
c6a827995f
Merge pull request #3965 from matrix-org/t3chguy/members_button_regression
...
Passing refireParams actually prevented this from working
2020-01-28 22:13:29 +00:00
Michael Telatynski
7b5a8856a4
Passing refireParams actually prevented this from working
2020-01-28 22:06:04 +00:00
Weblate
3d816e3042
Merge branch 'origin/develop' into Weblate.
2020-01-28 22:02:25 +00:00
David Baker
8c471d6713
Merge pull request #3964 from matrix-org/dbkr/start_key_backup_in_bootstrap
...
Start new key backup in security setup flow
2020-01-28 22:02:20 +00:00
Weblate
a58f9a6b07
Merge branch 'origin/develop' into Weblate.
2020-01-28 20:36:28 +00:00
Szimszon
68a22a4d64
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2075 of 2075 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 20:36:28 +00:00
Hubert Chathi
793ff2cccc
Hide pre-join UTDs ( #3881 )
2020-01-28 15:36:24 -05:00
Weblate
624ea505c3
Merge branch 'origin/develop' into Weblate.
2020-01-28 20:05:48 +00:00
J. Ryan Stinnett
02ba548a62
Merge pull request #3963 from matrix-org/jryans/user-info-device-id
...
Add device IDs in user info tooltips
2020-01-28 20:05:43 +00:00
J. Ryan Stinnett
32cb3b8ccb
onClick to separate line
2020-01-28 19:55:53 +00:00
David Baker
39c8a9d204
Start new key backup in security setup flow
...
Part of https://github.com/vector-im/riot-web/issues/11889
2020-01-28 19:42:09 +00:00
Weblate
85d929f694
Merge branch 'origin/develop' into Weblate.
2020-01-28 18:05:14 +00:00
J. Ryan Stinnett
6fb8f6eef1
Add device IDs in user info tooltips
...
For easier device identification, add the device ID in an HTML tooltip for now.
Fixes https://github.com/vector-im/riot-web/issues/12103
2020-01-28 18:03:51 +00:00
David Baker
de295cc350
Merge remote-tracking branch 'origin/develop' into dbkr/better_flow_for_upgrade_on_login
2020-01-28 17:49:57 +00:00
Michael Telatynski
b002806639
Use DialogButtons because reusability :((
2020-01-28 17:42:39 +00:00
Travis Ralston
61b198d7f8
Merge branch 'develop' into travis/update-qr-code
2020-01-28 17:27:17 +00:00
David Baker
5e1b42b350
unused component
2020-01-28 17:21:42 +00:00
Michael Telatynski
76e61b9948
Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
2020-01-28 17:19:59 +00:00
David Baker
e1e35a53e4
i18n
2020-01-28 17:18:09 +00:00
David Baker
546acb696d
Add confirmation to skip button
...
Re-using the opt out phase which was unused
2020-01-28 17:15:50 +00:00
Michael Telatynski
58df4127d3
Update propTypes and remove todo
2020-01-28 17:14:48 +00:00
Weblate
0a67fb9a6b
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:54:21 +00:00
Szimszon
6c10c1b76d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2078 of 2078 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:54:21 +00:00
Travis Ralston
330b489fd5
Switch back to legacy decorators
...
Empirically the build is fine with these, but it is unfortunate that we have to reply on deprecated semantics. TypeScript should help fix this.
2020-01-28 16:44:30 +00:00
David Baker
abfa593791
Make the 'encryption upgrade' flow better
...
Fixes https://github.com/vector-im/riot-web/issues/12086
2020-01-28 16:36:07 +00:00
Weblate
2dbb248598
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:15:54 +00:00
Szimszon
ab8fe80d6b
Translated using Weblate (Hungarian)
...
Currently translated at 98.6% (2048 of 2077 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:15:54 +00:00
Half-Shot
bfaa9d56fb
prefixes
2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 16:01:50 +00:00
Damir Jelić
5cabfb63a4
EventIndex: Don't mark the event listener method docs as jsdoc comments.
2020-01-28 16:13:56 +01:00
Travis Ralston
e178135bff
Merge branch 'develop' into travis/update-qr-code
2020-01-28 15:02:50 +00:00
Weblate
e812c9c986
Merge branch 'origin/develop' into Weblate.
2020-01-28 14:50:24 +00:00
Half-Shot
85bcad0ea0
Styling for Nad
2020-01-28 14:46:22 +00:00
Travis Ralston
720b9a92fe
Merge branch 'develop' into travis/babel-skinning
2020-01-28 14:41:51 +00:00
Weblate
79f3b44279
Merge branch 'origin/develop' into Weblate.
2020-01-28 14:13:09 +00:00
J. Ryan Stinnett
a19cdc9077
Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s
...
Enable cross-signing lab when key in storage
2020-01-28 14:13:04 +00:00
Damir Jelić
948ec203c6
BaseEventIndexManager: Fix the type hints for the empty promises.
2020-01-28 15:07:29 +01:00
Damir Jelić
0b7f23fa54
EventIndex: Improve the documentation a bit.
2020-01-28 15:06:43 +01:00
Travis Ralston
d0c28adfb1
Appease the linter
2020-01-28 12:53:37 +00:00
Travis Ralston
21405b8f25
Fix skinning and babel tagets
2020-01-28 12:47:38 +00:00
J. Ryan Stinnett
9cf59ab16d
Enable cross-signing lab when key in storage
...
When we're starting a new session and find the cross-signing keys in secret
storage, auto-enable the lab for the new session.
Fixes https://github.com/vector-im/riot-web/issues/12100
2020-01-28 12:30:41 +00:00
Weblate
e0ffedca45
Merge branch 'origin/develop' into Weblate.
2020-01-28 11:50:09 +00:00
J. Ryan Stinnett
dea919f6ee
Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2
...
Add new session verification details dialog
2020-01-28 11:50:03 +00:00
Half-Shot
71233a5aff
liney liney come back we need you
2020-01-28 11:33:51 +00:00
Half-Shot
7c0a461cbb
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 11:22:02 +00:00
Michael Telatynski
c93b080434
delint
2020-01-28 11:17:53 +00:00
Half-Shot
785277d4b8
Review bits for travis
2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b
Apply remainder of ux
2020-01-28 11:13:09 +00:00
Travis Ralston
f4842688f8
Add reciprocate to verification methods
2020-01-28 11:10:15 +00:00
Weblate
b628f23a6b
Merge branch 'origin/develop' into Weblate.
2020-01-28 10:16:31 +00:00
Zoe
06f7842afa
Merge pull request #3949 from matrix-org/foldleft/12079-fix-warnings-on-self
...
Fix issue where we don't notice if our own devices shouldn't be trusted
2020-01-28 10:16:27 +00:00
J. Ryan Stinnett
67358e06bf
Use annotations and imports
2020-01-28 10:10:37 +00:00