daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: sync with master; upd chlog

Browse Source
This commit is contained in:
Ainar Garipov
2023-09-07 17:13:48 +03:00
parent 3be7676970
commit 7b93f5d7cf
306 changed files with 19770 additions and 4916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
client/src/components/Settings/Dns/Upstream/Form.js
View File

@@ -179,6 +179,30 @@ const Form = ({
<Examples />
<hr />
</div>
<div className="col-12">
<label
className="form__label form__label--with-desc"
htmlFor="fallback_dns"
>
<Trans>fallback_dns_title</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>fallback_dns_desc</Trans>
</div>
<Field
id="fallback_dns"
name="fallback_dns"
component={renderTextareaField}
type="text"
className="form-control form-control--textarea form-control--textarea-small font-monospace"
placeholder={t('fallback_dns_placeholder')}
disabled={processingSetConfig}
normalizeOnBlur={removeEmptyLines}
/>
</div>
<div className="col-12">
<hr />
</div>
<div className="col-12 mb-2">
<label
className="form__label form__label--with-desc"
@@ -286,6 +310,7 @@ Form.propTypes = {
invalid: PropTypes.bool,
initialValues: PropTypes.object,
upstream_dns: PropTypes.string,
fallback_dns: PropTypes.string,
bootstrap_dns: PropTypes.string,
};

4
client/src/components/Settings/Dns/Upstream/index.js
View File

@@ -10,6 +10,7 @@ const Upstream = () => {
const dispatch = useDispatch();
const {
upstream_dns,
fallback_dns,
bootstrap_dns,
upstream_mode,
resolve_clients,
@@ -21,6 +22,7 @@ const Upstream = () => {
const handleSubmit = (values) => {
const {
fallback_dns,
bootstrap_dns,
upstream_dns,
upstream_mode,
@@ -30,6 +32,7 @@ const Upstream = () => {
} = values;
const dnsConfig = {
fallback_dns,
bootstrap_dns,
upstream_mode,
resolve_clients,
@@ -52,6 +55,7 @@ const Upstream = () => {
<Form
initialValues={{
upstream_dns: upstreamDns,
fallback_dns,
bootstrap_dns,
upstream_mode,
resolve_clients,