8ba54f5f7d
Don't use expect and jest-mock anymore as they're implicit from jest
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-18 01:38:22 +00:00
5584068c5b
Merge pull request #3865 from matrix-org/dbkr/new_session_toast_feature_flag
...
Move feature flag check for new session toast
2020-01-17 20:38:44 +00:00
c7ddba786b
Move feature flag check for new session toast
...
Forgot the path where it checks on startup. Just put it in recheck which covers everything.
Fixes https://github.com/vector-im/riot-web/issues/11921
2020-01-17 20:06:44 +00:00
158bf3d1fa
Merge pull request #3863 from matrix-org/dbkr/catch_exception_checkterms
...
Catch exception in checkTerms if no ID server
2020-01-17 16:55:41 +00:00
03cb76861f
Catch exception in checkTerms if no ID server
...
This line will throw if it can't get to the ID server, so move it
inside the catch block too.
2020-01-17 16:26:47 +00:00
6beae0ed39
Merge pull request #3862 from matrix-org/dbkr/catch_exception_cancel_passphrase
...
Catch exception if passphrase dialog cancelled
2020-01-17 15:43:21 +00:00
d69c5f6a1b
Catch exception if passphrase dialog cancelled
...
As hopefully explained by comment
2020-01-17 14:46:20 +00:00
1a6be3addd
Merge pull request #3860 from matrix-org/jryans/disable-key-request
...
Disable key request dialogs with cross-signing
2020-01-17 14:24:23 +00:00
a525ba57c7
Merge pull request #3859 from matrix-org/dbkr/new_session_toast
...
Toasts for new, unverified sessions
2020-01-17 14:17:22 +00:00
3a29a5e66c
Merge pull request #3861 from matrix-org/dbkr/suppress_integrationmanagers_error
...
Check for a matrixclient before trying to use it
2020-01-17 14:09:05 +00:00
42fe69aec9
Don't check devices if crypto is disabled
2020-01-17 14:08:37 +00:00
9b64686041
Add missing import
2020-01-17 13:50:24 +00:00
264ca1ecba
Merge pull request #3850 from matrix-org/zip/11225-shields-distinguish-encrypt-from-verify
...
Room header & message box shields now reflect cross-signing state
2020-01-17 13:49:59 +00:00
066a01ae94
Check for a matrixclient before trying to use it
...
Was being caught by the try block but still logging an error to the
console unnecessarily: we should not expect there to necessarily
be a matrix client since we run this from the constructor and
there's a shared instance which could be constructed at any point.
2020-01-17 13:35:51 +00:00
fb9962b08e
Disable key request dialogs with cross-signing
...
Cross-signing verification is meant to replace the old key share between devices
flow. This disables it when the cross-signing lab is enabled.
Fixes https://github.com/vector-im/riot-web/issues/11904
2020-01-17 13:09:10 +00:00
9e43abaf3a
Toasts for new, unverified sessions
...
Fixes https://github.com/vector-im/riot-web/issues/11218
2020-01-17 11:43:35 +00:00
908630c0d9
*rude grumbling noises about @dbkr*
2020-01-17 11:30:45 +00:00
d02185e4af
whoops, the number of unverified users matters to the logic
2020-01-17 10:22:53 +00:00
510b08c88b
changed logic to reflect the task
2020-01-17 10:18:50 +00:00
e88f062f01
Merge pull request #3857 from matrix-org/t3chguy/Array.concat
...
Fix Array.concat undefined
2020-01-17 10:16:43 +00:00
9877fd9e85
Fix Array.concat undefined
2020-01-17 10:04:38 +00:00
8efc45b31a
no need to verify our own devices for every room
2020-01-17 10:04:34 +00:00
491cef4f92
Merge pull request #3856 from matrix-org/travis/fix-reskindex
...
Update chokidar to fix reskindex not working
2020-01-16 15:46:01 -07:00
f535fdbcaa
Update chokidar to fix reskindex not working
...
The major version bump doesn't appear to affect us. It wasn't working before on Windows, but now it is.
2020-01-16 15:39:07 -07:00
8cdce8fee0
Merge pull request #3854 from matrix-org/travis/ftue/user-lists/6.1-multidialog
...
Make the new DM invite dialog work for regular invites too
2020-01-16 15:06:52 -07:00
576434e8c8
Merge pull request #3855 from matrix-org/jryans/custom-status-leak
...
Fix event handler leak in MemberStatusMessageAvatar
2020-01-16 22:05:50 +00:00
d5eb011f48
Merge pull request #3843 from matrix-org/travis/ftue/user-lists/5.3-go-button
...
Move DM creation logic into DMInviteDialog
2020-01-16 15:05:09 -07:00
43f97af805
Merge pull request #3848 from matrix-org/travis/fix-cut
...
Remove all text when cutting in the composer
2020-01-16 15:03:41 -07:00
03448313e6
Fix event handler leak in MemberStatusMessageAvatar
...
A typo led to an event handler leak with the custom status labs feature. A new
handler would leak each time you change rooms, which can add up over the course
of a long-lived session.
2020-01-16 21:52:36 +00:00
e42663fc62
Appease the linter
2020-01-16 14:45:17 -07:00
1a961358f0
Don't show recents and suggestions for users already in the room
2020-01-16 14:40:25 -07:00
f350167408
Support using the InviteDialog for both DMs and invites
...
For https://github.com/vector-im/riot-web/issues/11201
2020-01-16 14:40:12 -07:00
73fc91aa20
Rename feature flag for use in both code paths
2020-01-16 13:44:59 -07:00
7da9e0582f
Rename DMInviteDialog to be a generic Invite Dialog
2020-01-16 13:42:34 -07:00
5380651c84
Merge branch 'travis/ftue/user-lists/5.3-go-button' into travis/ftue/user-lists/6.1-multidialog
2020-01-16 13:38:39 -07:00
372861c9df
Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button
2020-01-16 13:36:59 -07:00
cf426b5cf3
Merge pull request #3853 from matrix-org/dbkr/toaststore
...
Add a ToastStore
2020-01-16 20:34:49 +00:00
83b1505401
Add a ToastStore
...
To store toast. Rather than them being stored in the state of the
ToastContainer component, they now have a dedicated store. This mostly
fixes problems involving showing toasts when the app loaded because
we would otherwise have a race condition where something tries to
show a toast before the ToastContainer is mounted.
2020-01-16 20:23:47 +00:00
3ed7beac78
Merge pull request #3804 from matrix-org/t3chguy/rightpanel
...
'Members' button always toggle the right panel
2020-01-16 10:11:24 -07:00
cd9fc72fff
Merge branch 'develop' into t3chguy/rightpanel
2020-01-16 10:04:18 -07:00
0f61aa57ff
Apply suggestions from code review
...
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-01-16 17:00:04 +00:00
64c4677699
Merge pull request #3842 from matrix-org/t3chguy/fix_isModified
...
Fix timing of when Composer considers itself to be modified
2020-01-16 09:54:36 -07:00
e375b1d31f
Merge pull request #3851 from matrix-org/jryans/download-file-icon
...
Compute download file icon immediately
2020-01-16 16:53:25 +00:00
564a30b7be
Merge pull request #3852 from matrix-org/travis/fix-member-avatar
...
Fix not being able to open profiles from the timeline
2020-01-16 09:47:17 -07:00
4ea2a2fee4
Merge branch 'develop' into t3chguy/fix_isModified
2020-01-16 09:46:28 -07:00
89230395eb
Merge pull request #3847 from matrix-org/jryans/cross-signing-setup
...
Add post-login complete security flow
2020-01-16 16:42:23 +00:00
869fd0b2c9
Fix not being able to open profiles from the timeline
...
MemberAvatar was referencing the wrong dispatcher (it was imported as `dis`, like everywhere else, not `dispatcher`).
Fixes https://github.com/vector-im/riot-web/issues/11887
2020-01-16 09:40:11 -07:00
82c5349c4e
Updated to properly handle logic
2020-01-16 16:31:50 +00:00
0ef362a793
Request mock should send truthy for errors
2020-01-16 14:06:54 +00:00
dab31d724d
Support uri option in request mock
2020-01-16 14:01:15 +00:00
Michael Telatynski