cc22be4f1d
Update attribution
2020-07-14 15:51:34 -06:00
556da7fe5c
Swap out Modular for EMS
2020-07-14 15:47:03 -06:00
b2e5bc3fa1
Merge branch 'dbkr/fix_show_less_broken' into 'element'
...
Fix bug where 'show more' sometimes did nothing
See merge request new-vector/element/element-web/matrix-react-sdk!23
2020-07-14 21:04:58 +00:00
322d58ba0c
Merge branch 'develop' into element
2020-07-14 15:04:17 -06:00
839851c90f
Fix bug where 'show more' sometimes did nothing
...
a3a1e2e01fhttps://github.com/matrix-org/matrix-react-sdk/pull/4964 or the
above commit by adding the padding in all cased in `get padding()`.
2020-07-14 21:49:51 +01:00
76fbb7c1b0
Merge branch 'develop' into joriks/delabs-font-scaling
2020-07-14 14:48:21 -06:00
3eac852ad0
Change font slider values
2020-07-14 21:27:01 +01:00
945dab6b1f
Revert "Turn previews on for DMs and ensure they get rendered"
...
This reverts commit b19ae3ac93
2020-07-14 13:36:28 -06:00
f6b9d44e4b
Invert logging
2020-07-14 13:18:06 -06:00
b19ae3ac93
Turn previews on for DMs and ensure they get rendered
2020-07-14 12:49:29 -06:00
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
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
c0a552bfb0
Fix font input branding
2020-07-14 18:04:29 +01:00
ea511faafe
Merge remote-tracking branch 'origin/develop' into element
2020-07-14 16:57:00 +01:00
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
9c5f7492e3
undo changes which are no longer needed
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-07-14 12:53:55 +01:00
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
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
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
aea3ad48b5
Merge remote-tracking branch 'origin/develop' into element
2020-07-14 10:17:43 +01:00
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
03f94779f1
Fix show-all keyboard focus regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-07-14 09:38:31 +01:00
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
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
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
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
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
646c5d4a64
Replace timeline tooltips to match breadcrumb tooltips
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-07-13 23:14:00 +01:00
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
b50c809d35
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 20:28:57 +01:00
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
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
995a7879a1
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 18:49:55 +01:00
231c26c8a4
Update CustomServerDialog to use brand token
2020-07-13 17:57:56 +01:00
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
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
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
c346122adf
align room header with user menu button
2020-07-13 18:24:28 +02:00
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
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
59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling
2020-07-13 16:15:52 +01:00
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
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
3e2280a6f4
Stop classname from overwritting baseavatar's
2020-07-13 15:43:34 +01:00
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
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
0908e813fb
Merge branch 'develop' into travis/room-list/enable
2020-07-12 22:50:27 -06:00
71ecd5dc85
clean-up
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-07-12 18:40:24 +01:00
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
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
Travis Ralston