Commit graph

96 commits

Author SHA1 Message Date
Travis Ralston
cd9fc72fff Merge branch 'develop' into t3chguy/rightpanel 2020-01-16 10:04:18 -07:00
Michael Telatynski
0f61aa57ff
Apply suggestions from code review
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-01-16 17:00:04 +00:00
Travis Ralston
5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
Michael Telatynski
9c686bf501 Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-13 12:15:54 +00:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski
0a9d7f43c6 pass the correct phase params for consistency
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-09 15:51:19 +00:00
Michael Telatynski
7dfc392a2b Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-09 15:48:06 +00:00
Michael Telatynski
a62c260f79 Fix userinfo for users not in the room
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-07 12:58:24 +00:00
Michael Telatynski
6a1f4c41ce
Merge pull request #3788 from matrix-org/t3chguy/user_info_non-historical
User Info fetch latest RoomMember instead of showing historical data
2020-01-06 11:25:54 +00:00
Michael Telatynski
4118faa834 When looking at a MemberInfo, clicking on MemberList should close not switch
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 20:31:07 +00:00
Michael Telatynski
fb754b795c Fix right panel buttons highlighting
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-05 20:30:01 +00:00
David Baker
5897c8ca7f Remove 'unverify' from UserInfoPanel
It's not in the designs and it's not a thing we can do with
cross-signing (at least not at the moment).
2020-01-03 15:00:51 +00:00
Michael Telatynski
705bfcd20d fix RoomViewStore import in UserInfo 2019-12-28 17:54:46 +00:00
Michael Telatynski
a0cb6ce302 User Info fetch latest RoomMember instead of showing historical data 2019-12-28 17:51:38 +00:00
Michael Telatynski
73800c9a92 Fix UserInfo promote user inverted buttons 2019-12-26 18:04:58 +00:00
Michael Telatynski
0497ef228d UserInfo hide kick/mute buttons if they make no sense 2019-12-23 18:20:59 +00:00
Travis Ralston
042bd35d79 Fix MatrixClientPeg imports 2019-12-22 21:15:54 -07:00
Travis Ralston
d56f0f2a25 Convert many imports to handle ES6 exports
Reliant upon https://github.com/matrix-org/matrix-react-sdk/pull/3761
2019-12-22 21:04:42 -07:00
David Baker
a928b33f27 Don't show the 'verify' button if the user is verified
Which is more in keeping with the designs (and we can do this now
that the new user info panel is only enabled with cross signing).
2019-12-20 16:51:50 +00:00
David Baker
b998e6ffe8 Switch to using checkDeviceTrust
In the UserInfo panel. This means we now use cross-signing
verifications in the UserInfoPanel so we can see our cross-signing
verifications working!

Lots more to do here: the remaining device.isVerified() calls in
UserInfoPanel are where it needs to be switched to verifying users
rather than devices, and of course we need to replace all the calls
to device.isVerified() with checkDeviceTrust everywhere else.
2019-12-20 11:31:11 +00:00
Michael Telatynski
24d0d0d596
Merge pull request #3743 from matrix-org/t3chguy/react16_contexts
Migrate away from React Legacy contexts API
2019-12-19 20:32:11 +00:00
Michael Telatynski
66783dff9e Fix scaling of the avatar in UserInfo 2019-12-19 12:27:25 +00:00
Michael Telatynski
3196655524 Replace UserInfo avatar with <MemberAvatar/> for fallback logic 2019-12-19 10:42:47 +00:00
Michael Telatynski
da4d72b3c4 delint 2019-12-17 17:34:03 +00:00
Michael Telatynski
937b32663c Migrate away from Legacy React Contexts 2019-12-17 17:26:12 +00:00
Michael Telatynski
c1133ebfc6 null-guard useIsEncrypted 2019-12-17 14:05:51 +00:00
J. Ryan Stinnett
2df72bfde2 Update room / user decoration for cross-signing 2019-12-13 17:57:26 +00:00
J. Ryan Stinnett
3ac0deebab Use static modals for verification
Verification with cross-signing may requiring asking for your secret storage
passphrase, which is displayed in it's own modal on top of flows. For now while
verification takes in modals also, mark the verification ones as static so they
don't lose state when secret storage appears on top mid-flow.
2019-12-13 13:55:28 +00:00
J. Ryan Stinnett
38ee1aed09 Replace sign-ins with sessions
The designs were changed to use the term "sessions" instead of "sign-ins".
2019-12-12 16:35:02 +00:00
Travis Ralston
4bcf99f65e Fix member info not opening
The subclasses listen for view_user and similar dispatches, which then start up the RightPanel. We weren't registering a listener though because we changed to using the RightPanelStore for most of our logic.
2019-12-06 14:51:49 -07:00
Travis Ralston
a24bbdffd0 Appease the linter
Mid-PR cleanup.
2019-12-05 23:58:19 -07:00
Travis Ralston
ca0c393783 Use new right panel store for header buttons
This introduces a new dispatch action (unused, so far) and routes the buttons towards the RightPanelStore for processing.
2019-12-05 23:28:06 -07:00
Travis Ralston
6e882251bd Break the right panel completely
This lays a foundation for redirecting all the traffic through the new store, but for now the core parts of the app need to stop caring if the right panel is open.
2019-12-05 17:47:18 -07:00
Travis Ralston
616a5ab55d Merge branch 'develop' into travis/deactivate-2 2019-11-15 10:24:20 -07:00
Bruno Windels
d416ba2c0c add verify button while we don't have the verification in right panel 2019-11-15 16:14:18 +01:00
Bruno Windels
3a399e18fc prevent https://github.com/vector-im/riot-web/issues/11338 2019-11-15 16:14:18 +01:00
Bruno Windels
53019c5e91 don't show devices section when not encrypted, as it just shows spinner 2019-11-15 16:14:18 +01:00
Bruno Windels
92237f1045 cleanup 2019-11-15 16:14:18 +01:00
Bruno Windels
264c8181c2 add canEdit to permission state, more explicit than maxLevel >= 0 2019-11-15 16:14:18 +01:00
Bruno Windels
48b1207c6e split up PowerLevelEditor into two components
one while editing (PowerLevelEditor) and one
while not editing (PowerLevelSection).

Also save when pressing the button, not when changing the
power dropdown.

Also show the spinner next to the dropdown when saving,
not at the bottom of the component.
2019-11-15 16:14:18 +01:00
Bruno Windels
e86ceb986f pass powerlevels state to power level section and admin section 2019-11-15 16:14:18 +01:00
Bruno Windels
bd853b3102 listen for RoomState.members instead of RoomState.events
as the powerlevel on the member is not yet updated at the time
RoomState.events is emitted.

Also listen on the client for this event as the currentState
object can change when the timeline is reset.
2019-11-15 16:14:18 +01:00
Bruno Windels
6db162a3a7 add PL edit mode, don't show selector by default
still saves when changing the selector though
2019-11-15 16:14:18 +01:00
Bruno Windels
9e8a2eda1f small fixes 2019-11-15 16:14:18 +01:00
Bruno Windels
030827f77d mark destructive actions in red 2019-11-15 16:14:18 +01:00
Bruno Windels
0bd1e7112d style security section as per design 2019-11-15 16:14:18 +01:00
Bruno Windels
04731d0ae3 RoomState.events fired on RoomState object, not room 2019-11-15 16:14:18 +01:00
Bruno Windels
6afeeddb36 hide verified devices by default with expand button 2019-11-15 16:14:18 +01:00
Bruno Windels
4a1dc55673 fixup: rearrange openDMForUser 2019-11-15 16:14:18 +01:00
Bruno Windels
e32a948d5d add "unverify user" action to user info 2019-11-15 16:14:18 +01:00