Commit Graph

20503 Commits (491cef4f9243b54c53115f965900f23658413189)

Author SHA1 Message Date
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
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
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
Travis Ralston cad9562f8d
Merge pull request #3828 from krkc/develop
Added cut/copy and pasting user pills from editor.
2020-01-15 15:36:33 -07:00
J. Ryan Stinnett 71fa3222fe
Fix component index import
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-01-15 22:11:22 +00:00
J. Ryan Stinnett 6e027badc0
Tweak comparison
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2020-01-15 22:10:59 +00:00
J. Ryan Stinnett 27ee90cad5 Add post-login complete security flow
This adds a step after login to complete security for your new session. At the
moment, the only verification method is entering your SSSS passphrase, but nicer
paths will be added soon.

This new step only appears when crypto is available and the account has
cross-signing enabled in SSSS.

Fixes https://github.com/vector-im/riot-web/issues/11214
2020-01-15 21:53:36 +00:00
Travis Ralston 070e59e1ce
Merge pull request #3846 from matrix-org/travis/fix-help-tab
Fix imports for help & support tab
2020-01-15 12:44:35 -07:00
Travis Ralston dd88809622 Fix imports for help & support tab
This was missed, somehow, in the sourcemaps stuff. The tab currently breaks the dialog on load.
2020-01-15 12:02:34 -07:00
Travis Ralston dbff2bb9f0
Merge pull request #3841 from matrix-org/travis/ftue/user-lists/5.2-i18n
Humanize the recent DM rooms ourselves for translations
2020-01-15 10:58:32 -07:00
Travis Ralston d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Travis Ralston 0529efc5cd
Merge pull request #3840 from matrix-org/travis/ftue/user-lists/5.1-suggestions
Improve the quality of invite suggestions by filtering out DMs
2020-01-15 10:49:00 -07:00
Travis Ralston c2b3661a69
Merge pull request #3845 from matrix-org/travis/fix-develop
Fix linter and tests on develop
2020-01-15 10:38:08 -07:00
Travis Ralston 8f37f8638d Build the js-sdk for Jest tests
This is theoretically a fix for the tests failing post-sourcemaps.
2020-01-15 10:28:27 -07:00
Travis Ralston 457e63f24e Fix reference to js-sdk lint config 2020-01-15 10:25:36 -07:00
Travis Ralston 7bfb3686cd
Merge pull request #3839 from matrix-org/travis/sourcemaps
Fix sourcemaps by refactoring the build system
2020-01-15 10:11:33 -07:00
Travis Ralston 8b6a5d37aa Remove simulated error state used for screenshot 2020-01-14 23:35:45 -07:00
Travis Ralston b9852c7264 Appease the linter 2020-01-14 23:35:07 -07:00
Travis Ralston 443744733d Move DM creation logic into DMInviteDialog
Fixes https://github.com/vector-im/riot-web/issues/11645

The copy hasn't been reviewed by anyone and could probably use some work.
2020-01-14 23:32:00 -07:00
Michael Telatynski d37c19d785 Fix timing of when Composer considers itself to be modified
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-15 00:27:54 +00:00
Michael Telatynski 5a5a0d2233 Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-15 00:03:18 +00:00