mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-27 05:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity
21478 commits 208 branches 547 tags 609 MiB
Commit graph

17180 commits

Author SHA1 Message Date
Travis Ralston
ccde5530d2 Add reciprocate as a method 2020-02-10 17:34:45 +01:00
Travis Ralston
afc38b92a0 Always send scan for RiotX (for now) 2020-02-10 17:33:19 +01:00
Bruno Windels
936b40f6b5 remove commented out code 2020-02-10 16:19:27 +01:00
Bruno Windels
a693af0c6b fix lint 2020-02-10 16:19:27 +01:00
Bruno Windels
2a8453b939 i18n fixes 2020-02-10 16:19:27 +01:00
Bruno Windels
9059f00b29 move css to correct file 
Move the CSS for the dialog layout used in VerificationPanel to
_VerificationPanel.scss,
and delete the latter as it doesn't have any css of it's own anymore
 2020-02-10 16:19:27 +01:00
Bruno Windels
8c3004c2ac to_device requests now can include .request so we might need send .ready 2020-02-10 16:19:27 +01:00
Bruno Windels
a865cfb013 put encryption in a proper dialog with close button 2020-02-10 16:19:27 +01:00
Bruno Windels
39fab02fcc rename DeviceVerifyOwnDialog to VerificationRequestDialog 
as it works (and we want to use it) for any verification request,
not just between two devices of the same user
 2020-02-10 16:19:27 +01:00
Travis Ralston
ea4d97fa73 Hack in a layout option 2020-02-10 16:19:27 +01:00
Bruno Windels
ee23bfe625 need to close the current dialog before opening a new modal 2020-02-10 16:19:27 +01:00
Bruno Windels
f368339b78 cram EncryptionPanel into a Dialog when clicking from new session dialog 2020-02-10 16:19:27 +01:00
Bruno Windels
b210c9cb76 close dialog after clicking continue 2020-02-10 16:19:27 +01:00
Travis Ralston
469d533964 Apply some CSS 2020-02-10 16:19:27 +01:00
Bruno Windels
747a4866e2 indenting 2020-02-10 16:19:27 +01:00
Bruno Windels
3d91ff23ec cram the EncryptionPanel in CompleteSecurity instead of IncomingSasDialog 
so we get QR code support and support phases prior to STARTED
 2020-02-10 16:19:27 +01:00
Travis Ralston
bc5a59339b Send NewSessionReviewDialog through dialogs 2020-02-10 16:19:27 +01:00
Bruno Windels
5866d67c88 Alterations to DeviceVerifyDialog to support picking QR code 2020-02-10 16:18:44 +01:00
Bruno Windels
6b85ca2fb9 add qr code method to new session dialog 2020-02-10 16:17:49 +01:00
Bruno Windels
496dfc6187 send a .request and open it in the right panel on new session verify 2020-02-10 16:17:05 +01:00
Michael Telatynski
74af4fd764 disabled submit button be disabled 2020-02-09 15:07:07 +00:00
Michael Telatynski
2230e746aa sprinkle preventDefaults on form submission handlers 2020-02-09 15:03:28 +00:00
Michael Telatynski
0393a57b5a fix submit button disabled breaking async task 2020-02-09 14:49:54 +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
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
Bruno Windels
720450f372
Merge pull request #4038 from matrix-org/bwindels/4sunlockpurpose 
Differentiate AccessSecretStorageDialog dismiss dialog based on which key we want to read
 2020-02-07 08:58:53 +00:00
J. Ryan Stinnett
a160fbf0cc
Merge pull request #4039 from matrix-org/jryans/rvs-spam 
Only emit in RoomViewStore when state actually changes
 2020-02-06 21:12:54 +00:00
J. Ryan Stinnett
c916ef4534 Only emit in RoomViewStore when state actually changes 
This adds a shallow state check to attempt to only emit a store update when
something actually changes.

Fixes https://github.com/vector-im/riot-web/issues/12256
 2020-02-06 17:57:17 +00:00
Bruno Windels
cd65cab2e2
Merge pull request #4029 from matrix-org/bwindels/onlyexplicitdismissmodal 
Mark AccessSecretStorageDialog to not be closed by clicking background
 2020-02-06 16:09:11 +00:00
Bruno Windels
02d169060d differentiate dismiss dialog based on name passed from js-sdk 
also make dialog a bit nicer with more descriptive button
 2020-02-06 16:51:02 +01:00
Bruno Windels
a8958458aa fix lint, add jsdoc 2020-02-06 15:29:35 +01:00
Bruno Windels
cf7ad725a6 copy and i18n 2020-02-06 15:18:25 +01:00
J. Ryan Stinnett
c3f4eaf4e5
Merge pull request #4035 from matrix-org/jryans/seshat-rooms-i18n 
Improve event indexing status strings for translation
 2020-02-06 12:53:10 +00:00
Bruno Windels
4cd4110a52 fixup: this is already done in _buildModal 2020-02-06 13:13:37 +01:00
Bruno Windels
70a4d3415e confirm to close the passphrase dialog if it was done by backgroundClick 
as it is easy to do by accident
 2020-02-06 13:11:24 +01:00
Bruno Windels
c44ebef06f add onBeforeClose option to Modal 
so we can throw up another "are you sure" dialog
in the cases we want to do so. This also
passes a reason so we can only do so for ways of
dismissing (like backgroundClick)
that are easy to do by accident.
 2020-02-06 13:10:06 +01:00
Bruno Windels
7e07a42dc1 resolve finished promise when closing dialog by clicking background 
... by calling the same close method as otherwise and not
have a special path that just calls the onFinished callback.
This will also not close all the dialogs anymore,
but that sort of seems like the intented behaviour?
 2020-02-06 13:07:13 +01:00
Michael Telatynski
4d0d6cdaa4
Merge branch 'develop' into t3chguy/password_completion 2020-02-05 20:24:37 +00:00
Bruno Windels
a0c2a39dc7 make a static dialog close again if background is clicked 2020-02-05 13:43:30 +01:00
Michael Telatynski
d8d8dd4508
Merge pull request #4034 from matrix-org/t3chguy/s1 
Only enumerate settings handlers which are supported
 2020-02-05 10:16:03 +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
J. Ryan Stinnett
b92fe59436 Improve event indexing status strings for translation 
The strings used for the count of rooms was hard to translate, so this adds a
bit more context.
 2020-02-04 23:09:49 +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
Michael Telatynski
d585dbab02 Merge branches 'develop' and 't3chguy/s1' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/s1 2020-02-04 15:48:04 +00:00
Michael Telatynski
e23a3e98be Only enumerate settings handlers which are supported currently 2020-02-04 15:27:38 +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
Michael Telatynski
f6c7df8c69 Keep date in Watcher IDs 2020-02-04 11:14:49 +00:00