Commit graph

21214 commits

Author SHA1 Message Date
J. Ryan Stinnett
9d094a793c Merge branch 'bwindel/polish' into 'element'
More polish

See merge request new-vector/element/element-web/matrix-react-sdk!21
2020-07-14 19:35:41 +00:00
Travis Ralston
f6b9d44e4b Invert logging 2020-07-14 13:18:06 -06:00
Travis Ralston
b19ae3ac93 Turn previews on for DMs and ensure they get rendered 2020-07-14 12:49:29 -06:00
Travis Ralston
d74e803fa9 Remove potential source of room duplication issues
This is an estimated fix as the problem cannot be easily identified. We don't appear to need these lines, unlike what the comment implies.
2020-07-14 12:40:48 -06:00
Bruno Windels
38549ecf4c change accent color 2020-07-14 20:36:27 +02:00
Travis Ralston
e955feb12d Revert "Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug"
This reverts commit e1b34acdc8.
2020-07-14 12:02:40 -06:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected
Fixes https://github.com/vector-im/riot-web/issues/14275
2020-07-14 11:53:10 -06:00
J. Ryan Stinnett
f452abf822 Merge branch 'jryans/font-text' into 'element'
Fix font input branding

See merge request new-vector/element/element-web/matrix-react-sdk!14
2020-07-14 17:08:20 +00:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
b1444146e6 rename traces of element(-dark) theme in code 2020-07-14 18:40:32 +02:00
Bruno Windels
f47268ce74 Revert "Merge branch 'nadonomy/use-element-theme' into 'element'"
This reverts merge request !9
2020-07-14 16:23:06 +00:00
J. Ryan Stinnett
ea511faafe Merge remote-tracking branch 'origin/develop' into element 2020-07-14 16:57:00 +01:00
Travis Ralston
e1b34acdc8
Merge pull request #4972 from matrix-org/travis/room-list/prelaunch/3-remove-debug
Remove debug logging from new room list
2020-07-14 09:56:17 -06:00
Bruno Windels
ebbcbe231a Merge branch 'nadonomy/ui-tweaks-part-deux' into 'element'
UI tweaks - part deux

See merge request new-vector/element/element-web/matrix-react-sdk!8
2020-07-14 13:47:10 +00:00
J. Ryan Stinnett
5294349dc3 Remove base domain from instance name 2020-07-14 14:32:52 +01:00
Nad Chishtie
d3944b9e67 Use element theme 2020-07-14 14:19:42 +01:00
Nad Chishtie
71dc6e8e10 Update missing var to use element theme 2020-07-14 14:15:24 +01:00
Nad Chishtie
5b3c3f53fe Use element theme by default 2020-07-14 13:56:24 +01:00
Bruno Windels
b6a5fa38e1 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
2020-07-14 12:40:52 +00:00
Bruno Windels
4f466300b7 Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-14 14:32:08 +02:00
Bruno Windels
4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Michael Telatynski
9c5f7492e3 undo changes which are no longer needed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:53:55 +01:00
Michael Telatynski
507d493b60 Merge branch 'nadonomy/ui-tweaks-part-deux' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into nadonomy/ui-tweaks-part-deux 2020-07-14 12:42:58 +01:00
Michael Telatynski
4e8203cca1 revert some changes to resolve what looks like a props mutation race-condition
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 12:42:51 +01:00
J. Ryan Stinnett
a09f773edd Tweak sticky header hiding to avoid pop
When transitioning between sublists, there can be a visibly observable jump in
the positioning of list items when the header container is restored to normal
size outside of sticky mode.

To avoid this problem, this leaves all headers at normal size. This creates a
new issue of a permanent gap at the top of the list for the first header, but
this can be solved by always hiding (since it can only ever appear stuck to
top).

Fixes https://github.com/vector-im/riot-web/issues/14429
2020-07-14 12:16:17 +01:00
Michael Telatynski
030586275f Fix /op command to accept only joined/invited users
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 10:59:06 +01:00
Michael Telatynski
67d1956437 Merge branches 'develop' and 't3chguy/fix-op' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix-op 2020-07-14 10:56:15 +01:00
Bruno Windels
106c91aec0 Merge branch 'element' into 'nadonomy/ui-tweaks-part-deux'
# Conflicts:
#   res/css/views/rooms/_RoomSublist2.scss
2020-07-14 09:26:04 +00:00
J. Ryan Stinnett
aea3ad48b5 Merge remote-tracking branch 'origin/develop' into element 2020-07-14 10:17:43 +01:00
Michael Telatynski
f394190423
Merge pull request #4973 from matrix-org/t3chguy/room-list/14395
Fix show-all keyboard focus regression
2020-07-14 09:56:03 +01:00
Michael Telatynski
03f94779f1 Fix show-all keyboard focus regression
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 09:38:31 +01:00
J. Ryan Stinnett
f16962bb41
Merge pull request #4970 from matrix-org/travis/room-list/prelaunch/1-cleanup
Clean up TODOs, comments, and imports in the new room list
2020-07-14 09:38:30 +01:00
J. Ryan Stinnett
e5c199952d
Merge pull request #4971 from matrix-org/travis/room-list/prelaunch/2-membership
Make EffectiveMembership utils generic
2020-07-14 09:36:45 +01:00
Travis Ralston
6632db01cf Remove debug logging from new room list
Fixes https://github.com/vector-im/riot-web/issues/14408

Yes, all the issue references are wrong :(
2020-07-13 20:34:05 -06:00
Travis Ralston
4a8a59c578 Make EffectiveMembership utils generic
Fixes https://github.com/vector-im/riot-web/issues/14460

Just have to move them to utils.
2020-07-13 20:29:46 -06:00
Travis Ralston
bdb136e24e Clean up TODOs, comments, and imports in the new room list
Fixes https://github.com/vector-im/riot-web/issues/14412
2020-07-13 20:25:02 -06:00
Travis Ralston
917c41dfa0 Update sticky headers when breadcrumbs pop in or out
Fixes https://github.com/vector-im/riot-web/issues/14455
2020-07-13 20:08:12 -06:00
Travis Ralston
126aa862db
Merge pull request #4967 from matrix-org/travis/room-list/fix-show-less
Fix show less button occluding the last tile
2020-07-13 19:51:26 -06:00
Travis Ralston
80cf2839d9 Ensure breadcrumbs don't keep turning themselves back on
Fixes https://github.com/vector-im/riot-web/issues/14452
2020-07-13 18:46:17 -06:00
Michael Telatynski
d4e397cbd0 Switch to svg masks for the e2eicon and border it for the EntityTile avatars
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-14 00:52:03 +01:00
Michael Telatynski
4d432f23e4 Fix room header timeline and composer alignment
Room header use DecoratedRoomAvatar instead of manual e2eIcon overlay
move e2eIcon next to it instead of private padlock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:56:25 +01:00
Travis Ralston
a3a1e2e01f Fix show less button occluding the last tile
Fixes https://github.com/vector-im/riot-web/issues/14450

People may have to click various combinations of 'show more' and 'show less' until it fixes itself, as their layout could be a bit weird now.
2020-07-13 16:38:13 -06:00
Michael Telatynski
646c5d4a64 Replace timeline tooltips to match breadcrumb tooltips
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:14:00 +01:00
J. Ryan Stinnett
a54b18adfe Merge remote-tracking branch 'origin/develop' into element 2020-07-13 21:54:45 +01:00
J. Ryan Stinnett
f47e94259e Merge branch 'jryans/rename-strings' into 'element'
Update server dialog, analytics

See merge request new-vector/element/element-web/matrix-react-sdk!7
2020-07-13 20:43:53 +00:00
J. Ryan Stinnett
4b5faf8148 Update top vs. bottom sticky styles separately
If a sublist changes from sticky top to sticky bottom in a single run of the
logic (without passing through the default state), we were leaving the previous
top position set. This handles them independently to resolve this.

Fixes https://github.com/vector-im/riot-web/issues/14390
Maybe helps with https://github.com/vector-im/riot-web/issues/14443
For vector-im/riot-web#13635
2020-07-13 21:24:47 +01:00
J. Ryan Stinnett
b50c809d35 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 20:28:57 +01:00
Travis Ralston
edb19786ec
Merge pull request #4965 from matrix-org/travis/room-list/logout
Ensure RoomListStore2 gets reset when the client becomes invalidated
2020-07-13 13:26:20 -06:00
Travis Ralston
19500cf96a Allow the tests to force a MatrixClient 2020-07-13 13:24:02 -06:00
Travis Ralston
eb78b1b328 Export the matrix client from the store 2020-07-13 13:18:01 -06:00
Travis Ralston
a8829f09d0 Ensure RoomListStore2 gets reset when the client becomes invalidated
Fixes https://github.com/vector-im/riot-web/issues/14384

We also make use of the new AsyncStore type to handle this more safely.
2020-07-13 13:15:44 -06:00
Travis Ralston
8e982f52ff Fix extra room tiles being rendered on smaller sublists
Fixes https://github.com/vector-im/riot-web/issues/14426

The issue only applies to lists which won't have a 'show less' button, as the lists with the button would have the button's height considered when determining visible tiles. For lists that were under that (1-4 rooms), the show more button wasn't being considered and thus leading to the padding being added rather than subtracted, causing an extra tile to render.

By ensuring we include the padding for both show more and show less, we ensure that no extra tiles get rendered and that the cutoff semantics are still present.
2020-07-13 12:59:09 -06:00
Travis Ralston
1f57b85b30
Merge pull request #4962 from matrix-org/travis/room-list/leave-fix
Ensure tag changes (leaving rooms) causes rooms to move between lists
2020-07-13 12:44:23 -06:00
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
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
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
02b27086da swap search field and breadcrumbs 2020-07-13 18:24:28 +02: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
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
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
cfc39dc4a9 Remove now-dead code from sublist resizing 2020-07-10 16:10:05 -06:00
Travis Ralston
3062d14a78 Convert ImportanceAlgorithm over to using NotificationColor instead
Fixes https://github.com/vector-im/riot-web/issues/14362 implicitly

By re-using constructs we already have, we don't need to invent code which figures it out.
2020-07-10 16:07:40 -06:00
Travis Ralston
87120c6c26 Ensure triggered updates get fired for filters in the new room list
Fixes https://github.com/vector-im/riot-web/issues/14404
2020-07-10 15:58:39 -06:00
Travis Ralston
bb6d46f926 When the algorithm changes, re-add the filter listener 2020-07-10 15:57:05 -06:00
J. Ryan Stinnett
e808cdbe2f Remove translations missing the brand variable 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
fa55f9fda2 Prune translations for strings that no longer exist 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
f1ad49e745 Replace brand name in stranslated strings 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
bb5107a60b Change default brand name 2020-07-10 19:57:01 +01:00