a54b18adfe
Merge remote-tracking branch 'origin/develop' into element
2020-07-13 21:54:45 +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
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
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
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
02b27086da
swap search field and breadcrumbs
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
3060cdf934
Iterate PR
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-07-13 17:01:50 +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
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
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
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
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
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
0c06975e7a
Merge remote-tracking branch 'origin/develop' into element
2020-07-11 19:16:26 +01:00
cfc39dc4a9
Remove now-dead code from sublist resizing
2020-07-10 16:10:05 -06:00
9085627a28
Use brand name from config in all strings
2020-07-10 19:57:01 +01:00
5f78522681
Move the default brand into the config module
2020-07-10 19:57:01 +01:00
063e6e3e9c
Fix a few types
2020-07-10 18:23:27 +01:00
bdb641279a
Merge branch 'develop' into travis/room-list/enable
2020-07-10 11:11:25 -06:00
503159c1c8
Merge branch 'dbkr/in-app-rebrand-prompt' into 'element'
...
Add in-app rebranding toasts & prompts
See merge request new-vector/element/element-web/matrix-react-sdk!1
2020-07-10 17:09:17 +00:00
b7ded18fde
Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element
2020-07-10 19:05:46 +02:00
952200f031
Merge branch 'develop' into element
2020-07-10 19:04:45 +02:00
1175eb001f
Fix bad merge
2020-07-10 11:01:11 -06:00
477472c178
Merge branch 'develop' into travis/room-list/showmore2
2020-07-10 10:57:17 -06:00
ae8d6f5523
make tsc happy
2020-07-10 18:48:54 +02:00
15ea3a5287
add types
2020-07-10 18:42:51 +02:00
85ac256231
cleanup
2020-07-10 18:40:09 +02:00
e2aa6ecf6b
fix show X more counter
2020-07-10 18:40:09 +02:00
86817430c5
update initially shown amount of tiles on component update
...
as rooms aren't all available at ctor time
2020-07-10 18:40:09 +02:00
96f2968854
make all height changes update component state
...
also set visibleTiles as side-effect
2020-07-10 18:40:09 +02:00
652fb9e613
track height in pixels in component state
2020-07-10 18:40:09 +02:00
49f7170d95
extract type
2020-07-10 18:31:53 +02:00
725b7f8950
make show more button a bit less tall
2020-07-10 18:30:52 +02:00
d5a3071518
put show more button inside resizer
...
this way we have a flexbox layout in the resizer with:
- the resize handle (fixed)
- the show more/less button, if any (fixed)
- the list of tiles (grabbing whatever is left)
2020-07-10 18:29:39 +02:00
bf0a503e44
[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable
2020-07-10 10:18:12 -06:00
3a3bfb39ee
Make the theme switcher switch between Element themes
2020-07-10 09:18:53 -06:00
28bbac8574
Merge remote-tracking branch 'origin/develop' into element
2020-07-10 16:03:11 +01:00
J. Ryan Stinnett