mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 05:31:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
27225 commits 219 branches 562 tags 474 MiB
Commit graph

11390 commits

Author SHA1 Message Date
Michael Telatynski
4380ebcbb8 Add ContextMenuTooltipButton 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:43:24 +01:00
Michael Telatynski
0a08fb09a2 Fix references to IAccessibleButtonProps 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:22:56 +01:00
Michael Telatynski
9ec2ca447c Update style of default tooltips to match the new style 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:19:10 +01:00
Michael Telatynski
16b1dbc375 remove unused view_tooltip 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 16:10:36 +01:00
Travis Ralston
08f88550b1
Merge pull request #5008 from matrix-org/travis/fix-devtools 
Fix size call for devtools state events
 2020-07-17 07:19:20 -06:00
Michael Telatynski
549bacabc3
Merge pull request #5009 from matrix-org/t3chguy/fix/14573 
Null guard no e2ee for UserInfo
 2020-07-17 13:44:51 +01:00
Michael Telatynski
3305ca26f0 fix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 12:07:54 +01:00
Michael Telatynski
5c8d12ab25 Null guard no e2ee for UserInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 10:49:57 +01:00
Travis Ralston
87743fe0e8 Fix size call for devtools state events 
Fixes https://github.com/vector-im/riot-web/issues/14565

It's not a function
 2020-07-16 18:34:19 -06:00
Hubert Chathi
16a084bca7
Merge pull request #5006 from uhoreg/sanitize_replies 
use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp
 2020-07-16 18:17:57 -04:00
Hubert Chathi
b05a19ef13 lint 2020-07-16 18:07:51 -04:00
Hubert Chathi
a85af47b0a use a proper HTML sanitizer to strip <mx-reply>, rather than a regexp 2020-07-16 17:46:49 -04:00
Travis Ralston
c29da883db Convert room list log setting to a real setting 
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
 2020-07-16 14:43:43 -06:00
Travis Ralston
8b65b19e60
Merge pull request #4936 from matrix-org/travis/general/perf/js-roomstate-map 
Convert devtools dialog to use new room state format
 2020-07-16 13:01:45 -06:00
Travis Ralston
9c9ff281e7 Use .entries() 2020-07-16 13:00:02 -06:00
Michael Telatynski
82f6a6b710
Merge pull request #5000 from swapnilraj/swapnilraj/update-discovery-checkbox 
Update checkbox
 2020-07-16 17:04:36 +01:00
Jorik Schellekens
173ccbcec9 Fix handles 2020-07-16 16:21:38 +01:00
Jorik Schellekens
d794e17d4d Fix handlebar interaction 2020-07-16 16:16:41 +01:00
Michael Telatynski
a704eefdd5 Merge branches 'develop' and 't3chguy/nad/rampage' of github.com:matrix-org/matrix-react-sdk into t3chguy/nad/rampage 
 Conflicts:
	src/components/views/elements/AccessibleTooltipButton.tsx
 2020-07-16 15:47:12 +01:00
Michael Telatynski
d5f2d43429 Improve Tooltip font/layout consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:15:00 +01:00
Michael Telatynski
f2104b59f0 Simplify room sublist context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:04 +01:00
Swapnil Raj
8de6863bf6 Fix indentation 2020-07-16 18:12:11 +05:30
Michael Telatynski
f4da1b6f6b
Merge pull request #4976 from matrix-org/t3chguy/a11y-toolbar-breadcrumbs 
Wire up new room list breadcrumbs as an ARIA Toolbar
 2020-07-16 12:52:59 +01:00
Swapnil Raj
15f94d3732 Update checkbox 2020-07-16 17:22:35 +05:30
Michael Telatynski
9db05db951
Merge pull request #4999 from matrix-org/t3chguy/room-list/14503 
Fix Room Tile Icon to not ignore DMs in other tags
 2020-07-16 12:42:07 +01:00
Michael Telatynski
b1d57ca13e
Merge pull request #4996 from matrix-org/t3chguy/room-list/14491 
Fix enter in new room list filter breaking things
 2020-07-16 12:41:39 +01:00
Michael Telatynski
19d733561d
Merge pull request #4995 from matrix-org/t3chguy/room-list/14509 
Notify left panel of resizing when it is collapsed&expanded
 2020-07-16 12:41:32 +01:00
Michael Telatynski
05b100f44d
Merge pull request #4975 from matrix-org/t3chguy/a11y-toolbar 
Create a generic ARIA toolbar component
 2020-07-16 12:41:05 +01:00
Michael Telatynski
c94c937b31 Fix Room Tile Icon to not ignore DMs in other tags 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 12:33:05 +01:00
Michael Telatynski
b160fe886f
Merge pull request #4987 from matrix-org/t3chguy/room-list/room-tile-icon-tooltip 
Add tooltip to Room Tile Icon
 2020-07-16 10:21:06 +01:00
Michael Telatynski
ed9d3a36a2 fix typescript definitions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 08:58:11 +01:00
Michael Telatynski
2f959a974a Fix enter in new room list filter breaking things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 06:31:06 +01:00
Michael Telatynski
48aa203b95 Notify left panel of resizing when it is collapsed&expanded 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 06:05:53 +01:00
Jorik Schellekens
e873ba9608 ellipse senders for images and videos 2020-07-16 02:52:16 +01:00
Marco Zehe
636b0236b6 Update to use more strict rules for suppressing 
Signed-off-by: Marco Zehe <marco@marcozehe.de>
 2020-07-15 19:02:00 +02:00
Hubert Chathi
aa445a061d check that encryptionInfo.sender is set 2020-07-15 12:25:10 -04:00
Michael Telatynski
78da0c863a Update copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:52:10 +01:00
Michael Telatynski
ae17cd3ec6 Add tooltip to Room Tile Icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:46:39 +01:00
David Baker
7ab1416787
Merge pull request #4986 from matrix-org/dbkr/update_help_link 
Update help link
 2020-07-15 16:30:03 +01:00
Marco Zehe
d8373576f8 Merge remote-tracking branch 'upstream/develop' into SuppressSpeechWhenSending 2020-07-15 17:27:35 +02:00
David Baker
7d5f40876e Update help link 2020-07-15 14:31:15 +01:00
David Baker
6e35cd1d0c Update cover photo link 2020-07-15 14:22:58 +01:00
David Baker
fad5edf794 Fix TS lint errors 2020-07-15 10:56:50 +01:00
David Baker
c6418fb083 A visit from the lint bunny 2020-07-15 10:51:57 +01:00
Michael Telatynski
8812f98b35 Convert editor to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 09:45:45 +01:00
Travis Ralston
895dc9c37f Fix homepage logo 2020-07-15 00:09:39 -06:00
Michael Telatynski
2a683354a8 Wire up new room list breadcrums as an ARIA Toolbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 04:22:37 +01:00
Michael Telatynski
1b08c1e9df Fix AccessibleTooltipButton leaking tooltipclassname into the DOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 04:19:51 +01:00
Michael Telatynski
8703bc1abc Create a generic ARIA toolbar component which works with existing roving tab index context 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 03:47:35 +01:00
Travis Ralston
cc22be4f1d Update attribution 2020-07-14 15:51:34 -06:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
David Baker
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
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
David Baker
839851c90f Fix bug where 'show more' sometimes did nothing 
a3a1e2e01f added the padding
to maxTilesPx which was confusing the calculation of whether we
should be showing the 'show more' button or the 'show less' button.

Hopefully this fixes the issue without undoing fixes from
https://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
Travis Ralston
76fbb7c1b0 Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-14 14:48:21 -06:00
Jorik Schellekens
3eac852ad0 Change font slider values 2020-07-14 21:27:01 +01:00
Travis Ralston
945dab6b1f Revert "Turn previews on for DMs and ensure they get rendered" 
This reverts commit b19ae3ac93.
 2020-07-14 13:36:28 -06: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
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
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
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
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
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
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
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
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
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
J. Ryan Stinnett
995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +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
Michael Telatynski
3060cdf934 Iterate PR 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 17:01:50 +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
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
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
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
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
cfc39dc4a9 Remove now-dead code from sublist resizing 2020-07-10 16:10:05 -06:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
5f78522681 Move the default brand into the config module 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
063e6e3e9c Fix a few types 2020-07-10 18:23:27 +01:00
Travis Ralston
bdb641279a Merge branch 'develop' into travis/room-list/enable 2020-07-10 11:11:25 -06:00
David Baker
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
Bruno Windels
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
Bruno Windels
952200f031 Merge branch 'develop' into element 2020-07-10 19:04:45 +02:00
Travis Ralston
1175eb001f Fix bad merge 2020-07-10 11:01:11 -06:00
Travis Ralston
477472c178 Merge branch 'develop' into travis/room-list/showmore2 2020-07-10 10:57:17 -06:00
Bruno Windels
ae8d6f5523 make tsc happy 2020-07-10 18:48:54 +02:00
Bruno Windels
15ea3a5287 add types 2020-07-10 18:42:51 +02:00
Bruno Windels
85ac256231 cleanup 2020-07-10 18:40:09 +02:00
Bruno Windels
e2aa6ecf6b fix show X more counter 2020-07-10 18:40:09 +02:00
Bruno Windels
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
Bruno Windels
96f2968854 make all height changes update component state 
also set visibleTiles as side-effect
 2020-07-10 18:40:09 +02:00
Bruno Windels
652fb9e613 track height in pixels in component state 2020-07-10 18:40:09 +02:00
Bruno Windels
49f7170d95 extract type 2020-07-10 18:31:53 +02:00
Bruno Windels
725b7f8950 make show more button a bit less tall 2020-07-10 18:30:52 +02:00
Bruno Windels
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
Travis Ralston
bf0a503e44 [WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable 2020-07-10 10:18:12 -06:00
Travis Ralston
3a3bfb39ee Make the theme switcher switch between Element themes 2020-07-10 09:18:53 -06:00
J. Ryan Stinnett
28bbac8574 Merge remote-tracking branch 'origin/develop' into element 2020-07-10 16:03:11 +01:00
David Baker
8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
Travis Ralston
840a4127db
Merge pull request #4944 from matrix-org/travis/room-list/perf/log-disable 
Add an option to disable room list logging, and improve logging
 2020-07-10 07:16:56 -06:00
Bruno Windels
7880c10b21 Merge branch 'element' of https://gitlab.matrix.org/new-vector/element/element-web/matrix-react-sdk into element 2020-07-10 12:28:47 +02:00
Bruno Windels
6dc7a5631b make tag panel less wide 2020-07-10 12:27:48 +02:00
J. Ryan Stinnett
ab51dd28dc Merge remote-tracking branch 'origin/develop' into element 2020-07-10 11:08:33 +01:00
Bruno Windels
f2f813c43c make tag panel context menu icons follow text color 2020-07-10 10:20:26 +02:00
Travis Ralston
75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Jorik Schellekens
ceff68476d Remove useless dispatches 2020-07-10 02:25:47 +01:00
Jorik Schellekens
1983591cbf Remove unused actions 2020-07-10 02:22:34 +01:00
Travis Ralston
cf154ec9cf Add an option to disable room list logging, and improve logging 
For https://github.com/vector-im/riot-web/issues/14035

**This option is not recommended as it completely obliterates all chances of being able to support someone with a broken room list. It is intended for specific testing scenarios only.**
 2020-07-09 18:19:38 -06:00
Travis Ralston
859f65659c Attempt to support a hard cutoff with the show more button 
Known issues:
* Causes scroll jumps when the button gets added to DOM
* Resize handle is invisible when there's a show more button

TODO:
* Clean up comments
* Clean up useless code (all the padding stuff isn't needed)
 2020-07-09 13:07:13 -06:00
Bruno Windels
ce68314de9 Revert "Merge pull request #4932 from matrix-org/travis/room-list/invisible-show-more" 
This reverts commit f58a0a7538.
 2020-07-09 12:13:12 -06:00
Jorik Schellekens
8a7bebc6bf lint 2020-07-09 18:37:18 +01:00