Commit Graph

9129 Commits

Author SHA1 Message Date
Bruno Windels 95a0ebaf06 Merge pull request #3796 from matrix-org/bwindels/verification-right-panel
Initial support for verification in right panel
2020-01-20 17:18:32 +00:00
David Baker a849826a41 Merge pull request #3874 from matrix-org/dbkr/fix_editor_modified_flag_2
Fix arrows keys moving through edit history
2020-01-20 13:42:44 +00:00
David Baker 277f107924 Set flag before mutating on cut too 2020-01-20 13:03:09 +00:00
David Baker 2ed5d89c9f Fix arrows keys moving through edit history
Different fix that fixes https://github.com/vector-im/riot-web/issues/11817
by setting the flag before the callback rather than having the update
method set the flag.

Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/3842
Fixes https://github.com/vector-im/riot-web/issues/11917
2020-01-20 12:20:21 +00:00
J. Ryan Stinnett 15749621a5 Fix rageshake submission after build changes
We aren't able to depend on `require` in this context anymore.

Fixes https://github.com/vector-im/riot-web/issues/11938
2020-01-20 12:06:48 +00:00
J. Ryan Stinnett d35788476a Merge pull request #3867 from matrix-org/travis/fix-messagepanel-ref
Fix error about MessagePanel not being available for read markers
2020-01-20 11:38:27 +00:00
J. Ryan Stinnett 86a0a2e806 Merge pull request #3864 from matrix-org/jryans/complete-sec-confused
Adjust secret storage to work before sync
2020-01-20 11:31:01 +00:00
Michael Telatynski c97de43f69 Remove unused fetch polyfills, querystring, require-json. Move glob to dev-dep
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-18 02:01:45 +00:00
Travis Ralston df3fe5139d Fix error about MessagePanel not being available for read markers
Stacktrace:
```
TimelinePanel.js?b9ae:1139 Uncaught (in promise) TypeError: Cannot read property 'getBoundingClientRect' of null
    at Object._getLastDisplayedEventIndex (TimelinePanel.js?b9ae:1139)
    at Object.updateReadMarker (TimelinePanel.js?b9ae:751)
    at Object._callee$ (TimelinePanel.js?b9ae:613)
    at tryCatch (runtime.js?4422:45)
    at Generator.invoke [as _invoke] (runtime.js?4422:271)
    at Generator.prototype.<computed> [as next] (runtime.js?4422:97)
    at asyncGeneratorStep (asyncToGenerator.js?56ef:3)
    at _next (asyncToGenerator.js?56ef:25)
```
2020-01-17 17:07:37 -07:00
J. Ryan Stinnett 4a82e86859 Adjust secret storage to work before sync
This adjusts to changed JS SDK APIs that allow secret storage to optionally ask
the server for any account data needed at login.

Fixes https://github.com/vector-im/riot-web/issues/11901
2020-01-17 17:59:12 +00:00
David Baker 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
David Baker 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
Bruno Windels 716c8ba68f pr feedback 2020-01-17 17:02:31 +01:00
Bruno Windels a73b7229a7 fix lint 2020-01-17 16:31:38 +01:00
Bruno Windels 5556cb5749 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-17 16:02:51 +01:00
Bruno Windels d20db3560a fix import paths after build system refactor 2020-01-17 15:50:27 +01:00
David Baker d69c5f6a1b Catch exception if passphrase dialog cancelled
As hopefully explained by comment
2020-01-17 14:46:20 +00:00
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
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
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 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 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 7da9e0582f Rename DMInviteDialog to be a generic Invite Dialog 2020-01-16 13:42:34 -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 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 d1fcef1211 Merge branch 'develop' into bwindels/verification-right-panel 2020-01-16 13:23:32 -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
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 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