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

4212 commits

Author SHA1 Message Date
Michael Telatynski
0854924b8d iterate some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-02 23:51:02 +01:00
Michael Telatynski
404009c8cb Merge branches 'develop' and 't3chguy/room-list/3' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/3 
 Conflicts:
	src/components/structures/ContextMenu.tsx
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-02 23:46:12 +01:00
Travis Ralston
df05273225 Merge remote-tracking branch 'origin/joriks/room-list-tooltips' into develop 2020-07-02 15:20:27 -06:00
Travis Ralston
3847dc91c0 Move the stoppage to somewhere more generic 2020-07-02 15:15:33 -06:00
Travis Ralston
43db4b98df Merge branch 'develop' into joriks/room-list-breadcrumbs 2020-07-02 13:22:51 -06:00
Michael Telatynski
c4bbdefa8d
Merge pull request #4870 from matrix-org/t3chguy/room-list/2 
Room List v2 context menu interactions
 2020-07-02 18:02:21 +01:00
J. Ryan Stinnett
209b386e23 Merge remote-tracking branch 'origin/develop' into jryans/room-view-crypto-crash 2020-07-02 13:46:50 +01:00
J. Ryan Stinnett
a928785f72 Check whether crypto is enabled in room recovery reminder 
This avoids a soft crash that may occur otherwise.

Fixes https://github.com/vector-im/riot-web/issues/14289
 2020-07-02 13:19:27 +01:00
J. Ryan Stinnett
b5c94acbe6 Remove unused crypto import 2020-07-02 13:17:51 +01:00
Michael Telatynski
9fcc2ced3d fix types some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:59:06 +01:00
Michael Telatynski
07e0a017e7 fix types 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:56:57 +01:00
Michael Telatynski
6802f9b4df unbreak copyright 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:52:49 +01:00
Michael Telatynski
58718dab37 Convert ContextMenu to TypeScript 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:51:12 +01:00
Michael Telatynski
4b27a67e33 improve default behaviour for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:16:54 +01:00
Michael Telatynski
6424ffb22a fix repeated context menu interaction by not erroring 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:13:54 +01:00
Michael Telatynski
5c2b291510 Support right click context menu interactions on Room List 2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:06:26 +01:00
Michael Telatynski
89bd572371 Fix context menu nesting causing bubbling and instabilities 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 23:05:37 +01:00
Jorik Schellekens
62314cac06
Merge pull request #4863 from matrix-org/joriks/room-list-autohide-scrollbar 
Hide scrollbar without pixel jumping
 2020-07-01 20:07:32 +01:00
Jorik Schellekens
2162517a37 Display breadcrumbs only after 20 rooms have been joined 2020-07-01 16:05:27 +01:00
Jorik Schellekens
ad27dbbfab Clean up classnames 2020-07-01 15:15:18 +01:00
Michael Telatynski
10e547539d Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-07-01 14:26:56 +01:00
Michael Telatynski
b5014282a4 Iterate PR based on Figma design and feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-01 13:59:50 +01:00
Jorik Schellekens
aab372c648 Add tooltips 2020-07-01 01:50:31 +01:00
Jorik Schellekens
d2fb30a211 Hide scrollbar without pixel jumping 2020-06-30 23:52:13 +01:00
Jorik Schellekens
dcd51b5be3 Implement breadcrumb notifications and scrolling 2020-06-30 23:24:46 +01:00
J. Ryan Stinnett
b456529c3e
Merge pull request #4860 from matrix-org/jryans/read-marker-jump-invis-2 
Fix jumping to read marker for events without tiles
 2020-06-30 23:01:19 +01:00
Michael Telatynski
198958dcdd Iterate to match figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:32:59 +01:00
Michael Telatynski
cbd2a9cd35 Redo Iconized Context Menu styling to match Figma and simplify future a11y work by flattening the DOM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:11:12 +01:00
Michael Telatynski
2a12fd1f6e Fix User context menu alignment to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 21:58:54 +01:00
J. Ryan Stinnett
51118863c7 Fix jumping to read marker for events without tiles 
It is possible for your read marker to be set to an event without a tile (like a
reaction). We would still render the read marker at the position of those events
in the timeline, even though there's no matching tile, which breaks a core
assumption of jump to read marker path: it assumes that if the read marker node
is present in the DOM, then there must also be an event tile with a scroll token
matching the event ID.

This fixes the situation by setting a scroll token on the read marker so it can
always be scrolled to, no matter what kind of event it might represent.

Fixes vector-im/riot-web#10975
 2020-06-30 18:40:52 +01:00
Michael Telatynski
cd06910713
Merge pull request #4854 from matrix-org/t3chguy/fix-redirect-loop 
Including start_sso and start_cas in redirect loop prevention
 2020-06-30 16:56:38 +01:00
Michael Telatynski
b2b909aa53 Including start_sso and start_cas in redirect loop prevention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-29 15:40:20 +01:00
Travis Ralston
ee2c216c4d Clean up TODO comments for new room list 
All relevant TODOs should still be present, and reference an issue for easy finding.
 2020-06-28 20:03:04 -06:00
Travis Ralston
3abc9d8d56 Merge branch 'develop' into travis/room-list/tag-panel 2020-06-26 07:26:57 -06:00
Travis Ralston
424443927f
Merge pull request #4843 from matrix-org/travis/room-list/user-menu 
Make the whole user row clickable in the new room list
 2020-06-26 07:25:50 -06:00
Michael Telatynski
113dfc5ed2
Merge pull request #4845 from matrix-org/t3chguy/hf1 
ts-ignore because something is made of fail
 2020-06-26 10:10:18 +01:00
Michael Telatynski
a905028d3a bandaid 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:37:55 +01:00
Michael Telatynski
274e6f3825 make js-sdk import happy? 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:35:29 +01:00
Michael Telatynski
9391d151f3 ts-ignore because something is made of fail 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-26 09:15:02 +01:00
Michael Telatynski
538c853149
Merge pull request #4838 from matrix-org/t3chguy/hf1 
Fix Welcome.html CAS and SSO URLs not working
 2020-06-26 09:09:39 +01:00
Travis Ralston
7ce3cc1db7 Allow the tag panel to be disabled in the new room list 
Fixes https://github.com/vector-im/riot-web/issues/14156
 2020-06-25 20:35:40 -06:00
Travis Ralston
555758d3d2 Remove extra space 2020-06-25 20:23:37 -06:00
Travis Ralston
1888cda5ee Remove debug 2020-06-25 20:22:41 -06:00
Travis Ralston
588fea3a9b Make the menu show up where it was before 2020-06-25 19:55:08 -06:00
Travis Ralston
411271422c Make the whole UserMenu a button to open the menu 2020-06-25 19:54:17 -06:00
Travis Ralston
bcfdd4d984 Move all of the UserMenu into the UserMenu component 2020-06-25 19:38:11 -06:00
Travis Ralston
dafce40d1b Rename UserMenuButton to UserMenu for new scope 2020-06-25 19:29:12 -06:00
Michael Telatynski
6116cfc2b9 js-sdk imports suck 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 23:52:32 +01:00
Travis Ralston
7b79dd6be1 Make the sign out button red 2020-06-25 15:13:28 -06:00
Michael Telatynski
29b0505bdb Welcome no longer needs any props 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-25 22:02:39 +01:00