mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 02:11:45 +03:00
Code Issues Projects Releases Packages Wiki Activity
27720 commits 219 branches 562 tags 474 MiB
Commit graph

11529 commits

Author SHA1 Message Date
Travis Ralston
ad92e6ba00 Don't constantly re-mount the sublists with a new addRoomFn 
Any time we though that the room list had to re-render we were dynamically creating a new addRoomFn, which would signal to the sublist that it needed to re-render. 

The only reason we wrap the function from the aesthetics is to provide theoretical tiling/multiaccount support through use of different dispatchers, however considering that's not a reality yet we can just use a default dispatcher when none is supplied.
 2020-07-23 22:12:10 -06:00
Travis Ralston
7b97c3032b Make the sublists aware of their own list changes 
This cuts the render time in half (from ~448ms to ~200ms on my account) per received event, as we're no longer re-mounting the entire room list and instead just the section(s) we care about.
 2020-07-23 21:36:43 -06:00
Michael Telatynski
c1d2e27f9c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into SuppressSpeechWhenSending 2020-07-24 00:03:55 +01:00
Michael Telatynski
862856d3be Also add aria-atomic=true 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-24 00:03:42 +01:00
Michael Telatynski
60a6b13f4b
Merge pull request #5026 from matrix-org/t3chguy/room-list/14440 
Put low priority xor toggle back in the room list context menu
 2020-07-24 00:02:50 +01:00
Travis Ralston
2abec8b100 Disable lint in InviteDialog 2020-07-23 15:58:06 -06:00
Michael Telatynski
253d4abb49 Mass redact ignore room creation events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-23 21:30:49 +01:00
Michael Telatynski
ff8f1af01e
Merge pull request #5037 from matrix-org/t3chguy/room-list/14705 
Fix BaseAvatar wrongly using Buttons when it needs not
 2020-07-23 09:27:20 +01:00
Michael Telatynski
6546f98e18 Fix BaseAvatar wrongly using Buttons when it needs not 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-22 20:01:14 +01:00
Swapnil Raj
5ea7be5d53 Cleanup comments 2020-07-22 21:17:58 +05:30
Travis Ralston
67fd6e6122
Merge pull request #5034 from matrix-org/travis/fix-perf 
Mixed bag of performance improvements: ScrollPanel and notifications
 2020-07-22 08:24:04 -06:00
Michael Telatynski
7c1935a44e Key EventTile's using txnId if it is set to prevent a remount 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-22 11:10:55 +01:00
Swapnil Raj
d7728881a3 lint 2020-07-22 15:22:16 +05:30
Swapnil Raj
8ae11ce886 Fix shadow-variable errors in EncryptionPanel 2020-07-22 15:14:50 +05:30
Swapnil Raj
0f0b4035b7 Fix shadow variable errors 2020-07-22 15:14:50 +05:30
Swapnil Raj
5ddae04fb0 lint 2020-07-22 15:14:50 +05:30
Swapnil Raj
8fac7a8167 Convert VerificationPanel to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
3e64ec11c0 lint 2020-07-22 15:14:50 +05:30
Swapnil Raj
36974c4231 Convert EncryptionPanel to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
dac19cffce Convert EncryptionInfo to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
a4959f43d2 Convert GroupHeaderButtons to TS 
Fix typo in SetRightPanelPhasePayload
 2020-07-22 15:14:50 +05:30
Swapnil Raj
887d507772 Fix key to match SetRightPanelPhasePayload's key 
member -> members
 2020-07-22 15:14:50 +05:30
Swapnil Raj
23e4b67a69 Convert HeaderButton to TS 2020-07-22 15:14:50 +05:30
Swapnil Raj
0f59e34a3a Nest groupId in refireParams to match types 2020-07-22 15:14:50 +05:30
Swapnil Raj
1c913b85e2 Replace strings action with correspoding type 2020-07-22 15:14:50 +05:30
Swapnil Raj
2c8b5b49ed lint 2020-07-22 15:14:50 +05:30
Swapnil Raj
1d3635e1c8 Replaced string actions with their corresponding types 2020-07-22 15:14:50 +05:30
Swapnil Raj
344185a375 Translate right panel stuff to ts 
Add actions for right panel
 2020-07-22 15:14:50 +05:30
Robin Townsend
83ab151d96 Translate create room buttons 
Signed-off-by: Robin Townsend <robintown@tcakoi.dev>
 2020-07-22 03:54:15 +00:00
Travis Ralston
c9da1e1874 Remove even more tags from the notification state fetching for a room 2020-07-21 20:58:59 -06:00
Travis Ralston
97739c9a73 Add more statements to avoid layout changes 2020-07-21 20:56:07 -06:00
Travis Ralston
507fa01ade Remove missed area for notification state fetching 2020-07-21 20:51:40 -06:00
Travis Ralston
dd16ec070c Replace countRoomsWithNotif with a dedicated NotificationState 
Fixes https://github.com/vector-im/riot-web/issues/14694

Instead of spending 10-1000ms in a function iterating over a whole lot of room events, we can use our cached state from the Notification State Store. 

This commit sets up a structure that could be applied to communities in the TagPanel too, as that could probably use a similar optimization.

This reduces the updateStatusIndicator() time to just 4ms on average.
 2020-07-21 20:24:44 -06:00
Travis Ralston
928acbdc11 Wrap ScrollPanel layout changes in if statements 
These conditions are rarely true, but when they are it saves ~28ms of forced layout changes.
 2020-07-21 19:52:50 -06:00
Robin Townsend
951570a97f Escape single quotes in composer placeholder 
Signed-off-by: Robin Townsend <robintown@tcakoi.dev>
 2020-07-22 00:47:48 +00:00
Michael Telatynski
70c81cc377 Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs 
 Conflicts:
	src/i18n/strings/en_EN.json
	src/rageshake/submit-rageshake.ts
 2020-07-21 22:22:28 +01:00
Travis Ralston
0a846cb1b5 Don't hammer on the layout engine with avatar updates for the background 
Changing the property on every render of the left panel (which is basically all the time) is super bad on the GPU and for our CPU. We should only do that when something changes.
 2020-07-21 15:02:59 -06:00
Hubert Chathi
cbe4f04cd7
Merge pull request #5029 from uhoreg/sanitize_language 
don't syntax highlight languages that begin with "_"
 2020-07-21 13:12:51 -04:00
Hubert Chathi
2ce493307e don't syntax highlight languages that begin with "_" 2020-07-21 12:47:40 -04:00
Jorik Schellekens
501e0c29ca Merge remote-tracking branch 'origin' into joriks/eslint-config 2020-07-21 15:32:50 +01:00
Travis Ralston
37aed54d12
Merge pull request #5024 from matrix-org/travis/room-list/custom-tags 
Support custom tags in the room list again
 2020-07-21 06:46:50 -06:00
Michael Telatynski
29c984455e tidy up 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 13:43:42 +01:00
Michael Telatynski
ae069576f6 Fix the tag panel context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 10:33:30 +01:00
Michael Telatynski
fe0c660fac Put low priority xor toggle back in the room list context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:50:20 +01:00
Travis Ralston
a0b2859436 Support custom tags in the room list again 
Fixes https://github.com/vector-im/riot-web/issues/14091

Design needs work, however this is behind labs anyways. This re-implements the behaviour of the old room list.

The implementation ended up being a lot easier due to early confusion with what the TagOrderStore and TagPanel take care of. Turns out they don't deal with tags, but groups. As such, we don't need to do anything with filtering (though we keep some sanity checks in place for safety), and just have to wire up the CustomRoomTagPanel and CustomRoomTagStore.
 2020-07-20 16:51:16 -06:00
Jorik Schellekens
c0ce6e8161 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config 2020-07-20 20:44:52 +01:00
Michael Telatynski
9fca422de7 Merge branches 'develop' and 't3chguy/ts/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/2 2020-07-20 17:07:18 +01:00
Michael Telatynski
06cc76f7d8 mark some things as public 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 16:34:52 +01:00
Jorik Schellekens
b3fa855bd8 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/eslint-config 2020-07-20 16:22:32 +01:00
Michael Telatynski
446e8de39e
Merge pull request #5017 from matrix-org/t3chguy/fix/14596 
Fix Breadcrumbs2 ending up with 2 tabIndexes on Firefox
 2020-07-20 15:35:07 +01:00
Michael Telatynski
0de6cada57
Merge pull request #5023 from matrix-org/t3chguy/room-list/14644 
Add min-width to floating Jitsi
 2020-07-20 15:24:26 +01:00
Michael Telatynski
f02115f2a9 Merge branches 'develop' and 't3chguy/fix/14596' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/14596 2020-07-20 15:20:08 +01:00
Michael Telatynski
9e6532e46e
Merge pull request #5016 from matrix-org/t3chguy/tooltips2 
Use mouseleave instead of mouseout for hover events. Fix tooltip flicker
 2020-07-20 15:19:32 +01:00
Michael Telatynski
476c3eb7c8
Merge pull request #5014 from matrix-org/t3chguy/tooltips 
Fix field tooltips
 2020-07-20 15:18:53 +01:00
Michael Telatynski
828cfb7138 Add min-width to floating Jitsi 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 15:15:21 +01:00
Michael Telatynski
8063263665 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 14:56:47 +01:00
Michael Telatynski
8aceb11992 Fix community right panel button regression 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-20 14:47:06 +01:00
Travis Ralston
7996013cd5
Merge pull request #5013 from matrix-org/travis/room-list/rm-old 
[BREAKING] Remove the old room list
 2020-07-20 06:46:05 -06:00
Michael Telatynski
fabed26b09 Fix Breadcrumbs2 ending up with 2 tabIndexes on Firefox due to explicit css overflow scroll 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-18 12:19:03 +01:00
Michael Telatynski
e9633b2e3b Use mouseleave instead of mouseout for hover events. Fix tooltip flicker 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-18 12:01:51 +01:00
Michael Telatynski
c980b58c69 Fix field tooltips 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-18 11:36:23 +01:00
Travis Ralston
7fc5ba50c8 Update references to issues 2020-07-17 16:22:33 -06:00
Travis Ralston
c5d732a631 IncomingCallBox2 -> IncomingCallBox 2020-07-17 15:56:58 -06:00
Travis Ralston
76902a752f CallPreview2 -> CallPreview 2020-07-17 15:56:07 -06:00
Travis Ralston
7f5c501b2b CallView2 -> CallView 2020-07-17 15:55:30 -06:00
Travis Ralston
cbf967ea69 Remove legacy call components 2020-07-17 15:53:13 -06:00
Travis Ralston
d7ada5f7c5 Remove TODO flags 2020-07-17 15:47:37 -06:00
Travis Ralston
c9b0b3b31d RoomSublist2 -> RoomSublist 2020-07-17 15:46:46 -06:00
Travis Ralston
96065ae982 RoomTile2 -> RoomTile 2020-07-17 15:43:29 -06:00
Travis Ralston
8dfe7b6cc7 RoomBreadcrumbs2 -> RoomBreadcrumbs 2020-07-17 15:32:06 -06:00
Travis Ralston
a7c18bfbfa RoomList2 -> RoomList 2020-07-17 15:27:49 -06:00
Travis Ralston
2441cbc9ac LeftPanel2 -> LeftPanel 2020-07-17 15:22:18 -06:00
Travis Ralston
2b15ba21dd Rename RoomListStore file 2020-07-17 15:11:34 -06:00
Jorik Schellekens
58532f2ac4
Merge pull request #4990 from matrix-org/joriks/irc-layout-truncate-upload-name 
ellipse senders for images and videos
 2020-07-17 22:04:19 +01:00
Travis Ralston
1810711380 Dismantle usage of the proxy store class 2020-07-17 14:25:09 -06:00
Travis Ralston
3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Travis Ralston
06336a88b3 Remove setting for old room list 2020-07-17 14:06:30 -06:00
Michael Telatynski
7529bb8bc0 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 19:25:37 +01:00
Michael Telatynski
3639170789 fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 19:00:02 +01:00
Michael Telatynski
b951516077 Add tooltip to Explore rooms button 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:57:38 +01:00
Michael Telatynski
8ea806b43e Add tooltip to collapsed sublists 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:54:09 +01:00
Michael Telatynski
38dc3c8bd1 Replace non-functional Interactive Tooltip 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:43:42 +01:00
Michael Telatynski
fc66a15504 Add tooltips to the Message Action Bar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:36:32 +01:00
Michael Telatynski
1c205c7704 Add buttons to composer actions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:16:31 +01:00
Michael Telatynski
a402f7e38f Add tooltips to top right buttons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:16:21 +01:00
Michael Telatynski
23fa952905 Add tooltips to minimized roomlist2 tiles and sublists 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:16:00 +01:00
Michael Telatynski
efd0bd3d00 Fix AccessibleButton defaultProps to match its types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 18:15:44 +01:00
Michael Telatynski
a8f5731c07 Fix tooltip towards right side of screen going wrong direction 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-17 17:09:43 +01:00
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