Commit graph

11154 commits

Author SHA1 Message Date
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
2ca9044171 swap order of context menu buttons so it does not jump when muted 2020-07-07 12:46:33 +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
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
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
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
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
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
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