Michael Telatynski
5c172a383d
Merge branch 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird
...
Conflicts:
src/components/views/right_panel/UserInfo.js
2019-11-18 10:36:43 +00:00
Michael Telatynski
2fe764a3e9
Merge branches 'develop' and 't3chguy/remove_bluebird_2' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/remove_bluebird_2
2019-11-18 10:24:14 +00:00
Michael Telatynski
d4d51dc61f
Rip out the remainder of Bluebird
2019-11-18 10:03:05 +00:00
Michael Telatynski
47948812b0
Attempt number two at ripping out Bluebird from rageshake.js
2019-11-18 09:47:37 +00:00
Michael Telatynski
1ab9b82c25
Merge pull request #3618 from matrix-org/t3chguy/remove_bluebird_2
...
Remove Bluebird: phase 2.1
2019-11-18 09:29:04 +00:00
Travis Ralston
d15722d4c9
Merge pull request #3619 from matrix-org/travis/deactivate-2
...
Add better error handling to Synapse user deactivation
2019-11-15 10:54:17 -07:00
Travis Ralston
61454bcf32
Fix i18n after merge
2019-11-15 10:25:58 -07:00
Travis Ralston
616a5ab55d
Merge branch 'develop' into travis/deactivate-2
2019-11-15 10:24:20 -07:00
Bruno Windels
41f832a549
Merge pull request #3620 from matrix-org/bwindels/userinfomakeover
...
New design for member panel
2019-11-15 16:37:42 +00:00
Bruno Windels
0f39a9f72d
fix pr feedback
2019-11-15 17:29:38 +01: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
ecc842629a
fix css lint errors
2019-11-15 16:14:18 +01:00
Bruno Windels
edd5d3c915
make custom power level not grow too wide
2019-11-15 16:14:18 +01:00
Bruno Windels
1162d1ee43
Fix user info scroll container growing larger than available height
...
making whole room view grow taller than viewport
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
91e02aa623
hide PL numbers on labels
2019-11-15 16:14:18 +01:00
Bruno Windels
d0914f9208
allow label to be empty on power selector
2019-11-15 16:14:18 +01:00
Bruno Windels
b278531f2f
add IconButton as in design
2019-11-15 16:14:18 +01:00
Bruno Windels
942a1c9a56
fix e2e icon in composer having wrong colors
2019-11-15 16:14:18 +01:00
Bruno Windels
e3f7fe51dc
use normal shield for verification requests
2019-11-15 16:14:18 +01:00
Bruno Windels
fe059e524f
don't need this, as it takes height from the constrained width
2019-11-15 16:14:18 +01:00
Bruno Windels
ca12e6c010
don't render unverified state on bubbles
...
as they are only used for verification right now,
and verification events will be unverified by definition,
so no need to alarm users needlessly.
Also, this breaks the bubble layout on hover due to e2e icons
and verified left border style.
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
73b6575082
fixup: verified shield should be green
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
Bruno Windels
29216ef668
update when room encryption is turned on
...
also don't download devices as long as room is not encrypted
2019-11-15 16:14:18 +01:00
Bruno Windels
bd2bf4500a
remove direct message list from UserInfo
2019-11-15 16:14:18 +01:00
Bruno Windels
238555f4ec
fixup: isMe
2019-11-15 16:14:18 +01:00
Bruno Windels
8dd7d8e5c0
fixup: don't consider left DM rooms
2019-11-15 16:14:18 +01:00
Bruno Windels
0a2255ce73
fixup: bring back margin above display name
2019-11-15 16:14:18 +01:00
Bruno Windels
b475bc9e91
Add direct message button
...
While we don't have canonical DMs yet,
it takes you to the most recently active DM room
2019-11-15 16:14:18 +01:00
Bruno Windels
3e356756aa
style profile info
2019-11-15 16:14:18 +01:00
Bruno Windels
f4988392f9
restyle e2e icons
2019-11-15 16:14:18 +01:00
Bruno Windels
af4ad488bd
Restyle Avatar
...
Make it a circle with the profile picture centered,
with a max height/width of 30vh
2019-11-15 16:14:18 +01:00
J. Ryan Stinnett
854b5a7af5
Merge pull request #3617 from matrix-org/jryans/login-server-details-when-dead
...
Show server details on login for unreachable homeserver
2019-11-14 20:29:32 +00:00
Travis Ralston
0f2f500a16
i18n update
2019-11-14 12:08:04 -07:00
Travis Ralston
b05dabe2b7
Add better error handling to Synapse user deactivation
...
Also clearly flag it as a Synapse user deactivation in the analytics, so we don't get confused.
Fixes https://github.com/vector-im/riot-web/issues/10986
2019-11-14 12:02:43 -07:00
Travis Ralston
4258a824df
Merge pull request #3615 from matrix-org/travis/base-theme
...
Add a function to get the "base" theme for a theme
2019-11-14 09:25:12 -07:00
