Commit Graph

819 Commits (ddba5c62239a07048683f3ddb59e42a4531f3b9e)

Author SHA1 Message Date
Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00
Michael Telatynski a713c9763b
Merge pull request #5168 from matrix-org/t3chguy/dpsah/6785.2
Small code clean ups and tweaks
2020-09-04 12:25:46 +01:00
Michael Telatynski 1479690ac4 RightPanel use room instead of roomId 2020-09-03 15:03:47 +01:00
Michael Telatynski cffe902504 Add feature to ResizeNotifier to maintain isResizing state and use it to skip onScroll handling 2020-09-02 12:00:35 +01:00
Michael Telatynski 6178b3c0e2 Wire up resizeNotifier 2020-09-02 11:13:00 +01:00
Michael Telatynski 78812b6f85 Fix some stuff 2020-08-29 12:53:04 +01:00
Michael Telatynski 72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Michael Telatynski cca5ccd79d Switch widget resizing to re-resizable and add persistence 2020-08-21 16:29:07 +01:00
Bruno Windels 5d98805d77 Merge branch 'develop' into bwindels/make-reply-not-overlay 2020-08-18 13:39:06 +02:00
J. Ryan Stinnett ce226ab534 Replace Riot with Element in docs and comments
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Bruno Windels d24ddc415b Notify the timeline it's height has changed, so it can keep being at the bottom
this way new messages will appear in the timeline without needing to scroll
2020-07-31 14:02:40 +02:00
Travis Ralston 1f7f40736b Fix imports for SettingLevel to point at new file 2020-07-28 11:53:43 -06:00
Bruno Windels 4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski 5bee948717 Fix room tile context menu for Historical rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 16:35:03 +01:00
Bruno Windels d90fc57469 Merge branch 'develop' into element 2020-07-09 17:59:56 +02:00
Bruno Windels 571bd30898 update call icons 2020-07-08 18:02:30 +02:00
Mike Pennisi d237d02c03 Highlight "Jump to Bottom" badge when appropriate
This resolves https://github.com/vector-im/riot-web/issues/13135

Signed-off-by: Mike Pennisi <mike@mikepennisi.com>
2020-07-06 23:09:54 -04:00
J. Ryan Stinnett a928785f72 Check whether crypto is enabled in room recovery reminder
This avoids a soft crash that may occur otherwise.

Fixes https://github.com/vector-im/riot-web/issues/14289
2020-07-02 13:19:27 +01:00
Jorik Schellekens 086177d808
Merge pull request #4770 from matrix-org/joriks/font-scaling-message-preview
Add message preview for font slider
2020-06-22 11:43:52 +01:00
Damir Jelić ec4b350a82 Merge remote-tracking branch 'origin/poljar/seshat-search-pagination' into develop 2020-06-19 09:50:03 +02:00
Michael Telatynski eec42cff49 tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-18 22:49:39 +01:00
Michael Telatynski 045def4566 hide search results from unknown rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-18 22:45:42 +01:00
Jorik Schellekens f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens 2192332968 Add layout options to the appearance tab 2020-06-16 17:55:19 +01:00
Michael Telatynski 7dad8f47d3 use group layout for search results 2020-06-16 00:51:11 +01:00
Damir Jelić eaca8310d3 Merge branch 'develop' into poljar/seshat-search-pagination 2020-06-10 13:34:09 +02:00
Travis Ralston 5114c37b82 Add filtering and exploring to the new room list
This is per the designs. Animation doesn't feel required here.

Like the rest of this series, this rewrites a component to be more purpose-built to help match the designs and to solve the smallest possible problem.
2020-06-08 20:33:21 -06:00
Travis Ralston dc01607ad9 Merge branch 'develop' into travis/split-left-panel 2020-06-04 15:09:51 -06:00
Damir Jelić e94f3422df Searching: Add support to paginate Seshat search results. 2020-06-04 17:06:58 +02:00
Michael Telatynski 653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing
Remove feature_cross_signing
2020-06-03 10:42:13 +01:00
Travis Ralston 1f1f613777 Add a focus_composer dispatcher action
and use it
2020-06-02 19:07:46 -06:00
Jorik Schellekens b61f1704d3
Merge branch 'develop' into joriks/fix-filepanel-regression 2020-05-29 19:14:19 +01:00
Michael Telatynski 2b432b0d82 Remove feature_cross_signing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-27 10:28:25 +01:00
Jorik Schellekens fcbd197e7d Fix file list regression 2020-05-26 15:56:16 +01:00
Michael Telatynski 67ffe94df4 Fix typo and improve error context
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-22 11:18:14 +01:00
Michael Telatynski af2eed2228 Fix room alias lookup vs peeking race condition
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-19 13:18:50 +01:00
Travis Ralston 798e7a1f86 Merge branch 'develop' into travis/dispatcher-types 2020-05-15 09:56:02 -06:00
Travis Ralston 90a898d03f Move dispatcher into a subdirectory
We're expecting to have a whole bunch of types for the dispatched payloads, so pull the thing into a directory we can throw them in.
2020-05-13 21:07:50 -06:00
Michael Telatynski d11923e2e3 Add new keyboard shortcuts for jump to unread and upload file
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-05-13 10:38:32 +01:00
Matthew Hodgson ad2f704e76 don't NPE on invites from Dendrite 2020-05-10 11:17:21 +01:00
Travis Ralston 7b775a8d93
Merge pull request #4271 from aaronraimist/esc-mark-as-read
Mark room as read when escape is pressed
2020-04-30 10:40:50 -06:00
J. Ryan Stinnett d3ce4072d4 Only show key backup reminder when confirmed by server to be missing
The key backup reminder was being shown too eagerly in cases when we hadn't
actually checked with the homeserver on key backup status. This changes to only
show the reminder when we're sure a backup doesn't exist.

Fixes https://github.com/vector-im/riot-web/issues/13404
2020-04-30 15:41:49 +01:00
Travis Ralston 972baa881b
Revert "Fix Filepanel scroll position state lost when room is changed" 2020-04-19 19:14:08 -06:00
Travis Ralston d910eb4d57 Merge branch 'develop' into thobyv/make-filepanel-remember-scroll-position 2020-04-17 15:10:12 -06:00
Travis Ralston b4e2daaf46 Convert cross-signing feature flag to setting
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-15 13:18:42 -06:00
Michael Telatynski 73e5f133fb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into esc-mark-as-read 2020-04-14 15:37:18 +01:00
Michael Telatynski 69382ff8e5 Fix handler to use react bubbling rather than a native global onKeyDown
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 15:24:41 +01:00
thobyv-kismat 8cf6a8c311 refactor RoomScrollStateStore to accomodate scrollmaps for file/notif panel 2020-04-11 02:59:26 +01:00
Travis Ralston 34be024b21 Minimize widgets by default
Fixes https://github.com/vector-im/riot-web/issues/12921
2020-04-09 14:47:20 -06:00
David Baker 5dfcfb2147
Merge pull request #4372 from matrix-org/dbkr/search_fail_logging
Fix logging for failed searches
2020-04-09 16:27:08 +01:00