OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
27,905 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

4386 Commits (78812b6f855d4e41ff997aed2af0e69622bd0811)

Author SHA1 Message Date
Travis Ralston bd8e1f7198
Merge pull request #4931 from matrix-org/travis/room-list/sticky-headers 
Improve performance and stability in sticky headers for new room list
 2020-07-09 08:00:56 -06:00
Michael Telatynski ada68c4220
Merge pull request #4892 from jugglinmike/gh-13135-highlight-jump-to-bottom 
Highlight "Jump to Bottom" badge when appropriate
 2020-07-09 00:20:37 +01:00
Travis Ralston 74ca0618ac Improve scrolling performance for sticky headers 
The layout updates are anecdotal based on devtools flagging the values which are "changing" even if they aren't.  The scrolling feels better with this as well, though this might be placebo.
 2020-07-08 14:55:28 -06:00
Travis Ralston f9aca7c05e Avoid bounding box usage in sticky headers & improve reliability 
We now use offsets and scroll information to determine where the headers should be stuck to, still supporting the transparent background.

Some scroll jumps were originally introduced as part of the change in numbering, so they have been fixed here. By proxy, some additional scroll jump/instability should be fixed as well.

This has a lingering problem of still causing a huge number of no-op UI updates though, which will be dealt with in a future commit.
 2020-07-08 14:37:35 -06:00
Travis Ralston 6e20850567 Remove sanity check from requestAnimationFrame 
It should be in all major browsers as of years ago, and we use it unguarded elsewhere in the app. The performance benefits of it appear to be worthwhile enough to keep it, though it's not a perfect solution.
 2020-07-08 12:17:51 -06:00
Michael Telatynski 3abf1586f9
Merge pull request #4930 from matrix-org/t3chguy/room-list/14380 
Don't render the context menu within its trigger otherwise unhandled clicks bubble
 2020-07-08 19:13:20 +01:00
Michael Telatynski e2d65222a2 Don't render the context menu within its trigger otherwise unhandled clicks will re-trigger 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-08 18:59:27 +01:00
Jorik Schellekens bb18e677f9 Lint semis 2020-07-08 18:05:07 +01:00
Jorik Schellekens fe2bb355ab Hide archive button 2020-07-08 18:02:20 +01:00
Jorik Schellekens 8773d67df7 Auto expand room list on search 2020-07-08 17:28:15 +01:00
Bruno Windels 7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Bruno Windels d5747ad6c0 Merge branch 'develop' into element 2020-07-08 18:07:45 +02:00
Travis Ralston 0368bff5b1
Merge pull request #4904 from matrix-org/joriks/room-list-voip 
Move voip previews to bottom right corner
 2020-07-08 10:07:42 -06:00
Bruno Windels 571bd30898 update call icons 2020-07-08 18:02:30 +02:00
Jorik Schellekens fb6791e221
Merge pull request #4923 from matrix-org/joriks/room-list-focus-search 
Focus room filter on openSearch
 2020-07-08 15:20:08 +01:00
Bruno Windels 7dad56ca86 Merge branch 'develop' into element 2020-07-08 15:50:17 +02:00
Bruno Windels 989e4a9ceb
Merge pull request #4912 from matrix-org/bwindels/bettersticky 
Add wrapper to room list so sticky headers don't need a background
 2020-07-08 13:34:01 +00:00
Bruno Windels a361ac3f83 make collapsing/expanding the first header work again 2020-07-08 15:11:47 +02:00
Bruno Windels 0d94cfa97a put sticky headers in padding of wrapper 
this way they don't need a background, as the list is already clipped
 2020-07-08 14:49:38 +02:00
Bruno Windels 75751abc60 add wrapper we can then add padding to when sticking headers 2020-07-08 14:49:04 +02:00
Michael Telatynski d7ad555c12
Merge pull request #4871 from matrix-org/t3chguy/room-list/3 
Convert Context Menu to TypeScript
 2020-07-08 13:24:10 +01:00
Michael Telatynski 7b115056b0 Fix sticky headers being left on display:none if they change too quickly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-08 09:21:33 +01:00
Jorik Schellekens 8679d90703 lint semi 2020-07-08 00:27:29 +01:00
Jorik Schellekens 70c1bf3e5c Focus room filter on openSearch 2020-07-08 00:25:43 +01:00
Travis Ralston a59a8b76a9 Update TODO comments to point to new issue 2020-07-07 14:51:43 -06:00
Travis Ralston 8ef4b1b2e7 Replace labs flag with a real setting 2020-07-07 13:56:46 -06:00
Travis Ralston baccabeae4 Remove extraneous true 2020-07-07 11:34:52 -06:00
Travis Ralston e6b20088c0 Try using requestAnimationFrame if available for sticky headers 
This might help performance, or it might not. Let's try it!
 2020-07-07 11:33:32 -06:00
Michael Telatynski f18db23cc4 Remove some TODOs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-07 17:18:56 +01:00
Jorik Schellekens dad3dce364
Merge branch 'develop' into joriks/room-list-voip 2020-07-07 15:45:45 +01:00
Michael Telatynski 8ba2be0be5
Merge pull request #4900 from matrix-org/t3chguy/room-list/1234 
New Room List implement view_room_delta for keyboard shortcuts
 2020-07-07 15:36:30 +01:00
Michael Telatynski 8c2286a044 Move all the ContextMenu semantic helper (ARIA) components out to separate modules 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-07 15:24:46 +01:00
Jorik Schellekens 527fe24cd6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/room-list-voip 2020-07-07 15:04:22 +01:00
Michael Telatynski afac330143 Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 
 Conflicts:
	src/components/structures/ContextMenu.tsx
	src/components/structures/UserMenu.tsx
	src/components/views/rooms/RoomSublist2.tsx
	src/components/views/rooms/RoomTile2.tsx
 2020-07-07 15:01:27 +01:00
Michael Telatynski 69852ecef4 Merge branches 'develop' and 't3chguy/room-list/123' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/123 
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-07 14:10:58 +01:00
Bruno Windels 7115c07c65 Merge branch 'develop' into element 2020-07-07 13:21:49 +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
Jorik Schellekens 5176685d20 Implement incoming call box 2020-07-06 23:05:00 +01:00
Travis Ralston d14dd777b7 Revert "don't need to set width with javascript?" 
This reverts commit a2cf641c0e.
 2020-07-06 15:23:20 -06:00
Michael Telatynski 3094bb32ec
Merge pull request #4901 from matrix-org/t3chguy/room-list/112 
Fix some room list sticky header instabilities
 2020-07-06 22:21:02 +01:00
Michael Telatynski 97d4295bf5
Merge pull request #4902 from matrix-org/t3chguy/room-list/14306 
Allow vertical scrolling on the new room list breadcrumbs
 2020-07-06 21:53:54 +01:00
Bruno Windels 7647072b05 remove prop instead of assigning unset 2020-07-06 14:36:07 -06:00
Bruno Windels 201f6ebe83 make stick headers jump in a bit later so the transition is less jumpy 2020-07-06 14:36:01 -06:00
Bruno Windels a2cf641c0e don't need to set width with javascript? 2020-07-06 14:35:53 -06:00
Bruno Windels 61a5807fd1 only show topmost top sticky header 2020-07-06 14:35:46 -06:00
Michael Telatynski c9bc318ca7 Allow vertical scrolling on the new room list breadcrumbs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 21:32:46 +01:00
Michael Telatynski 8233dec72e Fix some room list sticky header instabilities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 21:05:06 +01:00
Michael Telatynski 8acec1f417 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 17:58:39 +01:00
Michael Telatynski 2da1320d99 Type view_room_delta as ViewRoomDelta 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 17:57:40 +01:00
Michael Telatynski 6042e015e0 Remove unused dispatches view_indexed_room and view_prev_room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 17:49:37 +01:00
Bruno Windels 3e5664de7b update user menu icons 2020-07-06 16:12:36 +02:00
Michael Telatynski 66ca095706 Fix double handling of native inputs wrapped for aria menus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 10:41:35 +01:00
Michael Telatynski 823ada374d delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 10:30:06 +01:00
Michael Telatynski 6cb0ac6a50 Fix checkboxes/radios in context menus should only close on ENTER, not SPACE 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 10:18:49 +01:00
Bruno Windels 08c44333cf Update develop 2020-07-06 09:29:23 +02:00
Michael Telatynski b7c23b690c Include more classes for room list keyboard navigation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 01:14:02 +01:00
Michael Telatynski 2d09ac9f88 Improve UserMenu label 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 01:01:40 +01:00
Michael Telatynski 3cebfc8072 Fix StyledMenuItemCheckbox and StyledMenuItemRadio 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-05 19:31:24 +01:00
Michael Telatynski 069cdf3ce0 Fix room list v2 context menus to be aria menus 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-05 18:23:57 +01:00
Michael Telatynski 1620feb55e Sprinkle in some better ARIA props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-05 01:07:46 +01:00
Michael Telatynski 599cc9c9ed
Merge pull request #4882 from matrix-org/t3chguy/room-list/6 
First step towards a11y in the new room list
 2020-07-03 20:17:33 +01:00
Michael Telatynski a475887c3e
Merge pull request #4891 from matrix-org/t3chguy/room-list/111 
Fix theme selector clicks bubbling out and causing context menu to float away
 2020-07-03 16:52:32 +01:00
Michael Telatynski 3f62f20a85 Fix theme selector bubbling out its click events and causing context menu to float away 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 16:29:48 +01:00
Bruno Windels 52fdf92180 remove prop instead of assigning unset 2020-07-03 16:52:52 +02:00
Bruno Windels 8cd20eedeb make stick headers jump in a bit later so the transition is less jumpy 2020-07-03 16:52:28 +02:00
Bruno Windels b370e3f078 don't need to set width with javascript? 2020-07-03 16:52:01 +02:00
Michael Telatynski c8a93e9dd7 clean-up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 14:49:25 +01:00
Michael Telatynski 47ee00ec5d Make explore button at all accessible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 14:43:02 +01:00
Michael Telatynski 9b0c711837 Make the UserMenu more accessible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-03 14:34:43 +01:00
J. Ryan Stinnett 04142a8723 Remove duplicate compact settings, handle device level updates 
This removes the duplicate setting for compact layout from the appearance tab,
and leaves the "advanced" one, matching the intention from Design.

This also adds the relevant handling to ensure the device-level setting triggers
an update immediately when changed.

Fixes https://github.com/vector-im/riot-web/issues/14304
 2020-07-03 12:06:00 +01:00
Bruno Windels eb5f6de25f only show topmost top sticky header 2020-07-03 12:17:54 +02:00
Michael Telatynski 9cf162e267 Merge branches 'develop' and 't3chguy/room-list/6' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/6 
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
	src/components/views/rooms/RoomTile2.tsx
 2020-07-03 00:02:37 +01:00
Michael Telatynski 0854924b8d iterate some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 23:51:02 +01:00
Michael Telatynski 404009c8cb Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 
 Conflicts:
	src/components/structures/ContextMenu.tsx
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-02 23:46:12 +01:00
Michael Telatynski 289f40ce29 First step towards a11y in the new room list 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 22:21:10 +01:00
Travis Ralston df05273225 Merge remote-tracking branch 'origin/joriks/room-list-tooltips' into develop 2020-07-02 15:20:27 -06:00
Travis Ralston 3847dc91c0 Move the stoppage to somewhere more generic 2020-07-02 15:15:33 -06:00
Travis Ralston 43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski c4bbdefa8d
Merge pull request #4870 from matrix-org/t3chguy/room-list/2 
Room List v2 context menu interactions
 2020-07-02 18:02:21 +01:00
J. Ryan Stinnett 209b386e23 Merge remote-tracking branch 'origin/develop' into jryans/room-view-crypto-crash 2020-07-02 13:46:50 +01: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
J. Ryan Stinnett b5c94acbe6 Remove unused crypto import 2020-07-02 13:17:51 +01:00
Michael Telatynski 9fcc2ced3d fix types some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:59:06 +01:00
Michael Telatynski 07e0a017e7 fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:56:57 +01:00
Michael Telatynski 6802f9b4df unbreak copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:52:49 +01:00
Michael Telatynski 58718dab37 Convert ContextMenu to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:51:12 +01:00
Michael Telatynski 4b27a67e33 improve default behaviour for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:16:54 +01:00
Michael Telatynski 6424ffb22a fix repeated context menu interaction by not erroring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:13:54 +01:00
Michael Telatynski 5c2b291510 Support right click context menu interactions on Room List 2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:06:26 +01:00
Michael Telatynski 89bd572371 Fix context menu nesting causing bubbling and instabilities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:05:37 +01:00
Jorik Schellekens 62314cac06
Merge pull request #4863 from matrix-org/joriks/room-list-autohide-scrollbar 
Hide scrollbar without pixel jumping
 2020-07-01 20:07:32 +01:00
Jorik Schellekens 2162517a37 Display breadcrumbs only after 20 rooms have been joined 2020-07-01 16:05:27 +01:00
Jorik Schellekens ad27dbbfab Clean up classnames 2020-07-01 15:15:18 +01:00
Michael Telatynski 10e547539d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-07-01 14:26:56 +01:00
Michael Telatynski b5014282a4 Iterate PR based on Figma design and feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 13:59:50 +01:00
Jorik Schellekens aab372c648 Add tooltips 2020-07-01 01:50:31 +01:00
Jorik Schellekens d2fb30a211 Hide scrollbar without pixel jumping 2020-06-30 23:52:13 +01:00
Jorik Schellekens dcd51b5be3 Implement breadcrumb notifications and scrolling 2020-06-30 23:24:46 +01:00
J. Ryan Stinnett b456529c3e
Merge pull request #4860 from matrix-org/jryans/read-marker-jump-invis-2 
Fix jumping to read marker for events without tiles
 2020-06-30 23:01:19 +01:00
Michael Telatynski 198958dcdd Iterate to match figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:32:59 +01:00
Michael Telatynski cbd2a9cd35 Redo Iconized Context Menu styling to match Figma and simplify future a11y work by flattening the DOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:11:12 +01:00
Michael Telatynski 2a12fd1f6e Fix User context menu alignment to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 21:58:54 +01:00
J. Ryan Stinnett 51118863c7 Fix jumping to read marker for events without tiles 
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.

This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.

Fixes vector-im/riot-web#10975
 2020-06-30 18:40:52 +01:00
Michael Telatynski cd06910713
Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop 
Including start_sso and start_cas in redirect loop prevention
 2020-06-30 16:56:38 +01:00
Bruno Windels 6fc4be386a add blurred, blended avatar background to left panel 2020-06-30 13:28:19 +02:00
Michael Telatynski b2b909aa53 Including start_sso and start_cas in redirect loop prevention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 15:40:20 +01:00
Travis Ralston ee2c216c4d Clean up TODO comments for new room list 
All relevant TODOs should still be present, and reference an issue for easy finding.
 2020-06-28 20:03:04 -06:00
Travis Ralston 3abc9d8d56 Merge branch 'develop' into travis/room-list/tag-panel 2020-06-26 07:26:57 -06:00
Travis Ralston 424443927f
Merge pull request #4843 from matrix-org/travis/room-list/user-menu 
Make the whole user row clickable in the new room list
 2020-06-26 07:25:50 -06:00
Michael Telatynski 113dfc5ed2
Merge pull request #4845 from matrix-org/t3chguy/hf1 
ts-ignore because something is made of fail
 2020-06-26 10:10:18 +01:00
Michael Telatynski a905028d3a bandaid 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:37:55 +01:00
Michael Telatynski 274e6f3825 make js-sdk import happy? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:35:29 +01:00
Michael Telatynski 9391d151f3 ts-ignore because something is made of fail 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:15:02 +01:00
Michael Telatynski 538c853149
Merge pull request #4838 from matrix-org/t3chguy/hf1 
Fix Welcome.html CAS and SSO URLs not working
 2020-06-26 09:09:39 +01:00
Travis Ralston 7ce3cc1db7 Allow the tag panel to be disabled in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14156
 2020-06-25 20:35:40 -06:00
Travis Ralston 555758d3d2 Remove extra space 2020-06-25 20:23:37 -06:00
Travis Ralston 1888cda5ee Remove debug 2020-06-25 20:22:41 -06:00
Travis Ralston 588fea3a9b Make the menu show up where it was before 2020-06-25 19:55:08 -06:00
Travis Ralston 411271422c Make the whole UserMenu a button to open the menu 2020-06-25 19:54:17 -06:00
Travis Ralston bcfdd4d984 Move all of the UserMenu into the UserMenu component 2020-06-25 19:38:11 -06:00
Travis Ralston dafce40d1b Rename UserMenuButton to UserMenu for new scope 2020-06-25 19:29:12 -06:00
Michael Telatynski 6116cfc2b9 js-sdk imports suck 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 23:52:32 +01:00
Travis Ralston 7b79dd6be1 Make the sign out button red 2020-06-25 15:13:28 -06:00
Michael Telatynski 29b0505bdb Welcome no longer needs any props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 22:02:39 +01:00
Michael Telatynski c65ccbcacf Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 22:00:22 +01:00
Michael Telatynski 1c00ae8dd3 Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 21:59:46 +01:00
Michael Telatynski 7683f2fe1a
Merge pull request #4834 from matrix-org/t3chguy/notifications0 
Hide app badge count for hidden upgraded rooms (non-highlight)
 2020-06-25 15:43:50 +01:00
Michael Telatynski 61618d5162 tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 15:02:52 +01:00
Travis Ralston a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate 
React demands this.
 2020-06-25 07:14:02 -06:00
Travis Ralston 90ff4585d5 Remove extraneous debug from the new left panel 2020-06-24 20:14:01 -06:00
Travis Ralston 906b72082e
Merge pull request #4819 from matrix-org/travis/room-list/icon-masks 
Use theme-capable icons in the user menu
 2020-06-24 10:34:29 -06:00
Travis Ralston 5c7e59b132 Use theme-capable icons in the user menu 
They're still inconsistent weights, but at least they are the right color on non-light-theme clients.
 2020-06-23 21:17:39 -06:00
Travis Ralston 380aed4244 Update profile information in User Menu 
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.

This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
 2020-06-23 21:01:50 -06:00
J. Ryan Stinnett 3829362754 Fix up merge to develop 2020-06-23 15:24:02 +01:00
RiotRobot 6161f95434 Merge branch 'master' into develop 2020-06-23 15:18:35 +01:00
Travis Ralston aca6c65ef3
Merge pull request #4810 from matrix-org/travis/room-list/theme 
Have the theme switcher set the device-level theme to match settings
 2020-06-22 13:53:03 -06:00
Travis Ralston 6c48966bf5 Have the theme switcher set the device-level theme to match settings 
Fixes https://github.com/vector-im/riot-web/issues/14111

This is a shortcut into the Appearance tab, so use the same level. It was an explicit decision to have the tab set the theme at the device level.
 2020-06-22 13:34:49 -06:00
Travis Ralston 1a427b8ff7 Fix sticky headers over/under extending themselves in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14095
 2020-06-22 13:09:42 -06: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
David Baker ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker a1592704a2 Unused code & import 2020-06-19 17:17:04 +01:00
David Baker 3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +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
David Baker e4d824839a Revert "Use recovery keys over passphrases" 2020-06-18 15:02:03 +01:00
Jorik Schellekens 291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
David Baker 5b27a570a8
Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases 
Revert "Use recovery keys over passphrases"
 2020-06-18 14:51:22 +01:00
Travis Ralston 8f3a6fc30e
Consistent quotes 2020-06-18 07:48:36 -06:00