J. Ryan Stinnett
067bfe2ee3
Tweaks from PR
2020-01-29 16:10:46 +00:00
J. Ryan Stinnett
81ee27f41e
Replace device with session in UI text
...
This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
2020-01-29 15:52:32 +00:00
J. Ryan Stinnett
725ec1dda6
Merge pull request #3978 from matrix-org/jryans/cs-polish
...
Change new session toast to unverified
2020-01-29 15:33:19 +00:00
Michael Telatynski
9457520cc2
Merge pull request #3975 from matrix-org/t3chguy/right_panel_learn_more
...
Replace Verify button in UserInfo verification with "Learn more"
2020-01-29 15:27:46 +00:00
J. Ryan Stinnett
b5914f5c2b
Fix later button
2020-01-29 15:14:56 +00:00
J. Ryan Stinnett
f12fe984e5
Change new session toast to unverified
...
This also changes text to show the device ID and name in the toast.
Fixes https://github.com/vector-im/riot-web/issues/11916
2020-01-29 15:00:04 +00:00
Bruno Windels
44bc0d9fb1
phase is a prop now
2020-01-29 15:45:36 +01: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
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
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
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
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
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
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
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
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
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
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
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
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
Michael Telatynski
7b5a8856a4
Passing refireParams actually prevented this from working
2020-01-28 22:06:04 +00:00
Hubert Chathi
793ff2cccc
Hide pre-join UTDs ( #3881 )
2020-01-28 15:36:24 -05: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
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
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
Michael Telatynski
58df4127d3
Update propTypes and remove todo
2020-01-28 17:14:48 +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
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
Half-Shot
85bcad0ea0
Styling for Nad
2020-01-28 14:46:22 +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