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-20240115

Browse source
This commit is contained in:
KMY 2024-01-15 11:08:37 +09:00
commit 673e09d645
338 changed files with 1095 additions and 540 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/features/antenna_setting/components/text_list.jsx
View file

@ -6,8 +6,7 @@ import { injectIntl } from 'react-intl';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import { ReactComponent as DeleteIcon } from '@material-symbols/svg-600/outlined/delete.svg';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import { Button } from 'mastodon/components/button';
import { Icon } from 'mastodon/components/icon';
import { IconButton } from 'mastodon/components/icon_button';
@ -16,7 +15,7 @@ class TextListItem extends PureComponent {
static propTypes = {
icon: PropTypes.string.isRequired,
iconComponent: PropTypes.object.isRequired,
iconComponent: PropTypes.func.isRequired,
value: PropTypes.string.isRequired,
onRemove: PropTypes.func.isRequired,
};
@ -47,7 +46,7 @@ class TextList extends PureComponent {
disabled: PropTypes.bool,
intl: PropTypes.object.isRequired,
icon: PropTypes.string.isRequired,
iconComponent: PropTypes.object.isRequired,
iconComponent: PropTypes.func.isRequired,
label: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired,

12
app/javascript/mastodon/features/antenna_setting/index.jsx
View file

@ -11,15 +11,15 @@ import { List as ImmutableList, Map as ImmutableMap } from 'immutable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import { connect } from 'react-redux';
import { ReactComponent as DeleteIcon } from '@material-symbols/svg-600/outlined/delete.svg';
import { ReactComponent as DomainIcon } from '@material-symbols/svg-600/outlined/dns.svg';
import { ReactComponent as EditIcon } from '@material-symbols/svg-600/outlined/edit.svg';
import { ReactComponent as HashtagIcon } from '@material-symbols/svg-600/outlined/tag.svg';
import { ReactComponent as KeywordIcon } from '@material-symbols/svg-600/outlined/title.svg';
import { ReactComponent as AntennaIcon } from '@material-symbols/svg-600/outlined/wifi.svg';
import Select, { NonceProvider } from 'react-select';
import Toggle from 'react-toggle';
import DeleteIcon from 'mastodon/../material-icons/400-24px/delete.svg?react';
import DomainIcon from 'mastodon/../material-icons/400-24px/dns.svg?react';
import EditIcon from 'mastodon/../material-icons/400-24px/edit.svg?react';
import HashtagIcon from 'mastodon/../material-icons/400-24px/tag.svg?react';
import KeywordIcon from 'mastodon/../material-icons/400-24px/title.svg?react';
import AntennaIcon from 'mastodon/../material-icons/400-24px/wifi.svg?react';
import {
fetchAntenna,
deleteAntenna,