gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240705

Browse source
This commit is contained in:
KMY 2024-07-05 07:22:34 +09:00
commit 9a07550fa6
75 changed files with 1046 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/index.jsx
View file

@ -63,6 +63,7 @@ import {
BookmarkCategories,
BookmarkCategoryStatuses,
FollowedTags,
LinkTimeline,
ListTimeline,
Blocks,
DomainBlocks,
@ -217,6 +218,7 @@ class SwitchingColumnsArea extends PureComponent {
<WrappedRoute path='/public/local/fixed' exact component={CommunityTimeline} content={children} />
<WrappedRoute path={['/conversations', '/timelines/direct']} component={DirectTimeline} content={children} />
<WrappedRoute path='/tags/:id' component={HashtagTimeline} content={children} />
<WrappedRoute path='/links/:url' component={LinkTimeline} content={children} />
<WrappedRoute path='/lists/:id' component={ListTimeline} content={children} />
<WrappedRoute path='/antennasw/:id' component={AntennaSetting} content={children} />
<WrappedRoute path='/antennast/:id' component={AntennaTimeline} content={children} />

4
app/javascript/mastodon/features/ui/util/async-components.js
View file

@ -269,3 +269,7 @@ export function NotificationRequests () {
export function NotificationRequest () {
return import(/*webpackChunkName: "features/notifications/request" */'../../notifications/request');
}
export function LinkTimeline () {
return import(/*webpackChunkName: "features/link_timeline" */'../../link_timeline');
}