mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 11:31:31 +03:00
Code Issues Projects Releases Packages Wiki Activity
19292 commits 219 branches 562 tags 474 MiB
Commit graph

6004 commits

Author SHA1 Message Date
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
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Travis Ralston
616a5ab55d Merge branch 'develop' into travis/deactivate-2 2019-11-15 10:24:20 -07: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
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
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
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
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
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
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
Michael Telatynski
5c24547ef5 re-add and actually use promise timeout util 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-14 09:37:26 +00:00
Michael Telatynski
79ebb9091c
Merge branch 'develop' into t3chguy/remove_bluebird_1 2019-11-12 18:16:34 +00:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00
Michael Telatynski
f5d467b391 delint 2019-11-12 12:26:07 +00:00
Michael Telatynski
2b34cf4362 Replace Promise.delay with promise utils sleep 
(cherry picked from commit 0a21957b2c)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
217dfc3eed Replace all trivial Promise.defer usages with regular Promises 
(cherry picked from commit 44401d73b4)
 2019-11-12 12:07:56 +00:00
Michael Telatynski
548e38cba9 Revert "Replace all trivial Promise.defer usages with regular Promises" 
This reverts commit 44401d73
 2019-11-12 11:56:53 +00:00
Michael Telatynski
f9d6ed63f0 Revert "Replace Promise.delay with promise utils sleep" 
This reverts commit 0a21957b
 2019-11-12 11:56:32 +00:00
Michael Telatynski
168b1b68bb Revert "s/.done(/.then(/ since modern es6 track unhandled promise exceptions" 
This reverts commit 09a8fec2
 2019-11-12 11:56:21 +00:00
Michael Telatynski
09a8fec261 s/.done(/.then(/ since modern es6 track unhandled promise exceptions 2019-11-12 11:51:23 +00:00
Michael Telatynski
0a21957b2c Replace Promise.delay with promise utils sleep 2019-11-12 11:46:58 +00:00
Michael Telatynski
44401d73b4 Replace all trivial Promise.defer usages with regular Promises 2019-11-12 11:40:38 +00:00
Travis Ralston
df1d5055c0
Merge pull request #3606 from matrix-org/travis/edit-history 
Use a ternary operator instead of relying on AND semantics in EditHistoryDialog
 2019-11-11 08:24:07 -07:00
Travis Ralston
bdcf3890a5 Fix HTML fallback in replies 
Correctly encode the `body` to avoid problems down the line. We also convert newlines to `<br/>` to better represent the message as a fallback.

Fixes https://github.com/vector-im/riot-web/issues/9413
 2019-11-08 16:07:11 -07:00
Travis Ralston
c4d45e87ea Use a ternary operator instead of relying on AND semantics in EditHIstoryDialog 
Fixes https://github.com/vector-im/riot-web/issues/11334 (probably).

`allEvents` should never have a boolean in it, so given the stack trace and the code this is my best estimate for what the problem could be. I can't reproduce the problem.
 2019-11-08 15:54:48 -07:00
Travis Ralston
5a5ebee918 Check for a message type before assuming it is a room message 
Redacted messages do not have message types, despite being room messages. 

Fixes https://github.com/vector-im/riot-web/issues/11352

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3601

Click-to-ping being broken (as mentioned by https://github.com/vector-im/riot-web/issues/11353) is a side effect of the react stack falling over. Once one room crashes, click-to-ping is broken everywhere.
 2019-11-08 10:39:38 -07:00
David Baker
43c6298bea
Merge pull request #3601 from matrix-org/bwindels/verification-over-dm 
Show verification requests in the timeline
 2019-11-08 16:20:01 +00:00
J. Ryan Stinnett
3645e4a822
Merge pull request #3600 from matrix-org/jryans/thumb-variation-again 
Restore thumbs after variation selector removal
 2019-11-07 22:47:15 +02:00