PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
26796 commits 1 branch 0 tags 338 MiB
Commit graph

26796 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Michael Telatynski
e8e900ca1e 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-13 21:21:02 +01:00
Nad Chishtie
1b9d918a92 Add new e2e icons 2020-07-13 21:20:55 +01:00
Michael Telatynski
88a653445f Fix h-alignment of the room header, timeline and composer avatars 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 21:15:58 +01:00
Michael Telatynski
57f75736be 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-13 21:02:26 +01:00
Michael Telatynski
5a85ce5d3d Remove text decoration from links v2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 21:02:08 +01:00
Nad Chishtie
fafbd25f6b Tweak padding & weight 2020-07-13 20:57:24 +01:00
Nad Chishtie
a3b1c93149 Tweak padding 2020-07-13 20:50:26 +01:00
Michael Telatynski
a19f0fac2f 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-13 20:48:28 +01:00
Michael Telatynski
21a8f2298e Remove text decoration from links 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 20:48:19 +01:00
Nad Chishtie
87a8dc4ff0 Improve spacing 2020-07-13 20:41:18 +01:00
Michael Telatynski
69929134c5 add spacing between sublists of 4px 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 20:40:42 +01:00
Michael Telatynski
4244c67aca Fix even spacing between sticky and non-sticky headers 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 20:29:08 +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
J. Ryan Stinnett
571209afbe
Merge pull request #4963 from matrix-org/joriks/room-list-gradient 
Add fade to show more button on room list
 2020-07-13 20:21:48 +01:00
Travis Ralston
2125293794
Merge pull request #4964 from matrix-org/travis/room-list/extra-tiles 
Fix extra room tiles being rendered on smaller sublists
 2020-07-13 13:21:15 -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
Nad Chishtie
dec377a448 Temporarily apply Joriks CSS fix 2020-07-13 20:15:09 +01:00
Nad Chishtie
b28bb34cb7 Small tweaks to padding and sizing 2020-07-13 20:13:20 +01: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
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