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

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

Browse source
This commit is contained in:
KMY 2024-01-18 09:17:39 +09:00
commit 2b51fabe9c
397 changed files with 2899 additions and 3252 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/mastodon/features/getting_started/components/announcements.jsx
View file

@ -13,10 +13,10 @@ import TransitionMotion from 'react-motion/lib/TransitionMotion';
import spring from 'react-motion/lib/spring';
import ReactSwipeableViews from 'react-swipeable-views';
import elephantUIPlane from 'mastodon/../images/elephant_ui_plane.svg';
import AddIcon from 'mastodon/../material-icons/400-24px/add.svg?react';
import ChevronLeftIcon from 'mastodon/../material-icons/400-24px/chevron_left.svg?react';
import ChevronRightIcon from 'mastodon/../material-icons/400-24px/chevron_right.svg?react';
import elephantUIPlane from '@/images/elephant_ui_plane.svg';
import AddIcon from '@/material-icons/400-24px/add.svg?react';
import ChevronLeftIcon from '@/material-icons/400-24px/chevron_left.svg?react';
import ChevronRightIcon from '@/material-icons/400-24px/chevron_right.svg?react';
import { AnimatedNumber } from 'mastodon/components/animated_number';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';

26
app/javascript/mastodon/features/getting_started/index.jsx
View file

@ -9,19 +9,19 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux';
import CirclesIcon from 'mastodon/../material-icons/400-24px/account_circle-fill.svg?react';
import AlternateEmailIcon from 'mastodon/../material-icons/400-24px/alternate_email.svg?react';
import BookmarksIcon from 'mastodon/../material-icons/400-24px/bookmarks-fill.svg?react';
import PeopleIcon from 'mastodon/../material-icons/400-24px/group.svg?react';
import HomeIcon from 'mastodon/../material-icons/400-24px/home-fill.svg?react';
import ListAltIcon from 'mastodon/../material-icons/400-24px/list_alt.svg?react';
import MenuIcon from 'mastodon/../material-icons/400-24px/menu.svg?react';
import PersonAddIcon from 'mastodon/../material-icons/400-24px/person_add.svg?react';
import PublicIcon from 'mastodon/../material-icons/400-24px/public.svg?react';
import SettingsIcon from 'mastodon/../material-icons/400-24px/settings-fill.svg?react';
import StarIcon from 'mastodon/../material-icons/400-24px/star.svg?react';
import TagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import CirclesIcon from '@/material-icons/400-24px/account_circle-fill.svg?react';
import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
import BookmarksIcon from '@/material-icons/400-24px/bookmarks-fill.svg?react';
import PeopleIcon from '@/material-icons/400-24px/group.svg?react';
import HomeIcon from '@/material-icons/400-24px/home-fill.svg?react';
import ListAltIcon from '@/material-icons/400-24px/list_alt.svg?react';
import MenuIcon from '@/material-icons/400-24px/menu.svg?react';
import PersonAddIcon from '@/material-icons/400-24px/person_add.svg?react';
import PublicIcon from '@/material-icons/400-24px/public.svg?react';
import SettingsIcon from '@/material-icons/400-24px/settings-fill.svg?react';
import StarIcon from '@/material-icons/400-24px/star.svg?react';
import TagIcon from '@/material-icons/400-24px/tag.svg?react';
import AntennaIcon from '@/material-icons/400-24px/wifi.svg?react';
import { fetchFollowRequests } from 'mastodon/actions/accounts';
import Column from 'mastodon/components/column';
import ColumnHeader from 'mastodon/components/column_header';