Commit graph

4036 commits

Author SHA1 Message Date
Travis Ralston
9a14417a03 Don't try to reload profile information when closing the user panel
Fixes https://github.com/vector-im/riot-web/issues/13479

This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.

Instead of debugging it too much further, we'll just patch around it.

This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
2020-05-04 15:41:26 -06: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
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
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
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
Bruno Windels
886b30a265 also recheck 2020-04-29 18:55:25 +02:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Jorik Schellekens
fe326b9f08 Enfore function name capitalisation 2020-04-28 14:31:49 +01:00
Jorik Schellekens
93f24f12dc Match filename to class 2020-04-28 14:26:08 +01:00
Jorik Schellekens
cf05beb4b8
Merge pull request #4355 from JorikSchellekens/joriks/font-scaling-fixes
Fix scaling issues
2020-04-28 13:47:50 +01:00
Michael Telatynski
2792988ad1 Revert "Make Screens an enum"
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:59:07 +01:00
David Baker
7e956514a2 Lint 2020-04-27 20:35:39 +01:00
David Baker
3bdd24ce83 Make close button work from user info view
Adds more hacks so that the close button does something vagauely
plausible in all situations.
2020-04-27 18:34:48 +01:00
Jorik Schellekens
cef6868f02 Resize room list scroll section.
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
2020-04-27 11:51:55 +01:00
J. Ryan Stinnett
5af3d83cc7 Fix recovery link on login verification flow
This fixes the recovery link to go to the right place.

Fixes https://github.com/vector-im/riot-web/issues/13346
2020-04-23 18:14:30 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk"
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:11:29 +01:00
Jorik Schellekens
f5d6590751 Have max and min font configured in settings 2020-04-23 10:45:48 +01:00
Jorik Schellekens
abd94a65bd Move compoenets/FontSlider to views/Slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
dd841fcde9 Remove references to font 2020-04-23 10:45:47 +01:00
Jorik Schellekens
db1141b162 Move to typescript 2020-04-23 10:45:47 +01:00
Jorik Schellekens
4d0cac1260 Render should be last method declared 2020-04-23 10:45:47 +01:00
Jorik Schellekens
f1130ecba1 Linting. Finally set up my linter properly 2020-04-23 10:45:47 +01:00
Jorik Schellekens
66fd0f707f Type enforcement and comments 2020-04-23 10:45:47 +01:00
Jorik Schellekens
df73f12320 Make a font slider 2020-04-23 10:45:47 +01:00
Jorik Schellekens
af4dd2770c Respond to font size changes 2020-04-23 10:45:47 +01:00
Jorik Schellekens
38919518da Resize room list scroll section.
This fix isn't perfect. Currently the scroll view is
slightly smaller than the list of rooms. I think it has something
to do with the how the heigh is calculate in js, considering it has
some assumptions about the height of each bar and the padding. However
room items are the only things which change with respect to the root
value. Therefore the item list is actually taller than the computed
pixel value of the list converted to rems.

I'll look into it.
2020-04-23 10:45:46 +01:00
Michael Telatynski
f64929187a Make Screens an enum
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:44:35 +01:00
Michael Telatynski
e06b5f8cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 2020-04-23 10:12:56 +01:00
Michael Telatynski
4cf234197b iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:12:50 +01:00
Michael Telatynski
80b8120bc3 Update login security copy and design to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
Michael Telatynski
54e976f5a8 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:22:33 +01:00
Michael Telatynski
01abb61e9a C
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:08:33 +01:00
Michael Telatynski
89345c9e8b Convert MatrixChat to an ES6 Class Component
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 11:55:03 +01:00
Travis Ralston
972baa881b
Revert "Fix Filepanel scroll position state lost when room is changed" 2020-04-19 19:14:08 -06:00
Travis Ralston
e0d6fa3f51 Rename ref to timelinePanel 2020-04-17 15:15:51 -06:00
Travis Ralston
d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Travis Ralston
db749519e7 Merge branch 'develop' into travis/cross-sign-setting 2020-04-16 11:06:26 -06:00
Michael Telatynski
ce78e3b8d8 further tweaks by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:28:12 +01:00
Michael Telatynski
1fb0f39c84 Replace Verify this session and Complete security
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:23:01 +01:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
Travis Ralston
b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
Login block on initialSync with spinners
2020-04-15 16:17:13 +01:00
Michael Telatynski
81f501e844 disable language dropdown too
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
Michael Telatynski
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling
Allow network dropdown to be scrollable and fix context menu padding calc
2020-04-15 14:08:34 +01:00
Michael Telatynski
ac26719b69 disable password reset button when spinning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:07:37 +01:00
Michael Telatynski
8b25223026 fix onLoggedIn getting called twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
Michael Telatynski
346b2e8588 Login block on initialSync with spinners
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00