Commit Graph

26717 Commits (1d7314731a0e6118075bd6b3589b1e137dcdc421)

Author SHA1 Message Date
Jorik Schellekens 6bf6ae2031 try to fix test
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/delabs-font-scaling
2020-07-13 19:08:44 +01:00
Jorik Schellekens 63cbb3b635
Merge pull request #4958 from matrix-org/joriks/room-list-badges-font-scaling
Fix badges for font size 20
2020-07-13 19:05:56 +01:00
Jorik Schellekens c9e231c3eb Add fad 2020-07-13 19:03:31 +01:00
Travis Ralston d6ca05938d
Merge pull request #4960 from matrix-org/travis/room-list/default-order
Fix default sorting mechanics for new room list
2020-07-13 12:01:37 -06:00
Travis Ralston d2c7a55fa0 Ensure tag changes (leaving rooms) causes rooms to move between lists
Fixes https://github.com/vector-im/riot-web/issues/14442

Turns out that we are so good at moving a room that when it flows through as a TIMELINE update the algorithm no-ops and does nothing, so don't do that.
2020-07-13 12:00:56 -06:00
J. Ryan Stinnett 995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01:00
J. Ryan Stinnett f0c6139803 Update analytics host tracking for new structure 2020-07-13 17:57:56 +01:00
J. Ryan Stinnett 231c26c8a4 Update CustomServerDialog to use brand token 2020-07-13 17:57:56 +01:00
Michael Telatynski 89d8b569dd Merge branch 't3chguy/element/logo-spinner-flow' into 'element'
Switch out Labs spinner to be the Flow-generated from Design

See merge request new-vector/element/element-web/matrix-react-sdk!6
2020-07-13 16:46:34 +00:00
Michael Telatynski 33422f1744 Switch out Labs spinner to be the Flow-generated from Design
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:39:57 +01:00
Michael Telatynski cc49e645b7
Merge pull request #4961 from matrix-org/t3chguy/room-list/14273
Fix room sub list header collapse/jump interactions on bottom-most sublist
2020-07-13 17:36:13 +01:00
Bruno Windels 62bdbb22e8 Merge branch 'element-roomlist-polish' into 'element'
Element roomlist polish

See merge request new-vector/element/element-web/matrix-react-sdk!5
2020-07-13 16:26:49 +00:00
Bruno Windels c346122adf align room header with user menu button 2020-07-13 18:24:28 +02:00
Bruno Windels ec65083c61 polish user menu button 2020-07-13 18:24:28 +02:00
Bruno Windels 19ebf3beec make overscroll gradients smaller so they pop less when appearing 2020-07-13 18:24:28 +02:00
Bruno Windels b19afe4d46 reduce distance between tiles to 12px, so we can align things in LP with 2020-07-13 18:24:28 +02:00
Bruno Windels 965856aa55 align breadcrumbs with community avatar grid 2020-07-13 18:24:28 +02:00
Bruno Windels 375f6fa4d8 make search field 32px high, just like avatars 2020-07-13 18:24:28 +02:00
Bruno Windels 02b27086da swap search field and breadcrumbs 2020-07-13 18:24:28 +02:00
Michael Telatynski 68948d4b8b
Merge pull request #4959 from matrix-org/t3chguy/room-list/14436
Fix room tile context menu for Historical rooms
2020-07-13 17:17:36 +01:00
Michael Telatynski fd8f43e245 Fix room sub list header collapse/jump interactions on bottom-most sublist
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:17:05 +01:00
Travis Ralston 40ab3e23c6 Add a null guard on the client 2020-07-13 10:09:46 -06:00
Michael Telatynski 3060cdf934 Iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 17:01:50 +01:00
Travis Ralston 9a3744ebb2 Fix default sorting mechanics for new room list
Fixes https://github.com/vector-im/riot-web/issues/14445
2020-07-13 09:54:15 -06:00
Michael Telatynski b3c3ef594e i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 16:39:59 +01:00
Michael Telatynski 5bee948717 Fix room tile context menu for Historical rooms
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 16:35:03 +01:00
Jorik Schellekens 59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-13 16:15:52 +01:00
Jorik Schellekens cd83f12a82 Fix badges for font size 20 2020-07-13 16:11:21 +01:00
Jorik Schellekens ea15725164
Merge pull request #4895 from jugglinmike/gh-12743-ignore-user-names
"ignore"/"unignore" commands: validate user ID
2020-07-13 16:07:31 +01:00
Jorik Schellekens 71e97177b0
Merge pull request #4957 from matrix-org/joriks/room-list-avatar-aspect-ratio
Stop classname from overwritting baseavatar's
2020-07-13 16:02:06 +01:00
Michael Telatynski 1ce3ae0cf2
Merge pull request #4952 from matrix-org/t3chguy/room-list/14413
Remove redundant scroll-margins and fix RoomTile wrongly scrolling
2020-07-13 15:57:27 +01:00
Jorik Schellekens 3e2280a6f4 Stop classname from overwritting baseavatar's 2020-07-13 15:43:34 +01:00
Michael Telatynski 3c096fdf23
Merge pull request #4953 from matrix-org/t3chguy/fix/14402
Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones
2020-07-13 15:28:29 +01:00
Michael Telatynski 97734395f7
Merge pull request #4955 from matrix-org/t3chguy/fix/13991
Be consistent with the at-room pill avatar configurability
2020-07-13 15:28:12 +01:00
Michael Telatynski 72407a30d3
Merge pull request #4954 from matrix-org/t3chguy/room-list/14409
Room List v2 Enter in the filter field should select the first result
2020-07-13 15:27:16 +01:00
Travis Ralston a70e575b96
Merge pull request #4919 from matrix-org/travis/room-list/enable
Enable the new room list by default
2020-07-13 06:56:25 -06:00
J. Ryan Stinnett c77b312fd3 Merge branch 'jryans/rename-strings' into 'element'
Update brand name using variable in all strings

See merge request new-vector/element/element-web/matrix-react-sdk!3
2020-07-13 12:23:28 +00:00
Travis Ralston 0908e813fb Merge branch 'develop' into travis/room-list/enable 2020-07-12 22:50:27 -06:00
Michael Telatynski c3789245b8 Be consistent with the at-room pill avatar configurability
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 19:25:43 +01:00
Michael Telatynski d253c58830 Room List v2 Enter in the filter field should select the first result
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 19:06:47 +01:00
Michael Telatynski 71ecd5dc85 clean-up
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 18:40:24 +01:00
Michael Telatynski 3f51bb84e1 Fix RoomAvatar viewAvatarOnClick to work on actual avatars instead of default ones
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 18:24:28 +01:00
Travis Ralston 1c52c2777e
Merge pull request #4949 from matrix-org/travis/room-list/mute-floats
Convert ImportanceAlgorithm over to using NotificationColor instead
2020-07-12 11:00:18 -06:00
Michael Telatynski 213e2df9fc Remove redundant scroll-margins and fix RoomTile wrongly scrolling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-12 08:49:04 +01:00
J. Ryan Stinnett 0c06975e7a Merge remote-tracking branch 'origin/develop' into element 2020-07-11 19:16:26 +01:00
Travis Ralston 31f1fbd962
Merge pull request #4951 from matrix-org/travis/room-list/fix-sublist-menu
Internalize algorithm updates in the new room list store
2020-07-11 12:15:53 -06:00
Travis Ralston b924dcc6ad
Merge pull request #4950 from matrix-org/travis/room-list/cleanup-resizing
Remove now-dead code from sublist resizing
2020-07-11 12:11:51 -06:00
Travis Ralston 0e49c4343c Internalize algorithm updates in the new room list store
Fixes https://github.com/vector-im/riot-web/issues/14411

The act of setting/changing the algorithm was causing the update function to be marked, meaning we wouldn't trigger an update until something else happened later. To get around this, and still support internal functions spamming calls without multiple updates, we simply move the guts to an internalized function and make the public interface do a trigger.
2020-07-10 21:59:12 -06:00
Travis Ralston c153232575 Merge branch 'develop' into travis/room-list/enable 2020-07-10 21:33:35 -06:00
Travis Ralston e6c7e7c28e
Merge pull request #4948 from matrix-org/travis/room-list/fix-filter
Ensure triggered updates get fired for filters in the new room list
2020-07-10 16:52:02 -06:00