Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,461 Commits 206 Branches 552 Tags 519 MiB
3d91ff23ec
Commit Graph

21461 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ffb40d90da
Merge pull request #3974 from matrix-org/t3chguy/password_completion 
Use forms to wrap password fields so Chrome doesn't go wild
 2020-02-10 11:55:51 +00: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
a4228907a6
Merge pull request #4037 from matrix-org/jryans/scroll-up-pointer 
Let pointer events fall through to scroll button
 2020-02-06 13:52:14 +00: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
J. Ryan Stinnett
b522d78533 Let pointer events fall through to scroll button 
This makes it easier to click the entire visible area of the scroll button,
including the green circle at the top.
 2020-02-05 12:43:50 +00:00
Bruno Windels
a0c2a39dc7 make a static dialog close again if background is clicked 2020-02-05 13:43:30 +01:00
Travis Ralston
73b177d075
Merge pull request #4024 from TestardR/develop 
Button size reviewed for word consuming languages & Settings showing devices are a bit too tight
 2020-02-05 10:43:03 +00: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
d3cf4f132c
Merge pull request #4036 from matrix-org/jryans/mkey-remove 
Fix listener removal in verification tile
 2020-02-05 09:38:48 +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
Bruno Windels
c50bd8d30e
Merge pull request #4007 from hellcp/patch-1 
Add a class for styling room directory permissions
 2020-02-04 16:30:10 +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
Michael Telatynski
fff35fd2c9
Merge pull request #4031 from matrix-org/t3chguy/missing_dep 
Use minimist instead of optimist as it is deprecated
 2020-02-04 11:32:32 +00:00
Michael Telatynski
3a2cf87791
Merge pull request #4032 from matrix-org/t3chguy/watcher_id 
SettingsStore, use a counter instead of wall clock for watcher ids
 2020-02-04 11:32:12 +00:00
Zoe
544479a6ee test code cleaned up slightly 2020-02-04 11:31:16 +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
Michael Telatynski
e65404b631 Explicitly (not transitively) depend on minimist as bin script uses it 2020-02-04 11:13:18 +00:00
Michael Telatynski
2d8a2c5210 Merge branches 'develop' and 't3chguy/watcher_id' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/watcher_id 2020-02-04 10:47:53 +00:00
Michael Telatynski
3dd5986656 Merge branches 'develop' and 't3chguy/missing_dep' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/missing_dep 2020-02-04 10:47:27 +00:00
Michael Telatynski
a8f7e381eb SettingsStore, use a counter instead of wall clock for watcher ids 2020-02-04 10:41:48 +00:00
Michael Telatynski
b099c983d6 Use minimist instead of optimist as it is deprecated 2020-02-04 10:16:39 +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