Commit graph

3957 commits

Author SHA1 Message Date
Michael Telatynski
8a0ee2fd34 iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 16:00:50 +00:00
Michael Telatynski
75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Michael Telatynski
c176d1e070
Merge pull request #4247 from matrix-org/t3chguy/showHiddentEvents_spoof
Break continuation on showHiddenEvents-rendered events
2020-03-20 10:51:17 +00:00
Michael Telatynski
7224243e00 Break continuation on showHiddenEvents-rendered events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 09:41:43 +00:00
Michael Telatynski
1c0c3c4695 Watch for show-RR settings changes, use room-specific and fix margins
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 09:29:59 +00:00
Michael Telatynski
2b40bb905a Add shortcut CmdOrCtrl+. to toggle right panel. Gets rid of forced-update on right panel changes which may not be the ones we care about.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-20 00:18:24 +00:00
Michael Telatynski
f5d490ee78 Tidy up code
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 23:11:28 +00:00
Michael Telatynski
d7ca374991 open room sublist when using alt-arrows to navigate into it, refire scroll event
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 22:07:22 +00:00
Michael Telatynski
7d28137cfd Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-19 19:18:20 +00:00
Michael Telatynski
578b3f2b97 Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 19:07:33 +00:00
Zoe
d4486a3eeb
Merge pull request #4229 from matrix-org/foldleft/11574-handle-upload-errors
Report to the user when a key signature upload fails
2020-03-19 16:00:18 +00:00
Michael Telatynski
3c2101fa31 Fix ctrlOrCmd + Slash shortcut to match the guide
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 15:52:17 +00:00
Michael Telatynski
fb46258528 we don't do mx_fadable anymore so get rid of broken RLS disabling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-19 13:57:36 +00:00
Michael Telatynski
d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +00:00
Michael Telatynski
cad28c81c0 Add Keyboard shortcuts dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
Michael Telatynski
42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini
Remove Gemini Scrollbars
2020-03-18 14:03:51 +00:00
Michael Telatynski
ef79492f2c
Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory
Room Directory Explore Servers redesign
2020-03-18 11:51:42 +00:00
J. Ryan Stinnett
fac4561ac8
Merge pull request #4225 from matrix-org/jryans/comp-sec-restore-slow
Restore key backup in background after complete security
2020-03-17 16:47:18 +00:00
Michael Telatynski
638629c2fa fix MyGroups scrollbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 13:28:07 +00:00
Michael Telatynski
8fd3b96b72 fix styling/heights
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 11:53:19 +00:00
Zoe
ea99eebb7b Report to the user when a key signature upload fails 2020-03-17 11:45:27 +00:00
David Baker
5de93d0fee
Merge pull request #4222 from matrix-org/dbkr/wait_for_verify
Wait for verification request on login
2020-03-17 10:32:26 +00:00
Michael Telatynski
44b0aa2d88 Remove remainders of gemini-scrollbar and react-gemini-scrollbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:31:45 +00:00
Michael Telatynski
8dfc15a328 Migrate TagPanel away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:23:12 +00:00
Michael Telatynski
43f0013dda Migrate GroupView away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:09:47 +00:00
J. Ryan Stinnett
c245c6932c Restore key backup in background after complete security
We were blocking the complete security flow on waiting for a key backup restore
to complete, which could take multiple minutes with no visible progress.

Fixes https://github.com/vector-im/riot-web/issues/12426
2020-03-16 23:30:24 +00:00
David Baker
6c8bfe3293 Lint 2020-03-16 17:58:37 +00:00
David Baker
6c4b572c7e Wait for verification request on login
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
2020-03-16 17:47:56 +00:00
Michael Telatynski
c77ba71f89 migrate EmbeddedPage away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:39:42 +00:00
Michael Telatynski
30d971b819 migrate MyGroups away from Gemini
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:36:52 +00:00
Michael Telatynski
a9f414dafe Remove unused SearchableEntityList.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 23:23:23 +00:00
J. Ryan Stinnett
e927ab6ad4 Move to composer when typing letters with Shift held
We already jump to the composer for unshifted typing, but we should also do so
with Shift as well.

Fixes https://github.com/vector-im/riot-web/issues/12734
2020-03-13 22:21:34 +00:00
Michael Telatynski
af368a4736 Improve accessibility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 14:38:36 +00:00
Bruno Windels
949ac2953e pass current server as via server to join room 2020-03-13 10:21:37 +01:00
Michael Telatynski
86e53ea2c3 Initial attempt to redesign explore servers in room directory
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-13 00:02:50 +00:00
J. Ryan Stinnett
d6d686622c
Merge pull request #4206 from matrix-org/jryans/xsign-robust-login
Test for cross-signing homeserver support during login, toasts
2020-03-12 20:15:11 +00:00
J. Ryan Stinnett
b5d532b8cd Test for cross-signing homeserver support during login, toasts
This adds more checking of homeserver support for cross-signing at login and in
toasts.

Fixes https://github.com/vector-im/riot-web/issues/12228
2020-03-12 18:08:51 +00:00
Travis Ralston
cccd27fe84 Convert TabbedView to TypeScript to prove it works 2020-03-11 18:03:43 -06:00
Michael Telatynski
5c582037ce Tweak padding to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 23:11:48 +00:00
Michael Telatynski
78ffb3ddf4 Don't remount main split children on rhs collapse
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-10 20:09:40 +00:00
Bruno Windels
b0617f10e8 stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail 2020-03-06 17:22:56 +01:00
Bruno Windels
f8ef5bb6a5 check .started first as it can be both .started and pending 2020-03-06 17:20:08 +01:00
Bruno Windels
a7de575316 use crypto.verification.request even when xsign is disabled 2020-03-06 16:50:39 +01:00
Bruno Windels
7d051d6a1d await request promise inside encryption panel to show spinner 2020-03-05 17:44:35 +01:00
Travis Ralston
7aba168c34
Merge pull request #4170 from matrix-org/travis/sso-register-dev
Disable registration flows on SSO servers
2020-03-04 12:59:08 -07:00
Travis Ralston
2204785026 Simplify SSO step checking 2020-03-04 12:26:08 -07:00
Travis Ralston
68258d8e89
Merge pull request #4160 from matrix-org/travis/filter-blank
Don't group blank membership changes
2020-03-04 12:24:31 -07:00
Travis Ralston
b06a82ee80 Use textForEvent to determine if an event is worth rendering 2020-03-04 11:44:12 -07:00
Travis Ralston
3842bce74d Fix SSO for new approach 2020-03-04 11:41:16 -07:00
Travis Ralston
3cff6d7239 Appease the linter 2020-03-03 23:26:20 -07:00
Travis Ralston
e265c92b6e Redirect registration requests to Login when the server supports SSO
For https://github.com/vector-im/riot-web/issues/12362
2020-03-03 23:24:50 -07:00
Travis Ralston
bcfe1fcac5 Wire up 'create account' to the SSO button when SSO is used
For https://github.com/vector-im/riot-web/issues/12362
2020-03-03 23:23:53 -07:00
Michael Telatynski
f08d034f84
Merge pull request #4158 from matrix-org/t3chguy/sso
riot-desktop open SSO in browser so user doesn't have to auth twice
2020-03-03 22:27:48 +00:00
J. Ryan Stinnett
ffde56d804
Merge pull request #4165 from matrix-org/jryans/lock-auth-success
Lock login and registration buttons after submit
2020-03-03 18:03:34 +00:00
J. Ryan Stinnett
191dcaab82 Explain why not busy is ignored 2020-03-03 17:41:28 +00:00
Bruno Windels
3e39cebb8f also use relative scrolling when eh ... doing relative scrolling 2020-03-03 15:44:59 +01:00
Bruno Windels
223956a206 add comment how offset from bottom is calculated 2020-03-03 15:42:44 +01:00
Bruno Windels
f9d2d45b24 use relative scrolling to compensate when changing height 2020-03-03 15:42:22 +01:00
J. Ryan Stinnett
59c4e36ba8 Lock interactive auth as busy until state change
This keeps interactive auth locked as busy until a state change so that e.g.
accepting a terms step will remain "busy looking" until the next step of the
process appears.

Fixes https://github.com/vector-im/riot-web/issues/12546
2020-03-03 14:40:22 +00:00
J. Ryan Stinnett
88f351d5ca Keep sign in button disabled on success
This changes password login to keep the sign in button locked when proceeding
successfully to avoid the possibility of double device sign in.

Part of https://github.com/vector-im/riot-web/issues/12546
2020-03-03 10:42:08 +00:00
Travis Ralston
d95f843cd0 Don't group blank membership changes
We already drop noop membership changes when they don't make it into a MELS, so we just need to make the MELS aware enough to drop messages early that are noops.

Fixes https://github.com/vector-im/riot-web/issues/12575
2020-03-02 17:52:20 -07:00
Michael Telatynski
f8045e428b riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 14:59:54 +00:00
Michael Telatynski
dc3afb3e57
Merge pull request #4098 from aaronraimist/donottrack
Don't ask to enable analytics when Do Not Track is enabled
2020-02-29 00:55:36 +00:00
Aaron Raimist
3a7454a52f Use !== instead
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-02-28 18:37:55 -06:00
Michael Telatynski
0c4897a875
Merge pull request #4152 from matrix-org/t3chguy/fix_mels
Fix MELS not breaking on day boundaries regression
2020-02-29 00:18:00 +00:00
Michael Telatynski
9ff053c5a9 Fix MELS not breaking on day boundaries regression
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-29 00:09:19 +00:00
Michael Telatynski
87e717cd39 Fix Quote on search results page
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-28 23:12:10 +00:00
Travis Ralston
60e26db729
Merge pull request #3829 from Cadair/login_group
Add a Login button to startAnyRegistrationFlow
2020-02-28 10:35:49 -07:00
Stuart Mumford
aec622d5d0
Apply suggestions from code review
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-02-28 10:47:23 +00:00
Michael Telatynski
a1908a208e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list
 Conflicts:
	src/components/views/rooms/RoomList.js
	src/stores/RoomListStore.js
2020-02-26 23:02:06 +00:00
Stuart Mumford
5edb0ec912
Resolve correct screen not being shown after new registration 2020-02-26 21:55:09 +00:00
Stuart Mumford
e454d84e9d
Lint
Signed-off-by: Stuart Mumford <stuart@cadair.com>
2020-02-26 21:55:08 +00:00
Stuart Mumford
32eb2c13bf
Add support for specifying the screen after require_registration
Also use it in start chat and join group

Signed-off-by: Stuart Mumford <stuart@cadair.com>
2020-02-26 21:55:08 +00:00
Travis Ralston
9be61497fb Handle errors when previewing rooms more safely
Fixes https://github.com/vector-im/riot-web/issues/12500

See https://github.com/matrix-org/synapse/issues/6992 for additional context.
2020-02-25 16:11:07 -07:00
Travis Ralston
b32fbcb64f Don't try to collapse zero events with a group
Fixes https://github.com/vector-im/riot-web/issues/12423

When events are redacted they fail to make it into the Grouper because the `shouldAddEvent` check blocks them from entering. However, the grouper expects that when `getTiles()` is called that there's events to group and dutifully grabs some context from the array. Because JavaScript is the least helpful language, `myArray[-1]` returns `undefined` or `null` and thus you get `cannot read 'sender' of undefined`.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/4059
2020-02-25 15:40:15 -07:00
Zoe
adf6dfe4ea Threaded through the event type to the user 2020-02-25 10:30:35 +00:00
Zoe
3302469a2b Catch errors sooner so users can recover more easily 2020-02-24 18:04:11 +00:00
Michael Telatynski
72e5313a5a
Merge pull request #4113 from matrix-org/t3chguy/fix_downloading
Handle file downloading locally in electron rather than sending to browser
2020-02-24 13:37:16 +00:00
J. Ryan Stinnett
f80582a51d
Merge pull request #4116 from matrix-org/jryans/rm-cider-watcher
Remove unused CIDER setting watcher
2020-02-24 13:10:59 +00:00
J. Ryan Stinnett
8e39bd8885 Remove unused CIDER setting watcher
This setting watcher for CIDER seems unused and logs a warning at the moment, so
this change removes it.
2020-02-24 12:36:25 +00:00
Michael Telatynski
0bcdf062a3 reset opener when using window.open
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:22:12 +00:00
Michael Telatynski
b2c1242207 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:19:18 +00:00
Michael Telatynski
d783ce86c8 Use noreferrer in addition to noopener for edge case browsers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 22:14:29 +00:00
Michael Telatynski
3308152439 Fix a couple of React warnings/errors
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-23 14:10:41 +00:00
Michael Telatynski
4ed4d91b48 move to a more reusable code path
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:54:56 +00:00
Michael Telatynski
b77c2df2be Fix theme being overridden to light even after login is completed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-21 14:40:42 +00:00
Michael Telatynski
e6d8c4a576 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-21 11:18:45 +00:00
Aaron Raimist
1739b7e0cc Don't ask to enable analytics when Do Not Track is enabled
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2020-02-20 20:09:24 -06:00
Michael Telatynski
b1a3d8ad63
Merge pull request #4092 from matrix-org/t3chguy/persist
Use Persistent Storage where possible
2020-02-20 11:56:54 +00:00
Bruno Windels
86c871f55f
Merge pull request #4088 from matrix-org/bwindels/fixuserpage
Fix user page (missing null check)
2020-02-20 11:01:15 +00:00
Michael Telatynski
16bbea0b59 Fix various leaks due to method re-binding
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-20 02:35:30 +00:00
Michael Telatynski
ffde11ca91 Use Persistent Storage where possible
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-20 00:38:08 +00:00
Michael Telatynski
4278d44059 Merge branches 'develop' and 't3chguy/alpha_room_list' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 2020-02-19 13:30:47 +00:00
Bruno Windels
cb5882d59b add null check 2020-02-19 10:40:00 +01:00
Hubert Chathi
4a204b715d
Merge pull request #4059 from matrix-org/uhoreg/refactor_event_grouping
refactor event grouping into separate helper classes
2020-02-14 10:35:34 -05:00
Michael Telatynski
8087f18bf7 Remove unused props
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-02-14 10:32:42 +00:00
Marco Zehe
7840aa74fd Fix ID to be namespaced
Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-13 19:18:21 +01:00
Marco Zehe
6319407cab Move the sidebar to below the sidebar tab buttons for screen readers.
Do this by aria-owning the sidebar into the header wrapper. aria-owned subtrees get added as the last child after all other child elements that are in the DOM. This way, if a sidebar tab is activated, the aside element now is inserted in a position following the tabs, before the main messages list. The association for screen readers is therefore more logical. This has no bearing on the DOM order or CSS properties. aria-owns simply rearranges the accessibility tree.

Fixes vector-im/riot-web/issues/11319

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
2020-02-13 16:02:58 +01:00
Hubert Chathi
be70ef44f8 lint 2020-02-11 15:34:14 -05:00
Hubert Chathi
4c5046afd5 refactor event grouping into separate helper classes 2020-02-11 15:19:32 -05:00
Bruno Windels
a84e90df51
Merge pull request #4042 from matrix-org/bwindels/encryptionpaneleverywhere
Use EncryptionPanel everywhere, part I
2020-02-11 15:16:47 +00:00
Michael Telatynski
ee819dfdf8 fix call to SettngsStore.watchSetting, it takes a roomID 2020-02-11 09:32:09 +00:00
Michael Telatynski
b9db0ad013
Merge pull request #4047 from matrix-org/t3chguy/hide_typing_notifs
Add setting to allow hiding of typing indicator
2020-02-10 18:01:52 +00:00
Bruno Windels
8c3004c2ac to_device requests now can include .request so we might need send .ready 2020-02-10 16:19:27 +01:00
Travis Ralston
ea4d97fa73 Hack in a layout option 2020-02-10 16:19:27 +01:00
Bruno Windels
3d91ff23ec cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog
so we get QR code support and support phases prior to STARTED
2020-02-10 16:19:27 +01:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
Michael Telatynski
4d0d6cdaa4
Merge branch 'develop' into t3chguy/password_completion 2020-02-05 20:24:37 +00:00
Zoe
f89ae19d76
Merge pull request #4028 from matrix-org/foldleft/12114-less-alarming-on-own-devices
Do not show alarming red shields on large encrypted rooms for your own device
2020-02-04 17:09:16 +00:00
Zoe
41f4b38fe8 Do not show alarming red shields on large encrypted rooms for your own device
Fixes: https://github.com/vector-im/riot-web/issues/12214
2020-02-03 16:53:32 +00:00
Travis Ralston
aa6eabcf57 Don't crash immediately if the room directory chunk is null/empty
Fixes https://github.com/vector-im/riot-web/issues/12197
2020-02-03 15:49:18 +00:00
David Baker
11cb3a60b2 Fix listener leak in TagPanel 2020-02-03 13:33:44 +00:00
David Baker
85489c4ec5
Merge pull request #4014 from matrix-org/dbkr/theme_is_login_override
Add an override for the theme
2020-01-31 13:30:12 +00:00
J. Ryan Stinnett
636b3696ed
Merge pull request #4011 from matrix-org/jryans/comp-sec-title
Add title to complete security loading
2020-01-31 13:22:22 +00:00
David Baker
cb9362456f remove setter 2020-01-31 13:18:01 +00:00
David Baker
2d9b111680 Add an override for the theme
So we can force the light theme on unthemeable pages like the login
& complete security page.

Fixes https://github.com/vector-im/riot-web/issues/12149
Fixes https://github.com/vector-im/riot-web/issues/12157
2020-01-31 12:28:14 +00:00
J. Ryan Stinnett
1a95a1d4ba Add title to complete security loading 2020-01-31 10:47:58 +00:00
David Baker
ea7f160950 lint 2020-01-31 10:38:20 +00:00
David Baker
26c9b64c3b Log exceptions from accessSecretStorage
Rather than ignoring everything assuming the user cancelled
2020-01-31 10:35:05 +00:00
David Baker
39e9bffe1f Make encryption events into bubble-style tiles
Factors out the verification tile stuff into encryption event
styles so we can reuse them betwen all the encryption event tiles.
Also makes the event list summary stuff even more gnarly by
putting the encryption event tile above the group. We really need
to refactor that. :/

Fixes https://github.com/vector-im/riot-web/issues/12006
2020-01-30 20:03:26 +00:00
David Baker
2f4b3272da Send initial device display najme on register
Fixes https://github.com/vector-im/riot-web/issues/12140
2020-01-30 11:27:54 +00:00
J. Ryan Stinnett
786ddb8a7e
Merge pull request #3985 from matrix-org/jryans/relax-account-data-check
Relax secret storage account data check
2020-01-29 20:40:13 +00:00
David Baker
d63bb240aa
those words again
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-29 17:52:12 +00:00
David Baker
de6ef9ec90
words
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-29 17:51:51 +00:00
David Baker
e403169e13 Fix various races that prevented the right panel being in the right state for verifications
Fixes https://github.com/vector-im/riot-web/issues/11989
2020-01-29 16:56:12 +00:00
J. Ryan Stinnett
6f0d88a126 Relax secret storage account data check
If the homeserver is confused about account data or otherwise explodes here, we
don't want to block login, so just warn in this case.
2020-01-29 16:54:08 +00:00
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
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
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
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
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
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
Hubert Chathi
793ff2cccc
Hide pre-join UTDs (#3881) 2020-01-28 15:36:24 -05: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
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
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
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
89f110f60a Add separate component for post-auth security flows
Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
2020-01-27 22:28:07 +00:00
Zoe
1964e18315 Fix issue where we don't notice if our own devices shouldn't be trusted 2020-01-27 16:40:56 +00:00
Michael Telatynski
ddb0f06005 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
2020-01-27 15:46:38 +00:00
David Baker
1ab91d1d74
Merge pull request #3943 from matrix-org/dbkr/kill_lingering_verification_toast
Stop rogue verification toast if you verify during login
2020-01-27 11:17:55 +00:00
David Baker
6737523b1c
Merge pull request #3942 from matrix-org/dbkr/show_incoming_verifications_in_complete_security
Show incoming verification requests in the 'complete security' phase
2020-01-27 11:17:16 +00:00
David Baker
11de92b9a9 hopefully informative comment 2020-01-27 11:07:55 +00:00
David Baker
086e43e584 comments ftw 2020-01-25 21:30:42 +00:00
David Baker
f851f976e7 Stop rogue verification toast if you verify during login
Fixes https://github.com/vector-im/riot-web/issues/12057
2020-01-25 21:26:43 +00:00
David Baker
9e38c62791 Show incoming verification requests in the 'complete security' phase
If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen.
2020-01-25 20:42:45 +00:00
David Baker
437b45f8a6 Remember password for e2e bootstrapping
Fixes https://github.com/vector-im/riot-web/issues/12046
2020-01-25 15:28:06 +00:00
David Baker
988ae14d35
Merge pull request #3937 from matrix-org/dbkr/e2esetup
Setup flow for cross-signing on login / registration
2020-01-25 12:40:17 +00:00