Commit graph

11350 commits

Author SHA1 Message Date
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
5d23e4216e
Merge pull request #4908 from matrix-org/t3chguy/room-list/12345
New room list view_room show_room_tile support
2020-07-08 13:34:28 +01:00
Michael Telatynski
ec54d509e5 remove stale debug log
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-08 13:24:40 +01: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
64d7580494
Merge pull request #4913 from matrix-org/t3chguy/fix/14363
Fix MELS summary of 3pid invite revocations
2020-07-08 13:23:45 +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
Michael Telatynski
faa9124f2b Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
 Conflicts:
	src/components/views/rooms/RoomTile2.tsx
2020-07-08 08:57:01 +01:00
Travis Ralston
15b6a273c9 Swap out the resizer lib for something more stable
react-resizer appears to be okay at tracking state, but it often desyncs from reality. re-resizer is more maintained and more broadly used (160k downloads vs 110k), and appears to generally do a better job of tracking the cursor.

The new library has some oddities though, such as deltas, touch support (hence the polyfill), and calling handles "Enable".

For https://github.com/vector-im/riot-web/issues/14022
2020-07-07 22:21:00 -06: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
Jorik Schellekens
f4e05142db lint 2020-07-07 23:17:56 +01:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +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
853b280673 Fix MELS summary of 3pid invite revocations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 18:30:57 +01:00
Michael Telatynski
28310cb648 remove TODOs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 17:48:39 +01:00
Michael Telatynski
a33717a475 Wire up Room sublist show more/less as roving tabindex button using new helper
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 17:47:21 +01:00
Michael Telatynski
f18db23cc4 Remove some TODOs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 17:18:56 +01:00
Michael Telatynski
986d56ffdc Merge branches 'develop' and 't3chguy/room-list/12345' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
	src/components/views/rooms/RoomTile2.tsx
2020-07-07 17:11:04 +01:00
Michael Telatynski
92e86af162 Show more/Show less keep focus in a relevant place
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 17:07:51 +01:00
Jorik Schellekens
e3dbda2abf Fix tests 2020-07-07 16:44:15 +01:00
Jorik Schellekens
dad3dce364
Merge branch 'develop' into joriks/room-list-voip 2020-07-07 15:45:45 +01:00
Jorik Schellekens
bc4167180c Lint whitespaces and semis 2020-07-07 15:40:05 +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
8458572032 lint 2020-07-07 15:18:10 +01:00
Jorik Schellekens
0d6e7759d0 Fix review details
- spelling mistake
- unwatch watched setting
- lint (indentation)
- use more performant component
2020-07-07 15:11:08 +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
Michael Telatynski
44ae83f228 Move the Volume union type out to a throwaway
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 14:07:35 +01:00
Travis Ralston
b3b404f121
Merge pull request #4906 from matrix-org/travis/room-list/invites-list
Fix a number of issues with the new room list's invites
2020-07-07 06:55:30 -06:00
Travis Ralston
1b48b99f99 Append community invites to bottom instead 2020-07-07 06:53:17 -06:00
Travis Ralston
994d8708f2 Move to a fragment 2020-07-07 06:52:44 -06:00
Bruno Windels
7115c07c65 Merge branch 'develop' into element 2020-07-07 13:21:49 +02:00
Bruno Windels
2ca9044171 swap order of context menu buttons so it does not jump when muted 2020-07-07 12:46:33 +02:00
Bruno Windels
1ef73958f3 change hide community icon in context menu 2020-07-07 12:16:31 +02:00
Bruno Windels
38ff58f8dd remove upload icon 2020-07-07 12:16:16 +02:00
Michael Telatynski
19e1c79796 update comment
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 10:35:16 +01:00
Michael Telatynski
63ec793fad Support view_room's show_room_tile in the new room list
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-07 10:34:42 +01: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
Travis Ralston
3284cc730e Show ordering options on invites
Fixes https://github.com/vector-im/riot-web/issues/14309
2020-07-06 20:42:43 -06:00
Travis Ralston
f103fd1ccf Make community invites appear even if there's no room invites
Fixes https://github.com/vector-im/riot-web/issues/14358
2020-07-06 20:32:37 -06:00
Travis Ralston
b28a267669 Remove old community invite placeholder handling
We ended up shoving it into the invite list, so don't render it here.
2020-07-06 20:32:09 -06:00
Michael Telatynski
6bc39547c7 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/12345 2020-07-07 00:10:06 +01: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
abfbcf4090 use uglier style for props but be consistent :'(
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 22:04:30 +01:00
Michael Telatynski
f038dd52e6
Merge pull request #4903 from matrix-org/t3chguy/room-list/14353
null-guard against groups with a null name in new Room List
2020-07-06 22:01:41 +01:00
Michael Telatynski
60225154e6 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 21:58:44 +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
Michael Telatynski
f6aa6208ee null-guard against groups with a null name :((
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 21:53:20 +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
2c1eb07768
Merge pull request #4883 from matrix-org/t3chguy/ts123
Convert things to Typescript, including languageHandler
2020-07-06 18:54:19 +01:00
Michael Telatynski
18064c19a3 add TODO
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 18:13:11 +01:00
Michael Telatynski
8acec1f417 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 17:58:39 +01:00
Michael Telatynski
1849ed90d2 Implement ViewRoomDelta for the new Room List
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 17:58:29 +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
8fd9dbf1d8 moar icon changes 2020-07-06 18:28:54 +02:00
Jorik Schellekens
1e0ff01d50 De labs font-scaling 2020-07-06 15:43:49 +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
87a7a8a02b Add TODOs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-06 01:15:53 +01: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
7c29a53ebd aria-hide the notifications badge on room tiles as we have manual labels here
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-05 19:59:29 +01:00
Michael Telatynski
a68e23c9e0 Make message previews accessible via describedby
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-05 19:38:45 +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
4c7014167d Improve a11y of default BaseAvatar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-05 01:06:36 +01:00
Michael Telatynski
ae5ab4c394
Merge pull request #4893 from matrix-org/t3chguy/room-list/101
Radio button outline fixes including for new room list context menu
2020-07-03 20:35:17 +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
c8bb6f5904 Improve radio outlines for message layout to be more consistent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:48:22 +01:00
Michael Telatynski
5a542281ed Make Styled Radio Button outlines default-off
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:27:45 +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
Bruno Windels
82e0816d86 also blur the sticky headers
added a DOM element so we can set the background on the parent and
the blur on the new element
2020-07-03 16:50: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
Travis Ralston
26ce801ef1
Merge pull request #4887 from matrix-org/t3chguy/room-lists/99
fix notifications icons some more
2020-07-02 17:16:45 -06:00
Michael Telatynski
22ac7e6def fix notifications icons some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 00:14:51 +01: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
96cfd26bd4 fix imports some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:32:21 +01:00
Michael Telatynski
08392d53f0
Merge pull request #4884 from matrix-org/t3chguy/room-lists/99
Fix bell icon mismatch on room tile between hover and context menu
2020-07-02 23:31:48 +01:00
Michael Telatynski
5c5482a8ae I've got 99 problems and this badge mismatch is no longer one
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:20:16 +01:00
Michael Telatynski
48ce294a49 Transition languageHandler to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:15:08 +01:00
Travis Ralston
cc23f23f19
Merge pull request #4881 from matrix-org/travis/room-list/enable-default
Enable the new room list by default and trigger an initial render
2020-07-02 15:28:36 -06: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
1df092d79b
Merge pull request #4879 from matrix-org/travis/room-list/context-menu-fixes
Fix selection states of room tiles in the new room list
2020-07-02 15:18:19 -06:00
Travis Ralston
ea787ad430
Merge pull request #4876 from matrix-org/travis/room-list/notif-dropdown
Update mute icon behaviour for new room list designs
2020-07-02 15:15:56 -06:00
Travis Ralston
3847dc91c0 Move the stoppage to somewhere more generic 2020-07-02 15:15:33 -06:00
Travis Ralston
547690374e Wrap event stoppage in null checks
Some of the code paths (particularly onFinished) do not have events, but the code paths we care about to prevent the room selection do have events - we can stop those without stopping further menus.
2020-07-02 14:53:21 -06:00
Travis Ralston
0549ef83db
Merge pull request #4878 from matrix-org/travis/room-list/fix-community-invites
Fix alignment of avatars on community invites
2020-07-02 14:39:25 -06:00
Travis Ralston
1b782ce5f2 Enable the new room list by default and trigger an initial render
We have to trigger an initial render because during the login process the user will have started syncing (causing lists to generate) but the RoomList component won't be mounted & listening and therefore won't receive the initial lists. By generating them on mount, we ensure that the lists are present once the user gets through the login process.
2020-07-02 14:27:36 -06:00
Travis Ralston
0d9ce0721f Don't include empty badge container in minimized view
Fixes https://github.com/vector-im/riot-web/issues/14294

It takes up space, and it won't hold anything anyways.
2020-07-02 14:11:31 -06:00
Travis Ralston
e08512020f Fix a couple badge alignment issues with community invites 2020-07-02 14:05:31 -06:00
Travis Ralston
aa702514ce Don't try and show context menus if we don't have one
Fixes https://github.com/vector-im/riot-web/issues/14295
2020-07-02 13:59:28 -06:00
Travis Ralston
e51f9d2492 Fix closing the context menu causing the tile to be selected
Fixes https://github.com/vector-im/riot-web/issues/14293
2020-07-02 13:53:38 -06:00
Travis Ralston
349c3f7090 Only show mute notification icon on rooms, not all notif icons 2020-07-02 13:33:06 -06:00
Travis Ralston
45f4a2a980 Fix imports for NotificationStates 2020-07-02 13:28:06 -06:00
Travis Ralston
b54635863f Merge branch 'develop' into travis/room-list/notification-state 2020-07-02 13:26:16 -06:00
Travis Ralston
43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski
4a03b464d6
Merge pull request #4875 from matrix-org/t3chguy/room-list/4
Add click-to-jump on badge in the room sublist header
2020-07-02 20:04:43 +01:00
Michael Telatynski
ae2a6ebc07 improve comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 19:56:41 +01:00
Michael Telatynski
a658612078 Add click-to-jump on badge in the room sublist header
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 19:48:06 +01: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
Travis Ralston
32642d592c Add a key 2020-07-02 09:27:42 -06:00
Travis Ralston
b7aa8203b6 Wedge community invites into the new room list
Fixes https://github.com/vector-im/riot-web/issues/14179

Disclaimer: this is all of the horrible because it's not meant to be here. Invites in general are likely to move out of the room list, which means this is temporary. Additionally, the communities rework will take care of this more correctly. For now, we support the absolute bare minimum to have them shown.
2020-07-02 09:04:38 -06: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
e8702aafa5 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 23:09:02 +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
Michael Telatynski
28e430060c
Merge pull request #4858 from matrix-org/t3chguy/room-list/2
Room Tile context menu, notifications, indicator and placement
2020-07-01 19:20:09 +01:00
Travis Ralston
51ce80f333 Merge branch 'develop' into travis/room-list/notification-state 2020-07-01 12:01:07 -06:00
Travis Ralston
2cd6fae2ce
Merge pull request #4865 from matrix-org/travis/room-list/default-vis
Improve resizing interactions in the new room list
2020-07-01 11:59:54 -06:00
Travis Ralston
946fde5cc5 Be consistent in visible tiles usage 2020-07-01 11:59:32 -06: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
9831698b1e Hide notifications menu from invite tiles
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 14:28:00 +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
Travis Ralston
fed0c327d5
Merge pull request #4866 from matrix-org/travis/room-list/rm-ordering-options
Disable use of account-level ordering options in new room list
2020-07-01 07:25:04 -06:00
Michael Telatynski
3b7b6eca6f align context menus even better
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-01 14:05:33 +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
1dd9c1eea3 Use avatar sisze inplace 2020-07-01 12:28:32 +01:00
Jorik Schellekens
de7df7dcf9 Lint 2020-07-01 12:28:00 +01:00
Jorik Schellekens
1889ee202b Add tooltips for breadcrumbs 2020-07-01 12:23:27 +01:00
Travis Ralston
ad982624fe Remove context menu on invites in new room list
Fixes https://github.com/vector-im/riot-web/issues/14198

For both, the decision has been made to not have a context menu pending further considerations of where invites should (and should not) be. Likely this will be dealt with in FTUE Notifications.
2020-06-30 19:43:00 -06:00
Travis Ralston
0868af650a Appease the linter 2020-06-30 19:37:00 -06:00
Travis Ralston
d402808101 Disable use of account-level ordering options in new room list
Fixes https://github.com/vector-im/riot-web/issues/14069

We can't drop them completely for compatibility with the old room list.
2020-06-30 19:31:59 -06:00
Travis Ralston
7674030c6e Show 'show more' when there are less tiles than the default
For example, if you only have 3/10 rooms required for the default then resize smaller, we should have a 'show more' button.

This works by changing the rendering to be slightly more efficient and only looping over what is seen (renderVisibleTiles(), using this.numTiles in place of tiles.length) and using a new setVisibleTilesWithin() function on the layout. Previously resizing the 3/10 case would be setting visibleTiles to ~8 instead of ~1 like it should (because the getter returns a default).
2020-06-30 19:14:36 -06: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
2379ec577c Lint semicolons 2020-06-30 23:39:25 +01:00
Jorik Schellekens
0904ae8c7a Bug fixes 2020-06-30 23:35:59 +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
508dea1c89 Wire up Notifications context menu on room tile 2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 22:53:30 +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
Michael Telatynski
fe4cf9f9b4 Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-06-30 21:16:37 +01:00
Travis Ralston
782a555e44 Make badges represent old list behaviour
Fixes https://github.com/vector-im/riot-web/issues/14160
2020-06-30 13:45:10 -06:00
Travis Ralston
393eaf84c3 Move notification states out of the NotificationBadge component
Fixes https://github.com/vector-im/riot-web/issues/14153
2020-06-30 13:34:44 -06: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
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2
Add file upload button to recovery key input
2020-06-30 18:06:12 +01:00
David Baker
7caf2d5459 remove rogue blank line 2020-06-30 17:56:50 +01:00
David Baker
21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2
Implement new design on security setup & login
2020-06-30 17:55:03 +01:00
Michael Telatynski
f269aefe18
Merge pull request #4855 from matrix-org/t3chguy/download_toast
Add Generic Expiring Toast and timing hooks
2020-06-30 17:02:04 +01:00
Michael Telatynski
446f3e35e9
Merge pull request #4846 from matrix-org/t3chguy/notifications0
Fix Room Custom Sounds regression and make ProgressBar relevant again
2020-06-30 16:56:57 +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
54419878fa Add room notifications context menu and non-default indicator to RoomTile2
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-30 00:16:51 +01:00
Michael Telatynski
adf186f568 Fix RoomTile2 Context Menu to match Figma
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 23:03:44 +01:00
Travis Ralston
bb9ae7b55b
Merge pull request #4850 from matrix-org/travis/room-list/todo-cleanup
Clean up TODO comments for new room list
2020-06-29 13:10:52 -06:00
Jorik Schellekens
b110639c76 Merge remote-tracking branch 'origin' into joriks/eslint-config 2020-06-29 16:49:33 +01: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
Michael Telatynski
1a1b7e5e70 Add Generic Expiring Toast
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-29 11:38:50 +01:00
J. Ryan Stinnett
d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp
Show timestamp of redaction on hover
2020-06-29 11:10:25 +01:00
Travis Ralston
175ade8ac4 Merge branch 'develop' into travis/room-list/todo-cleanup 2020-06-28 20:04:41 -06: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
753f7aa5b8 Remove the DM button from new room tiles
Fixes https://github.com/vector-im/riot-web/issues/14221
2020-06-27 22:48:54 -06:00
☕ Tim
c8381021b8 Hide room list show less button if it would do nothing
Signed-off-by:  Tim <tim@wants.coffee>

On the new rooms list, if the show less button wouldn't result in a
smaller list, don't show it.

Fixes vector-im/riot-web#14219
2020-06-28 04:08:06 +08:00
Michael Telatynski
10492fe72f fix StyledRadioGroup React key warning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-27 18:30:15 +01:00
David Baker
0579c9f748 Fix tests 2020-06-26 20:25:38 +01:00
David Baker
916f606872 Apparently we need to null check here 2020-06-26 19:07:39 +01:00
David Baker
5f2127ddf5 Disable spellcheck on the recovery key entry 2020-06-26 18:55:23 +01:00
David Baker
24baf19d65 Set field validity (ie. border colour) correctly
Changes flagInvalid to forceValidity which can force valid as well
as invalid.
2020-06-26 18:50:05 +01:00
David Baker
b74674ced8 Right name for security key and fix cancel button 2020-06-26 18:04:06 +01:00
Michael Telatynski
cf3c914382 Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-26 15:35:36 +01:00
David Baker
15ebaa1470 Port recovery key upload button to new designs 2020-06-26 15:22:04 +01:00
Travis Ralston
67cc84d00d Merge branch 'develop' into travis/room-list/preview-copy 2020-06-26 07:29:49 -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
72035c8078 Make <ProgressBar /> relevant again
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 14:19:58 +01:00
Michael Telatynski
46058a17f8 Fix Room Custom Sounds regression
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 14:18:38 +01:00
David Baker
f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
David Baker
178cbca934 Use mask images in key entry dialogs 2020-06-26 12:56:41 +01:00
David Baker
e18ea55d20 Convert icons to masks
so they're a sensible colour in other themes
2020-06-26 12:41:24 +01:00
Andrew Morgan
77b618e4f3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into anoa/new_spinner
* 'develop' of github.com:matrix-org/matrix-react-sdk:
  bandaid
  make js-sdk import happy?
  ts-ignore because something is made of fail
  js-sdk imports suck
  Iterate on the new room list resize handle
  Welcome no longer needs any props
  unexport things which need not exporting
  Instead of passing sso and cas urls to Welcome, route via start_sso and start_cas
  Move to mx_sso_hs_url and co for sso persistance to not conflict with guest creds
  Fix Welcome.html URLs
  improve typing
  Add account and room-account data hooks
  Create a StaticNotificationState for representative purposes
  Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
2020-06-26 10:17:26 +01: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
Andrew Morgan
96e4b938b2 Don't modify the size of the MessagePanel spinner 2020-06-26 09:42:44 +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
Andrew Morgan
228a6adfdf indentation 2020-06-26 09:27:33 +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
Andrew Morgan
b00d822bc0 Remove alt, use aria-label 2020-06-26 01:22:49 +01:00
Andrew Morgan
87f961df3f Put behind a labs flag 2020-06-26 01:22:46 +01:00
Andrew Morgan
6ea5dc7b7c Change the look of the spinner 2020-06-26 01:19:38 +01:00
Michael Telatynski
6116cfc2b9 js-sdk imports suck
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 23:52:32 +01:00
Michael Telatynski
85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0
More small tweaks in preparation for Notifications rework
2020-06-25 23:34:28 +01:00
Travis Ralston
30489ce819
Merge pull request #4840 from matrix-org/travis/room-list/resizer-2
Iterate on the new room list resize handle
2020-06-25 16:27:39 -06:00
Travis Ralston
acf56559e1 Introduce an entirely new system for handling message preview copy
This reverts earlier changes made to textForEvent as they are no longer needed.

This also implements an entire tree of textForEvent-like behaviour as the previews need to be different, which is easiest done with its own stack.
2020-06-25 16:26:49 -06:00
Travis Ralston
326fa8be7d
Merge pull request #4837 from matrix-org/travis/room-list/hover-states
Update sublists for new hover states
2020-06-25 16:05:25 -06:00
Travis Ralston
555078a993 Iterate on the new room list resize handle
Only show shadow when resizing, increase the hit area, and make the handle show up when the list itself is hovered.
2020-06-25 16:03:56 -06: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
3524d678f7 Fix Welcome.html URLs
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 21:24:24 +01:00
Travis Ralston
0af1507eed Update sublists for new hover states
Fixes https://github.com/vector-im/riot-web/issues/14135
Unblocks https://github.com/vector-im/riot-web/issues/14089
2020-06-25 12:11:10 -06:00
Travis Ralston
5efa5d2c80 Implement new resize handle for dogfooding
Smaller handle width, small shadow on the top of the show more button if there's more rooms to be shown. The resize handle also only shows when you're hovering in the area now.

The original design called for the shadow to show up only if the user is cutting a tile or dragging, however that is complicated implementation-wise. For speed and encouraging a dogfooding pattern we're going ahead with this behaviour instead.
2020-06-25 10:08:44 -06:00
Travis Ralston
c920cf784e Create a StaticNotificationState for representative purposes 2020-06-25 16:35:54 +01:00
Michael Telatynski
ed634a2bde Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 16:35:40 +01:00
David Baker
78f750265c Remove unused code
No reset option here anymore
2020-06-25 16:33:07 +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
David Baker
648c0c28c2 Add placeholder to security phrase input 2020-06-25 15:36:06 +01:00
Michael Telatynski
61618d5162 tidy up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 15:02:52 +01:00
Jorik Schellekens
a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced
Move compact modern layout checkbox to 'advanced'
2020-06-25 14:38:18 +01:00
Travis Ralston
4d47dcaabd
Merge pull request #4825 from matrix-org/travis/room-list/default-lists
Allow the user to resize the new sublists to 1 tile
2020-06-25 07:18:26 -06:00
Travis Ralston
92f0f1a5d8
Merge pull request #4832 from matrix-org/travis/react-can-shush
Make LoggedInView a real component because it uses shouldComponentUpdate
2020-06-25 07:17:56 -06:00
Travis Ralston
a3b38a2b5f Make LoggedInView a real component because it uses shouldComponentUpdate
React demands this.
2020-06-25 07:14:02 -06:00
David Baker
2b144a846a Apply some of the newer styling to passphrase / recovery key entry 2020-06-25 12:44:15 +01:00
Michael Telatynski
edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-25 08:45:32 +01:00
Michael Telatynski
dc099efb19 make Notifier getSoundForRoom synchronous
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 08:43:35 +01:00
Travis Ralston
90ff4585d5 Remove extraneous debug from the new left panel 2020-06-24 20:14:01 -06:00
Travis Ralston
37a415693f Allow the user to resize the new sublists to 1 tile
For dogfooding https://github.com/vector-im/riot-web/issues/14137

To change the default: `localStorage.setItem("mx_dogfood_rl_defTiles", 4);`
2020-06-24 20:08:26 -06:00
Travis Ralston
752b2acc56 Move MessagePreviewStore into the room list namespace 2020-06-24 19:51:55 -06:00
J. Ryan Stinnett
767090dd78
Merge pull request #4821 from matrix-org/jryans/more-reset-paths
Show cross-signing / secret storage reset button in more cases
2020-06-24 17:35:24 +01: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
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
J. Ryan Stinnett
b01015f5c5 Show cross-signing / secret storage reset button in more cases
This exposes the cross-signing / secret storage reset button in more cases to
hopefully give people a better chance of trying again in case something failed
halfway through set up. In particular, any combination of keys existing now
reveals the reset button.

Fixes https://github.com/vector-im/riot-web/issues/13993
2020-06-24 14:30:12 +01: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
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup
Mark messages with a black shield if the megolm session isn't trusted
2020-06-23 15:38:03 -04:00
Jorik Schellekens
7699aafcaf Use new eslint package- fix lint issues in ts and js 2020-06-23 17:01:19 +01:00
Jorik Schellekens
1e39279a77
Merge pull request #4761 from matrix-org/joriks/appearance-advanced
Custom font selection
2020-06-23 15:38:50 +01: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
David Baker
6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +01:00
Jorik Schellekens
680e997a94 Cleanup tooltip classnames 2020-06-23 13:38:50 +01:00
Travis Ralston
fc5ee64fce Fix read receipt handling in the new room list
Fixes https://github.com/vector-im/riot-web/issues/14064
Fixes https://github.com/vector-im/riot-web/issues/14082

Turns out the event doesn't reference a room, so we need to use the accompanied room reference instead.
2020-06-22 15:12:30 -06:00
Travis Ralston
fb551781c2 Force DMs to always be red notifications
This also passes the tagId to the sublist so it doesn't have to rip it out of the `layout`. It doesn't get a layout until later anyways, which causes some null issues.
2020-06-22 14:52:17 -06:00
Travis Ralston
894357f7f6 Merge branch 'develop' into travis/room-list/unread-2 2020-06-22 14:16:52 -06:00
Travis Ralston
26317b6826
Merge pull request #4803 from matrix-org/travis/room-list/setting-diff
Only fire setting changes for changed settings
2020-06-22 14:16:24 -06:00
Travis Ralston
1fe3e33dbf Factor out cloning to a util and use it everywhere 2020-06-22 14:14:43 -06: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
f66f220a3e
Merge pull request #4808 from matrix-org/travis/room-list/collapsed
Fix layout of minimized view for new room list
2020-06-22 13:51:38 -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
Travis Ralston
cf92fc37d4 Fix layout of minimized view for new room list 2020-06-22 12:51:53 -06:00
Travis Ralston
63ad14ae1e Clean up imports 2020-06-22 10:35:55 -06:00
Travis Ralston
8201eed929 Encourage counts if the user has a mention (red state) 2020-06-22 10:26:37 -06:00
Travis Ralston
eeb408a081 Update badge logic for new setting and behaviour
For https://github.com/vector-im/riot-web/issues/14084
2020-06-22 10:26:19 -06:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
aab42a291b implement appearance tab nits
- fix border colours in dark theme
- lighten dark theme preview background
- add missing return statement
2020-06-22 12:28:15 +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
Jorik Schellekens
3d7427ccca Fix semicolons 2020-06-22 11:39:11 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +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
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Travis Ralston
f136ba4a98
Merge pull request #4796 from matrix-org/travis/room-list/bug/crash-filter
Fix crash when filtering new room list too fast
2020-06-18 16:53:42 -06:00
Travis Ralston
7191c01265 Fix crash when filtering new room list too fast
Fixes https://github.com/vector-im/riot-web/issues/14092

We were simply assuming we had a reference to a notification state, which might not be the case if we're between renders.
2020-06-18 15:52:55 -06: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
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00