OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
20,521 Commits
211 Branches
549 Tags
666 MiB
Commit Graph

20521 Commits (1a6be3addd61fbfaa2db822eb0e6d6b485d6a23d)

Author SHA1 Message Date
J. Ryan Stinnett 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
David Baker 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
David Baker 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
David Baker 42fe69aec9 Don't check devices if crypto is disabled 2020-01-17 14:08:37 +00:00
J. Ryan Stinnett 9b64686041 Add missing import 2020-01-17 13:50:24 +00:00
Zoe 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
David Baker 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
J. Ryan Stinnett 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
David Baker 9e43abaf3a Toasts for new, unverified sessions 
Fixes https://github.com/vector-im/riot-web/issues/11218
 2020-01-17 11:43:35 +00:00
Zoe 908630c0d9 *rude grumbling noises about @dbkr* 2020-01-17 11:30:45 +00:00
Zoe d02185e4af whoops, the number of unverified users matters to the logic 2020-01-17 10:22:53 +00:00
Zoe 510b08c88b changed logic to reflect the task 2020-01-17 10:18:50 +00:00
Michael Telatynski e88f062f01
Merge pull request #3857 from matrix-org/t3chguy/Array.concat 
Fix Array.concat undefined
 2020-01-17 10:16:43 +00:00
Michael Telatynski 9877fd9e85
Fix Array.concat undefined 2020-01-17 10:04:38 +00:00
Zoe 8efc45b31a no need to verify our own devices for every room 2020-01-17 10:04:34 +00:00
Travis Ralston 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
Travis Ralston 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
Travis Ralston 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
J. Ryan Stinnett 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
Travis Ralston 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
Travis Ralston 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
J. Ryan Stinnett 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
Travis Ralston e42663fc62 Appease the linter 2020-01-16 14:45:17 -07:00
Travis Ralston 1a961358f0 Don't show recents and suggestions for users already in the room 2020-01-16 14:40:25 -07:00
Travis Ralston 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
Travis Ralston 73fc91aa20 Rename feature flag for use in both code paths 2020-01-16 13:44:59 -07:00
Travis Ralston 7da9e0582f Rename DMInviteDialog to be a generic Invite Dialog 2020-01-16 13:42:34 -07:00
Travis Ralston 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
Travis Ralston 372861c9df Merge branch 'develop' into travis/ftue/user-lists/5.3-go-button 2020-01-16 13:36:59 -07:00
David Baker cf426b5cf3
Merge pull request #3853 from matrix-org/dbkr/toaststore 
Add a ToastStore
 2020-01-16 20:34:49 +00:00
David Baker 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
Travis Ralston 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
Travis Ralston cd9fc72fff Merge branch 'develop' into t3chguy/rightpanel 2020-01-16 10:04:18 -07:00
Michael Telatynski 0f61aa57ff
Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-16 17:00:04 +00:00
Travis Ralston 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
J. Ryan Stinnett 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
Travis Ralston 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
Travis Ralston 4ea2a2fee4 Merge branch 'develop' into t3chguy/fix_isModified 2020-01-16 09:46:28 -07:00
J. Ryan Stinnett 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
Travis Ralston 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
Zoe 82c5349c4e Updated to properly handle logic 2020-01-16 16:31:50 +00:00
J. Ryan Stinnett 0ef362a793 Request mock should send truthy for errors 2020-01-16 14:06:54 +00:00
J. Ryan Stinnett dab31d724d Support uri option in request mock 2020-01-16 14:01:15 +00:00
J. Ryan Stinnett 0dfd58c784 Compute download file icon immediately 
Build process changes may have changed the load order, so this tintable is now
registered too late (after the theme is set).

Fixes https://github.com/vector-im/riot-web/issues/11881
 2020-01-16 14:00:48 +00:00
J. Ryan Stinnett 5926e277c4 Avoid logged in event race 2020-01-16 11:52:02 +00:00
Zoe 9ac3cb6fd0 Merge remote-tracking branch 'origin/develop' into zip/11225-shields-distinguish-encrypt-from-verify 2020-01-16 11:23:57 +00:00
Zoe ff05041a5a Update room shield icons to represent encrypted but unverified chats in less alarmed tones 2020-01-16 11:10:23 +00:00
Travis Ralston 1b4ab856c9 Assume the position is at the end when the offset has no last part 
We get an NPE when the user cuts their entire message, and this fixes it.
 2020-01-15 21:05:00 -07:00
Travis Ralston b137cd21d3 Replace the selected range instead of force-setting it 
This gives people the option of cutting parts or all of their message.
 2020-01-15 21:04:18 -07:00
Travis Ralston be3ef2b50e Remove all text when cutting in the composer 
The previous function did in fact remove the elements, but left the model thinking there was a zero-length string. This approach deletes the text from the model and the DOM, resulting in the placeholder being shown when cutting all the text.

Part of https://github.com/vector-im/riot-web/issues/11378
 2020-01-15 19:08:14 -07:00