nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
21,496 Commits 258 Branches 582 Tags
f5111a6290ac04059421982991f092f39994fcb6
Commit Graph

9472 Commits

Author SHA1 Message Date
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
Zoe
d47d13256f Merge pull request #4041 from matrix-org/foldleft/12221-reset-cross-signing 
Button to reset cross-signing and SSSS keys
 2020-02-10 17:14:05 +00:00
Zoe
4f4b52d666 Update src/components/views/settings/CrossSigningPanel.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-02-10 16:59:17 +00:00
Zoe
69dc725006 rename button 2020-02-10 15:43:02 +00:00
Michael Telatynski
74af4fd764 disabled submit button be disabled 2020-02-09 15:07:07 +00:00
Michael Telatynski
150f2b3f84 Merge branches 'develop' and 't3chguy/password_completion' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/password_completion 2020-02-09 14:19:44 +00:00
Michael Telatynski
a8da4a3028 allow hiding of who is typing tile 2020-02-08 21:21:30 +00:00
Zoe
a260d7a147 manual lint 2020-02-07 15:53:43 +00:00
Zoe
b08c5d8410 lint 2020-02-07 15:46:31 +00:00
Travis Ralston
3c49515e08 Merge pull request #4001 from matrix-org/travis/qr-code-request-based 
Update QR code rendering to support VerificationRequests
 2020-02-07 15:37:53 +00:00
Travis Ralston
f6abd369ca Fix comments 2020-02-07 15:36:57 +00:00
Travis Ralston
bdeb9cccc4 Rename estimatedTargetDevice to targetDevice 2020-02-07 15:34:45 +00:00
Zoe
8fdae73e03 Button to reset cross-signing and SSSS keys 2020-02-07 14:55:01 +00:00
Michael Telatynski
4d0d6cdaa4 Merge branch 'develop' into t3chguy/password_completion 2020-02-05 20:24:37 +00:00
J. Ryan Stinnett
110c5f0e61 Fix listener removal in verification tile 
Fixes https://github.com/matrix-org/riot-web-rageshakes/issues/2202
 2020-02-04 23:13:55 +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
d822104159 Merge pull request #4010 from matrix-org/foldleft/11968-verify-verification 
double-check user verification
 2020-02-04 13:47:32 +00:00
Zoe
150fe7a45a Tests for MKeyVerificationConclusion 2020-02-04 11:25:19 +00:00
Travis Ralston
bf9d5b7f01 Merge pull request #4027 from matrix-org/travis/fix-room-list 
Don't crash immediately if the room directory chunk is null/empty
 2020-02-04 09:36:12 +00:00
Zoe
fab54ab936 Merge pull request #3998 from matrix-org/zip/12038-toast-timeouts 
Fix verification toast to close at 0s
 2020-02-04 09:30:47 +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
J. Ryan Stinnett
2584772bfb Merge pull request #4017 from matrix-org/jryans/e2e-copy-changes 
Apply copy edits to security setup flow
 2020-01-31 15:13:18 +00:00
J. Ryan Stinnett
16f72140b9 Merge pull request #4016 from matrix-org/jryans/verif-status-text 
Fix user trust text to match what was checked
 2020-01-31 15:12:52 +00:00
J. Ryan Stinnett
0fad5a62b4 Fix user trust text to match what was checked 
This fixes the unverified users status text to omit devices since they haven't
been checked.

Fixes https://github.com/vector-im/riot-web/issues/12176
 2020-01-31 14:06:57 +00:00
J. Ryan Stinnett
11008cfabf Merge pull request #4013 from matrix-org/jryans/padlock-flag 
Add temporary feature flag to control padlocks
 2020-01-31 13:44:12 +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
02cada7cc6 First pass of copy changes 2020-01-31 12:15:19 +00:00
J. Ryan Stinnett
b64ba1dbbf Add temporary feature flag to control padlocks 
This default on feature flag will help in case we want to trial padlocks on vs.
off this weekend.

Fixes https://github.com/vector-im/riot-web/issues/12166
 2020-01-31 11:09:49 +00:00
David Baker
c111d70deb Merge pull request #4009 from matrix-org/dbkr/log_exceptions_other_than_cancel 
Log exceptions from accessSecretStorage
 2020-01-31 11:00:16 +00:00
J. Ryan Stinnett
1a95a1d4ba Add title to complete security loading 2020-01-31 10:47:58 +00:00
J. Ryan Stinnett
19ab395c18 Merge pull request #3995 from matrix-org/jryans/4s-in-mem 
Add advanced option to keep secret storage in memory for session
 2020-01-31 10:45:57 +00:00
David Baker
ea7f160950 lint 2020-01-31 10:38:20 +00:00
Zoe
af0598bbcb double-check user verification 2020-01-31 10:37:40 +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
J. Ryan Stinnett
68b2454920 Merge pull request #4006 from matrix-org/jryans/user-list-deco 
Add shields to member list, move power label to text
 2020-01-31 10:20:13 +00:00
David Baker
24075dc248 Merge pull request #4005 from matrix-org/dbkr/encryption_events 
Make encryption events into bubble-style tiles
 2020-01-31 10:20:03 +00:00
Zoe
36d7b8e3ed don't close in UI, a js-sdk event will do that 2020-01-31 09:59:24 +00:00
David Baker
d0ab37ac50 Only say the room is encrypted if it actually is 2020-01-31 09:58:21 +00:00
Zoe
585a38cd45 Merge pull request #4000 from matrix-org/foldleft/12038-copy 
Update copy when the user verifies their own devices
 2020-01-31 09:57:52 +00:00
J. Ryan Stinnett
3ef7e5113b Move power label to right of name 
The power label is shown to the right of the name, but hidden on hover.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 22:09:57 +00:00
J. Ryan Stinnett
57c4293fc6 Add verification status icons to room members 
This displays verification status on each room member tile using the same shield
logic as elsewhere.

Part of https://github.com/vector-im/riot-web/issues/11940
 2020-01-30 21:38:40 +00:00
Michael Telatynski
7db6f89a9f hmm, there were two things using the client :(( 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:07:32 +00:00
Michael Telatynski
1e09399dd6 delint and collapse two consecutive filter operations 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-30 21:01:55 +00:00
David Baker
58d16fea7d lint 2020-01-30 20:59:27 +00:00
David Baker
2332cdb5d8 full stop 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-01-30 20:47:46 +00:00