Commit Graph

26240 Commits

Author SHA1 Message Date
RiotRobot
5c56a55cf0 Reset matrix-js-sdk back to develop branch 2020-07-03 13:29:56 +01:00
RiotRobot
67fb328c0d Merge branch 'master' into develop 2020-07-03 13:29:14 +01:00
RiotRobot
21b7b88fde v2.9.0 2020-07-03 13:27:48 +01:00
RiotRobot
24687589e1 Prepare changelog for v2.9.0 2020-07-03 13:27:47 +01:00
RiotRobot
452bb73dcf Upgrade matrix-js-sdk to 7.1.0 2020-07-03 13:22:03 +01:00
J. Ryan Stinnett
d97b8bc276
Merge pull request #4889 from matrix-org/jryans/rm-dup-compact-release
Remove duplicate compact settings, handle device level updates
2020-07-03 12:27:54 +01:00
J. Ryan Stinnett
8bb3f4a225 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:19:15 +01:00
J. Ryan Stinnett
67de8f38f0
Merge pull request #4888 from matrix-org/jryans/rm-dup-compact
Remove duplicate compact settings, handle device level updates
2020-07-03 12:15:52 +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
Travis Ralston
95bc4a6f44
Merge pull request #4886 from matrix-org/travis/room-list/logs-1
Remove a bunch of noisy logging from the room list
2020-07-02 16:41:49 -06:00
Travis Ralston
98ce1dafee Remove a bunch of noisy logging from the room list
None of these logs are actually needed for troubleshooting anymore.
2020-07-02 16:39:36 -06:00
Michael Telatynski
d725cc3389 convert MatrixClientContext to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:39:27 +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
33612398be fix import
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:26:39 +01:00
Travis Ralston
8f3c8ba804
Merge pull request #4885 from matrix-org/travis/room-list/preview-crash-2
Add a null guard for message event previews
2020-07-02 16:25:30 -06:00
Travis Ralston
ae076a7439 Add a null guard for message event previews 2020-07-02 16:23:38 -06:00
Michael Telatynski
f69a090d3d delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:22:36 +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
Michael Telatynski
1ab0a1a1de First step towards a11y in the new room list
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 23:14:31 +01:00
Michael Telatynski
7322aaf602 Convert PlatformPeg to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 22:42:28 +01:00
Michael Telatynski
97711032d8 Fix signature of sleep utility
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 22:38:21 +01:00
Michael Telatynski
111d4adab2 Convert createRoom over to typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-02 22:38:11 +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
a6e0799b57 Handle push rule changes in the RoomNotificationState 2020-07-02 15:05:01 -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
420f3fdbc9
Merge pull request #4880 from matrix-org/travis/room-list/fix-elongation
Don't include empty badge container in minimized view
2020-07-02 14:38:56 -06:00
Travis Ralston
e013597e26
Merge pull request #4877 from matrix-org/travis/room-list/dot-badge-align
Fix alignment of dot badges in new room list
2020-07-02 14:38:45 -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
c3ad854868 Fix alignment of avatars on community invites 2020-07-02 13:50:25 -06:00
Travis Ralston
7ea3164507 Fix alignment of dot badges in new room list 2020-07-02 13:39:20 -06:00
Travis Ralston
a5001e50aa Disable all unread decorations on muted rooms 2020-07-02 13:33:24 -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
9fec5c98af
Merge pull request #4861 from matrix-org/travis/room-list/notification-state
Reorganize and match new room list badges to old list behaviour
2020-07-02 13:28:23 -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