docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
export const getVersion = (recheck = false) => async (dispatch) => { | <mask> export const getVersionRequest = createAction('GET_VERSION_REQUEST');
<mask> export const getVersionFailure = createAction('GET_VERSION_FAILURE');
<mask> export const getVersionSuccess = createAction('GET_VERSION_SUCCESS');
<mask>
<mask> export const getVersion = () => async (dispatch) => {
<mask> dispatch(getVersionRequest());
<mask> try {
<mask> const newVersion = await apiClient.getGlobalVersion();
<mask> dispatch(getVersionSuccess(newVersion));
<mask> } catch (error) {
</s> + client: add button for check updates </s> remove const newVersion = await apiClient.getGlobalVersion();
</s> add const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck }); </s> remove dashboard: PropTypes.object,
location: PropTypes.object,
</s> add dashboard: PropTypes.object.isRequired,
location: PropTypes.object.isRequired,
getVersion: PropTypes.func.isRequired, </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/actions/index.js |
const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck }); | <mask>
<mask> export const getVersion = () => async (dispatch) => {
<mask> dispatch(getVersionRequest());
<mask> try {
<mask> const newVersion = await apiClient.getGlobalVersion();
<mask> dispatch(getVersionSuccess(newVersion));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getVersionFailure());
<mask> }
</s> + client: add button for check updates </s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/actions/index.js |
if (recheck) {
dispatch(addSuccessToast('updates_checked'));
} | <mask> try {
<mask> const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck });
<mask> dispatch(getVersionSuccess(newVersion));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getVersionFailure());
<mask> }
<mask> };
</s> + client: add button for check updates </s> remove const newVersion = await apiClient.getGlobalVersion();
</s> add const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck }); </s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/actions/index.js |
GLOBAL_VERSION = { path: 'version.json', method: 'POST' }; | <mask> GLOBAL_QUERY_LOG_ENABLE = { path: 'querylog_enable', method: 'POST' };
<mask> GLOBAL_QUERY_LOG_DISABLE = { path: 'querylog_disable', method: 'POST' };
<mask> GLOBAL_SET_UPSTREAM_DNS = { path: 'set_upstreams_config', method: 'POST' };
<mask> GLOBAL_TEST_UPSTREAM_DNS = { path: 'test_upstream_dns', method: 'POST' };
<mask> GLOBAL_VERSION = { path: 'version.json', method: 'GET' };
<mask> GLOBAL_ENABLE_PROTECTION = { path: 'enable_protection', method: 'POST' };
<mask> GLOBAL_DISABLE_PROTECTION = { path: 'disable_protection', method: 'POST' };
<mask> GLOBAL_UPDATE = { path: 'update', method: 'POST' };
<mask>
<mask> restartGlobalFiltering() {
</s> + client: add button for check updates </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/api/Api.js |
getGlobalVersion(data) { | <mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> getGlobalVersion() {
<mask> const { path, method } = this.GLOBAL_VERSION;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> enableGlobalProtection() {
</s> + client: add button for check updates </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/api/Api.js |
const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); | <mask> }
<mask>
<mask> getGlobalVersion() {
<mask> const { path, method } = this.GLOBAL_VERSION;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> enableGlobalProtection() {
<mask> const { path, method } = this.GLOBAL_ENABLE_PROTECTION;
<mask> return this.makeRequest(path, method);
</s> + client: add button for check updates </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/api/Api.js |
const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; | <mask> };
<mask>
<mask> render() {
<mask> const { dashboard, encryption } = this.props;
<mask> const updateAvailable =
<mask> !dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
<mask>
<mask> return (
<mask> <HashRouter hashType="noslash">
<mask> <Fragment>
<mask> {updateAvailable && (
</s> + client: add button for check updates </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; </s> remove { ...this.props.dashboard }
</s> add { ...dashboard }
getVersion={getVersion} </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove location={this.props.location}
</s> add location={location} </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
</s> add const refreshFullButton = (
<button
type="button"
className="btn btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<Trans>refresh_statics</Trans>
</button>
);
const refreshButton = (
<button
type="button"
className="btn btn-icon btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button>
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/App/index.js |
const refreshFullButton = (
<button
type="button"
className="btn btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<Trans>refresh_statics</Trans>
</button>
);
const refreshButton = (
<button
type="button"
className="btn btn-icon btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button>
); | <mask> dashboard.processingStatsHistory ||
<mask> dashboard.processingClients ||
<mask> dashboard.processingTopStats;
<mask>
<mask> const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>;
<mask> const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={ t('dashboard') }>
<mask> <div className="page-title__actions">
</s> + client: add button for check updates </s> remove <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value" title={dnsVersion}>{dnsVersion}</span>
<button
type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
onClick={() => props.getVersion(true)}
disabled={processingVersion}
title={t('check_updates_now')}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button> </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { </s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Dashboard/index.js |
max-width: 110px; | <mask>
<mask> .nav-version__value {
<mask> font-weight: 600;
<mask> text-overflow: ellipsis;
<mask> white-space: nowrap;
<mask> overflow: hidden;
</s> + client: add button for check updates </s> remove GLOBAL_VERSION = { path: 'version.json', method: 'GET' };
</s> add GLOBAL_VERSION = { path: 'version.json', method: 'POST' }; </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Header.css |
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden; | <mask> max-width: 110px;
<mask> font-weight: 600;
<mask> }
<mask>
<mask> .nav-version__link {
<mask> position: relative;
<mask> display: inline-block;
</s> + client: add button for check updates </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Header.css |
.nav-version__text {
display: flex;
justify-content: flex-end;
}
| <mask> }
<mask>
<mask> .header-brand-img {
<mask> height: 32px;
<mask> }
<mask>
<mask> .nav-tabs .nav-item.show .nav-link {
<mask> color: #66b574;
</s> + client: add button for check updates </s> remove .card-refresh {
height: 26px;
width: 26px;
background-size: 14px;
background-position: center;
background-repeat: no-repeat;
background-image: url("data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI0IiBzdHJva2U9IiM0NjdmY2YiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIyIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHdpZHRoPSIyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMjMgNHY2aC02Ii8+PHBhdGggZD0ibTEgMjB2LTZoNiIvPjxwYXRoIGQ9Im0zLjUxIDlhOSA5IDAgMCAxIDE0Ljg1LTMuMzZsNC42NCA0LjM2bS0yMiA0IDQuNjQgNC4zNmE5IDkgMCAwIDAgMTQuODUtMy4zNiIvPjwvc3ZnPg==");
}
.card-refresh:hover,
.card-refresh:not(:disabled):not(.disabled):active,
.card-refresh:focus:active {
background-image: url("data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI0IiBzdHJva2U9IiNmZmYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIyIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHdpZHRoPSIyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMjMgNHY2aC02Ii8+PHBhdGggZD0ibTEgMjB2LTZoNiIvPjxwYXRoIGQ9Im0zLjUxIDlhOSA5IDAgMCAxIDE0Ljg1LTMuMzZsNC42NCA0LjM2bS0yMiA0IDQuNjQgNC4zNmE5IDkgMCAwIDAgMTQuODUtMy4zNiIvPjwvc3ZnPg==");
}
</s> add </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Header.css |
const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| <mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import { getDnsAddress } from '../../helpers/helpers';
<mask>
<mask> function Version(props) {
<mask> const { dnsVersion, dnsAddresses, dnsPort } = props;
<mask> return (
<mask> <div className="nav-version">
<mask> <div className="nav-version__text">
<mask> <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
<mask> </div>
</s> + client: add button for check updates </s> remove <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value" title={dnsVersion}>{dnsVersion}</span>
<button
type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
onClick={() => props.getVersion(true)}
disabled={processingVersion}
title={t('check_updates_now')}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button> </s> remove { ...this.props.dashboard }
</s> add { ...dashboard }
getVersion={getVersion} </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Version.js |
<Trans>version</Trans>: <span className="nav-version__value" title={dnsVersion}>{dnsVersion}</span>
<button
type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
onClick={() => props.getVersion(true)}
disabled={processingVersion}
title={t('check_updates_now')}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button> | <mask> const { dnsVersion, dnsAddresses, dnsPort } = props;
<mask> return (
<mask> <div className="nav-version">
<mask> <div className="nav-version__text">
<mask> <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
<mask> </div>
<mask> <div className="nav-version__link">
<mask> <div className="popover__trigger popover__trigger--address">
<mask> <Trans>dns_addresses</Trans>
<mask> </div>
</s> + client: add button for check updates </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
</s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))} </s> remove { ...this.props.dashboard }
</s> add { ...dashboard }
getVersion={getVersion} </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
</s> add const refreshFullButton = (
<button
type="button"
className="btn btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<Trans>refresh_statics</Trans>
</button>
);
const refreshButton = (
<button
type="button"
className="btn btn-icon btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button>
); </s> remove }
</s> add }; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Version.js |
{dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))} | <mask> <Trans>dns_addresses</Trans>
<mask> </div>
<mask> <div className="popover__body popover__body--address">
<mask> <div className="popover__list">
<mask> {dnsAddresses
<mask> .map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
<mask> }
<mask> </div>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> );
</s> + client: add button for check updates </s> remove <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value" title={dnsVersion}>{dnsVersion}</span>
<button
type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
onClick={() => props.getVersion(true)}
disabled={processingVersion}
title={t('check_updates_now')}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button> </s> remove { ...this.props.dashboard }
</s> add { ...dashboard }
getVersion={getVersion} </s> remove }
</s> add }; </s> remove location={this.props.location}
</s> add location={location} </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Version.js |
}; | <mask> </div>
<mask> </div>
<mask> </div>
<mask> );
<mask> }
<mask>
<mask> Version.propTypes = {
<mask> dnsVersion: PropTypes.string.isRequired,
<mask> dnsAddresses: PropTypes.array.isRequired,
<mask> dnsPort: PropTypes.number.isRequired,
</s> + client: add button for check updates </s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))} </s> remove { ...this.props.dashboard }
</s> add { ...dashboard }
getVersion={getVersion} </s> remove location={this.props.location}
</s> add location={location} </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Version.js |
getVersion: PropTypes.func.isRequired,
processingVersion: PropTypes.bool.isRequired,
t: PropTypes.func.isRequired, | <mask> dnsVersion: PropTypes.string.isRequired,
<mask> dnsAddresses: PropTypes.array.isRequired,
<mask> dnsPort: PropTypes.number.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Version);
</s> + client: add button for check updates </s> remove }
</s> add }; </s> remove dashboard: PropTypes.object,
location: PropTypes.object,
</s> add dashboard: PropTypes.object.isRequired,
location: PropTypes.object.isRequired,
getVersion: PropTypes.func.isRequired, </s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { </s> remove const newVersion = await apiClient.getGlobalVersion();
</s> add const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck }); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/Version.js |
const { dashboard, getVersion, location } = this.props; | <mask> this.setState({ isMenuOpen: false });
<mask> };
<mask>
<mask> render() {
<mask> const { dashboard } = this.props;
<mask> const { isMenuOpen } = this.state;
<mask> const badgeClass = classnames({
<mask> 'badge dns-status': true,
<mask> 'badge-success': dashboard.protectionEnabled,
<mask> 'badge-danger': !dashboard.protectionEnabled,
</s> + client: add button for check updates </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove const newVersion = await apiClient.getGlobalVersion();
</s> add const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck }); </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/index.js |
location={location} | <mask> }
<mask> </div>
<mask> </div>
<mask> <Menu
<mask> location={this.props.location}
<mask> isMenuOpen={isMenuOpen}
<mask> toggleMenuOpen={this.toggleMenuOpen}
<mask> closeMenu={this.closeMenu}
<mask> />
<mask> {!dashboard.processing &&
</s> + client: add button for check updates </s> remove { ...this.props.dashboard }
</s> add { ...dashboard }
getVersion={getVersion} </s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))} </s> remove }
</s> add }; </s> remove <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value" title={dnsVersion}>{dnsVersion}</span>
<button
type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
onClick={() => props.getVersion(true)}
disabled={processingVersion}
title={t('check_updates_now')}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button> </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/index.js |
{ ...dashboard }
getVersion={getVersion} | <mask> />
<mask> {!dashboard.processing &&
<mask> <div className="col col-sm-6 col-lg-3">
<mask> <Version
<mask> { ...this.props.dashboard }
<mask> />
<mask> </div>
<mask> }
<mask> </div>
<mask> </div>
</s> + client: add button for check updates </s> remove location={this.props.location}
</s> add location={location} </s> remove <Trans>version</Trans>: <span className="nav-version__value">{dnsVersion}</span>
</s> add <Trans>version</Trans>: <span className="nav-version__value" title={dnsVersion}>{dnsVersion}</span>
<button
type="button"
className="btn btn-icon btn-icon-sm btn-outline-primary btn-sm ml-2"
onClick={() => props.getVersion(true)}
disabled={processingVersion}
title={t('check_updates_now')}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button> </s> remove {dnsAddresses
.map(ip => <li key={ip}>{getDnsAddress(ip, dnsPort)}</li>)
}
</s> add {dnsAddresses.map(ip => (
<li key={ip}>{getDnsAddress(ip, dnsPort)}</li>
))} </s> remove }
</s> add }; </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/index.js |
dashboard: PropTypes.object.isRequired,
location: PropTypes.object.isRequired,
getVersion: PropTypes.func.isRequired, | <mask> }
<mask> }
<mask>
<mask> Header.propTypes = {
<mask> dashboard: PropTypes.object,
<mask> location: PropTypes.object,
<mask> };
<mask>
<mask> export default withNamespaces()(Header);
</s> + client: add button for check updates </s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { </s> remove const newVersion = await apiClient.getGlobalVersion();
</s> add const newVersion = await apiClient.getGlobalVersion({ recheck_now: recheck }); </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/Header/index.js |
<mask> padding: 2.5rem 1.5rem;
<mask> text-align: center;
<mask> }
<mask>
<mask> .card-refresh {
<mask> height: 26px;
<mask> width: 26px;
<mask> background-size: 14px;
<mask> background-position: center;
<mask> background-repeat: no-repeat;
<mask> background-image: url("data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI0IiBzdHJva2U9IiM0NjdmY2YiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIyIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHdpZHRoPSIyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMjMgNHY2aC02Ii8+PHBhdGggZD0ibTEgMjB2LTZoNiIvPjxwYXRoIGQ9Im0zLjUxIDlhOSA5IDAgMCAxIDE0Ljg1LTMuMzZsNC42NCA0LjM2bS0yMiA0IDQuNjQgNC4zNmE5IDkgMCAwIDAgMTQuODUtMy4zNiIvPjwvc3ZnPg==");
<mask> }
<mask>
<mask> .card-refresh:hover,
<mask> .card-refresh:not(:disabled):not(.disabled):active,
<mask> .card-refresh:focus:active {
<mask> background-image: url("data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjI0IiBzdHJva2U9IiNmZmYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIyIiB2aWV3Qm94PSIwIDAgMjQgMjQiIHdpZHRoPSIyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJtMjMgNHY2aC02Ii8+PHBhdGggZD0ibTEgMjB2LTZoNiIvPjxwYXRoIGQ9Im0zLjUxIDlhOSA5IDAgMCAxIDE0Ljg1LTMuMzZsNC42NCA0LjM2bS0yMiA0IDQuNjQgNC4zNmE5IDkgMCAwIDAgMTQuODUtMy4zNiIvPjwvc3ZnPg==");
<mask> }
<mask>
<mask> .card-title-stats {
<mask> font-size: 13px;
<mask> color: #9aa0ac;
<mask> }
<mask>
</s> + client: add button for check updates </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/ui/Card.css |
|
<symbol id="refresh" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<path d="M23 4v6h-6M1 20v-6h6"/><path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0 0 20.49 15"/>
</symbol> | <mask> <symbol id="settings" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<mask> <circle cx="12" cy="12" r="3"/><path d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0 -1.51-1h-.17a2 2 0 0 1 -2-2 2 2 0 0 1 2-2h.09a1.65 1.65 0 0 0 1.51-1.08 1.65 1.65 0 0 0 -.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33h.08a1.65 1.65 0 0 0 1-1.51v-.17a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0 -.33 1.82v.08a1.65 1.65 0 0 0 1.51 1h.17a2 2 0 0 1 2 2 2 2 0 0 1 -2 2h-.09a1.65 1.65 0 0 0 -1.51 1z"/>
<mask> </symbol>
<mask> </svg>
<mask> );
<mask>
<mask> export default Icons;
</s> + client: add button for check updates </s> remove dashboard: PropTypes.object,
location: PropTypes.object,
</s> add dashboard: PropTypes.object.isRequired,
location: PropTypes.object.isRequired,
getVersion: PropTypes.func.isRequired, </s> remove const refreshFullButton = <button type="button" className="btn btn-outline-primary btn-sm" onClick={() => this.getAllStats()}><Trans>refresh_statics</Trans></button>;
const refreshButton = <button type="button" className="btn btn-outline-primary btn-sm card-refresh" onClick={() => this.getAllStats()} />;
</s> add const refreshFullButton = (
<button
type="button"
className="btn btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<Trans>refresh_statics</Trans>
</button>
);
const refreshButton = (
<button
type="button"
className="btn btn-icon btn-outline-primary btn-sm"
onClick={() => this.getAllStats()}
>
<svg className="icons">
<use xlinkHref="#refresh" />
</svg>
</button>
); </s> remove export const getVersion = () => async (dispatch) => {
</s> add export const getVersion = (recheck = false) => async (dispatch) => { </s> remove }
</s> add }; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/components/ui/Icons.js |
processingVersion: false, | <mask> announcementUrl,
<mask> newVersion,
<mask> canAutoUpdate,
<mask> isUpdateAvailable: true,
<mask> };
<mask> return newState;
<mask> }
<mask>
<mask> return state;
</s> + client: add button for check updates </s> remove getGlobalVersion() {
</s> add getGlobalVersion(data) { </s> remove return this.makeRequest(path, method);
</s> add const config = {
data,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config); </s> remove const { dashboard } = this.props;
</s> add const { dashboard, getVersion, location } = this.props; </s> remove const updateAvailable =
!dashboard.processingVersions && dashboard.isCoreRunning && dashboard.isUpdateAvailable;
</s> add const updateAvailable = dashboard.isCoreRunning && dashboard.isUpdateAvailable; </s> remove function Version(props) {
const { dnsVersion, dnsAddresses, dnsPort } = props;
</s> add const Version = (props) => {
const {
dnsVersion, dnsAddresses, dnsPort, processingVersion, t,
} = props;
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0e9df33a409dbffeb2d5d45b7f31f30587a2e4f7 | client/src/reducers/index.js |
"errors" | <mask> package main
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
</s> + /control/dhcp/find_active_dhcp: detect static IP on Linux </s> remove result["other-server"] = othSrv
</s> add result["other_server"] = othSrv
result["static_ip"] = staticIP | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ed619c9c86402ae8188ab2e00a0bd717aa0cbee | dhcp.go |
"os/exec"
"runtime" | <mask> "net"
<mask> "net/http"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/golibs/log"
</s> + /control/dhcp/find_active_dhcp: detect static IP on Linux </s> remove result["other-server"] = othSrv
</s> add result["other_server"] = othSrv
result["static_ip"] = staticIP | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ed619c9c86402ae8188ab2e00a0bd717aa0cbee | dhcp.go |
// Perform the following tasks:
// . Search for another DHCP server running
// . Check if a static IP is configured for the network interface
// Respond with results | <mask> return
<mask> }
<mask> }
<mask>
<mask> func handleDHCPFindActiveServer(w http.ResponseWriter, r *http.Request) {
<mask> log.Tracef("%s %v", r.Method, r.URL)
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to read request body: %s", err)
<mask> log.Error(errorText)
</s> + /control/dhcp/find_active_dhcp: detect static IP on Linux </s> remove result["other-server"] = othSrv
</s> add result["other_server"] = othSrv
result["static_ip"] = staticIP | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ed619c9c86402ae8188ab2e00a0bd717aa0cbee | dhcp.go |
staticIP := map[string]interface{}{}
isStaticIP, err := hasStaticIP(interfaceName)
staticIPStatus := "yes"
if err != nil {
staticIPStatus = "error"
staticIP["error"] = err.Error()
} else if !isStaticIP {
staticIPStatus = "no"
staticIP["ip"] = getFullIP(interfaceName)
}
staticIP["static"] = staticIPStatus
| <mask> }
<mask> othSrv["found"] = foundVal
<mask>
<mask> result := map[string]interface{}{}
<mask> result["other_server"] = othSrv
<mask> result["static_ip"] = staticIP
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
</s> + /control/dhcp/find_active_dhcp: detect static IP on Linux </s> remove result["other-server"] = othSrv
</s> add result["other_server"] = othSrv
result["static_ip"] = staticIP | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ed619c9c86402ae8188ab2e00a0bd717aa0cbee | dhcp.go |
result["other_server"] = othSrv
result["static_ip"] = staticIP | <mask> }
<mask> othSrv["found"] = foundVal
<mask>
<mask> result := map[string]interface{}{}
<mask> result["other-server"] = othSrv
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err = json.NewEncoder(w).Encode(result)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Failed to marshal DHCP found json: %s", err)
</s> + /control/dhcp/find_active_dhcp: detect static IP on Linux | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ed619c9c86402ae8188ab2e00a0bd717aa0cbee | dhcp.go |
const { original } = row;
const { url } = original; | <mask> width: 100,
<mask> sortable: false,
<mask> resizable: false,
<mask> Cell: (row) => {
<mask> const { value } = row;
<mask> const { t, toggleFilteringModal, handleDelete } = this.props;
<mask>
<mask> return (
<mask> <div className="logs__row logs__row--center">
<mask> <button
</s> Pull request: 4659 fix url value in filter table actions
Updates #4659
Squashed commit of the following:
commit e1bcda9566bd9f1cca965f4308c337a9adf2ce04
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 14 17:40:09 2022 +0300
client: fix url value in filter table actions </s> remove url: value,
</s> add url, </s> remove onClick={() => handleDelete(value)}
</s> add onClick={() => handleDelete(url)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0edf71a4af0602106f09cb3270904e2abdbce28c | client/src/components/Filters/Table.js |
url, | <mask> className="btn btn-icon btn-outline-primary btn-sm mr-2"
<mask> title={t('edit_table_action')}
<mask> onClick={() => toggleFilteringModal({
<mask> type: MODAL_TYPE.EDIT_FILTERS,
<mask> url: value,
<mask> })
<mask> }
<mask> >
<mask> <svg className="icons">
<mask> <use xlinkHref="#edit" />
</s> Pull request: 4659 fix url value in filter table actions
Updates #4659
Squashed commit of the following:
commit e1bcda9566bd9f1cca965f4308c337a9adf2ce04
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 14 17:40:09 2022 +0300
client: fix url value in filter table actions </s> remove onClick={() => handleDelete(value)}
</s> add onClick={() => handleDelete(url)} </s> remove const { value } = row;
</s> add const { original } = row;
const { url } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0edf71a4af0602106f09cb3270904e2abdbce28c | client/src/components/Filters/Table.js |
onClick={() => handleDelete(url)} | <mask> </button>
<mask> <button
<mask> type="button"
<mask> className="btn btn-icon btn-outline-secondary btn-sm"
<mask> onClick={() => handleDelete(value)}
<mask> title={t('delete_table_action')}
<mask> >
<mask> <svg className="icons">
<mask> <use xlinkHref="#delete" />
<mask> </svg>
</s> Pull request: 4659 fix url value in filter table actions
Updates #4659
Squashed commit of the following:
commit e1bcda9566bd9f1cca965f4308c337a9adf2ce04
Author: Ildar Kamalov <[email protected]>
Date: Tue Jun 14 17:40:09 2022 +0300
client: fix url value in filter table actions </s> remove url: value,
</s> add url, </s> remove const { value } = row;
</s> add const { original } = row;
const { url } = original; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0edf71a4af0602106f09cb3270904e2abdbce28c | client/src/components/Filters/Table.js |
func TestSafeBrowsingHash(t *testing.T) {
q, hashes := hostnameToHashParam("1.2.3.4.5.6")
assert.Equal(t, "0132d0fa.b5413b4e.5fa067c1.e7f6c011.", q)
assert.Equal(t, 4, len(hashes))
}
| <mask>
<mask> // SAFE BROWSING
<mask>
<mask> func TestSafeBrowsing(t *testing.T) {
<mask> d := NewForTest(&Config{SafeBrowsingEnabled: true}, nil)
<mask> defer d.Close()
<mask> gctx.stats.Safebrowsing.Requests = 0
</s> * SB/PC: limit the number of hashes in request to 4 | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ee3505e1f0cc3df78651f2f9cb393c5ff3df26e | dnsfilter/dnsfilter_test.go |
// The maximum is 4 components: "a.b.c.d" | <mask>
<mask> // for each dot, hash it and add it to string
<mask> func hostnameToHashParam(host string) (string, map[string]bool) {
<mask> var hashparam bytes.Buffer
<mask> hashes := map[string]bool{}
<mask> tld, icann := publicsuffix.PublicSuffix(host)
<mask> if !icann {
<mask> // private suffixes like cloudfront.net
</s> * SB/PC: limit the number of hashes in request to 4 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ee3505e1f0cc3df78651f2f9cb393c5ff3df26e | dnsfilter/security.go |
nDots := 0
for i := len(curhost) - 1; i >= 0; i-- {
if curhost[i] == '.' {
nDots++
if nDots == 4 {
curhost = curhost[i+1:] // "xxx.a.b.c.d" -> "a.b.c.d"
break
}
}
}
| <mask> // private suffixes like cloudfront.net
<mask> tld = ""
<mask> }
<mask> curhost := host
<mask> for {
<mask> if curhost == "" {
<mask> // we've reached end of string
<mask> break
<mask> }
<mask> if tld != "" && curhost == tld {
</s> * SB/PC: limit the number of hashes in request to 4 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ee3505e1f0cc3df78651f2f9cb393c5ff3df26e | dnsfilter/security.go |
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "os/signal"
<mask> "path"
<mask> "path/filepath"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask> "syscall"
</s> Get rid of hardcoded binary name </s> remove "strings"
</s> add </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
|
<mask> "path"
<mask> "path/filepath"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/gobuffalo/packr"
<mask>
</s> Get rid of hardcoded binary name </s> remove "path"
</s> add </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
|
<mask> // VersionString will be set through ldflags, contains current version
<mask> var VersionString = "undefined"
<mask>
<mask> const (
<mask> // We use it to detect the working dir
<mask> executableName = "AdGuardHome"
<mask>
<mask> // Used in config to indicate that syslog or eventlog (win) should be used for logger output
<mask> configSyslog = "syslog"
<mask> )
<mask>
<mask> // main is the entry point
</s> Get rid of hardcoded binary name </s> remove initWorkingDir()
</s> add initWorkingDir(args) </s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
|
initWorkingDir(args) | <mask> config.ourConfigFilename = args.configFilename
<mask> }
<mask>
<mask> // configure working dir and config path
<mask> initWorkingDir()
<mask>
<mask> // configure log level and output
<mask> configureLogger(args)
<mask>
<mask> // print the first message after logger is configured
</s> Get rid of hardcoded binary name </s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) </s> remove // We use it to detect the working dir
executableName = "AdGuardHome"
</s> add </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
func initWorkingDir(args options) { | <mask> log.Fatal(http.ListenAndServe(address, nil))
<mask> }
<mask>
<mask> // initWorkingDir initializes the ourBinaryDir (basically, we use it as a working dir)
<mask> func initWorkingDir() {
<mask> exec, err := os.Executable()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
</s> Get rid of hardcoded binary name </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) | <mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
<mask> currentExecutableName := filepath.Base(exec)
<mask> currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
<mask> if currentExecutableName == executableName {
<mask> // Binary build
<mask> config.ourBinaryDir = filepath.Dir(exec)
<mask> } else {
<mask> // Most likely we're debugging -- using current working directory in this case
<mask> workDir, _ := os.Getwd()
<mask> config.ourBinaryDir = workDir
<mask> }
</s> Get rid of hardcoded binary name </s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
config.ourBinaryDir = filepath.Dir(exec) | <mask> if currentExecutableName == executableName {
<mask> // Binary build
<mask> config.ourBinaryDir = filepath.Dir(exec)
<mask> } else {
<mask> // Most likely we're debugging -- using current working directory in this case
<mask> workDir, _ := os.Getwd()
<mask> config.ourBinaryDir = workDir
<mask> }
<mask> }
<mask>
<mask> // configureLogger configures logger level and output
<mask> func configureLogger(args options) {
</s> Get rid of hardcoded binary name </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove initWorkingDir()
</s> add initWorkingDir(args) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
configFile := config.getConfigFilename()
_, err := os.Stat(configFile) | <mask> }
<mask> }
<mask>
<mask> func askUsernamePasswordIfPossible() error {
<mask> configfile := config.ourConfigFilename
<mask> if !filepath.IsAbs(configfile) {
<mask> configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> }
<mask> _, err := os.Stat(configfile)
<mask> if !os.IsNotExist(err) {
<mask> // do nothing, file exists
<mask> return nil
<mask> }
<mask> if !terminal.IsTerminal(int(os.Stdin.Fd())) {
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
// getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
| <mask> },
<mask> SchemaVersion: currentSchemaVersion,
<mask> }
<mask>
<mask> // getLogSettings reads logging settings from the config file.
<mask> // we do it in a separate method in order to configure logger before the actual configuration is parsed and applied.
<mask> func getLogSettings() logSettings {
<mask> l := logSettings{}
</s> Get rid of hardcoded binary name </s> remove initWorkingDir()
</s> add initWorkingDir(args) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove // We use it to detect the working dir
executableName = "AdGuardHome"
</s> add </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
configFile := config.getConfigFilename() | <mask> }
<mask>
<mask> // parseConfig loads configuration from the YAML file
<mask> func parseConfig() error {
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> log.Printf("Reading YAML file: %s", configFile)
<mask> yamlFile, err := readConfigFile()
<mask> if err != nil {
<mask> log.Printf("Couldn't read config file: %s", err)
<mask> return err
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
configFile := config.getConfigFilename() | <mask> }
<mask>
<mask> // readConfigFile reads config file contents if it exists
<mask> func readConfigFile() ([]byte, error) {
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> if _, err := os.Stat(configFile); os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
<mask> return nil, nil
<mask> }
<mask> return ioutil.ReadFile(configFile)
</s> Get rid of hardcoded binary name </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
configFile := config.getConfigFilename() | <mask> // Saves configuration to the YAML file and also saves the user filter contents to a file
<mask> func (c *configuration) write() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> log.Printf("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
configFile := config.getConfigFilename() | <mask>
<mask> // Performs necessary upgrade operations if needed
<mask> func upgradeConfig() error {
<mask> // read a config file into an interface map, so we can manipulate values without losing any
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> if _, err := os.Stat(configFile); os.IsNotExist(err) {
<mask> log.Printf("config file %s does not exist, nothing to upgrade", configFile)
<mask> return nil
<mask> }
<mask> diskConfig := map[string]interface{}{}
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | upgrade.go |
configFile := config.getConfigFilename() | <mask> log.Println(err)
<mask> return err
<mask> }
<mask>
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> body, err := yaml.Marshal(diskConfig)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | upgrade.go |
"example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)</0>",
"upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers",
"parallel_requests": "Parallel requests", | <mask> {
<mask> "client_settings": "Client settings",
<mask> "example_upstream_reserved": "you can specify DNS upstream <0>for a specific domain(s)</0>",
<mask> "upstream_parallel": "Use parallel queries to speed up resolving by simultaneously querying all upstream servers",
<mask> "bootstrap_dns": "Bootstrap DNS servers",
<mask> "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.",
<mask> "check_dhcp_servers": "Check for DHCP servers",
<mask> "save_config": "Save config",
<mask> "enabled_dhcp": "DHCP server enabled",
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove this.props.getDnsSettings();
</s> add | [
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/__locales/en.json |
"fastest_addr": "Fastest IP address",
"fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses", | <mask> "example_rewrite_domain": "rewrite responses for this domain name only.",
<mask> "example_rewrite_wildcard": "rewrite responses for all <0>example.org</0> subdomains.",
<mask> "disable_ipv6": "Disable IPv6",
<mask> "disable_ipv6_desc": "If this feature is enabled, all DNS queries for IPv6 addresses (type AAAA) will be dropped.",
<mask> "autofix_warning_text": "If you click \"Fix\", AdGuard Home will configure your system to use AdGuard Home DNS server.",
<mask> "autofix_warning_list": "It will perform these tasks: <0>Deactivate system DNSStubListener</0> <0>Set DNS server address to 127.0.0.1</0> <0>Replace symbolic link target of /etc/resolv.conf with /run/systemd/resolve/resolv.conf</0> <0>Stop DNSStubListener (reload systemd-resolved service)</0>",
<mask> "autofix_warning_result": "As a result all DNS requests from your system will be processed by AdGuard Home by default.",
<mask> "tags_title": "Tags",
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove "example_upstream_reserved": "you can specify DNS upstream <0>for a specific domain(s)</0>",
"upstream_parallel": "Use parallel queries to speed up resolving by simultaneously querying all upstream servers",
</s> add "example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)</0>",
"upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers",
"parallel_requests": "Parallel requests", </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove this.props.getDnsSettings();
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/__locales/en.json |
import { normalizeTextarea } from '../helpers/helpers'; | <mask> import { createAction } from 'redux-actions';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask>
<mask> export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
<mask> export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
<mask> export const getDnsConfigSuccess = createAction('GET_DNS_CONFIG_SUCCESS');
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/actions/dnsConfig.js |
const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
| <mask>
<mask> export const setDnsConfig = config => async (dispatch) => {
<mask> dispatch(setDnsConfigRequest());
<mask> try {
<mask> await apiClient.setDnsConfig(config);
<mask> dispatch(addSuccessToast('config_successfully_saved'));
<mask> dispatch(setDnsConfigSuccess(config));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setDnsConfigFailure());
<mask> }
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/actions/dnsConfig.js |
<mask> handleRequestError(error);
<mask> }
<mask> };
<mask>
<mask> export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
<mask> export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
<mask> export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
<mask>
<mask> export const getDnsSettings = () => async (dispatch) => {
<mask> dispatch(getDnsSettingsRequest());
<mask> try {
<mask> const dnsStatus = await apiClient.getGlobalStatus();
<mask> dispatch(getDnsSettingsSuccess(dnsStatus));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getDnsSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
<mask> export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
<mask> export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
<mask> export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
<mask>
<mask> export const setUpstream = config => async (dispatch) => {
<mask> dispatch(setUpstreamRequest());
<mask> try {
<mask> const values = { ...config };
<mask> values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
<mask> values.upstream_dns = normalizeTextarea(values.upstream_dns);
<mask>
<mask> await apiClient.setUpstream(values);
<mask> dispatch(addSuccessToast('updated_upstream_dns_toast'));
<mask> dispatch(setUpstreamSuccess(config));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setUpstreamFailure());
<mask> }
<mask> };
<mask>
<mask> export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
<mask> export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
<mask> export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');
<mask>
<mask> export const testUpstream = config => async (dispatch) => {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove await apiClient.setDnsConfig(config);
dispatch(addSuccessToast('config_successfully_saved'));
</s> add const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
</s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, </s> remove getDnsSettings,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/actions/index.js |
|
<mask> }
<mask>
<mask> // Global methods
<mask> GLOBAL_STATUS = { path: 'status', method: 'GET' };
<mask> GLOBAL_SET_UPSTREAM_DNS = { path: 'set_upstreams_config', method: 'POST' };
<mask> GLOBAL_TEST_UPSTREAM_DNS = { path: 'test_upstream_dns', method: 'POST' };
<mask> GLOBAL_VERSION = { path: 'version.json', method: 'POST' };
<mask> GLOBAL_UPDATE = { path: 'update', method: 'POST' };
<mask>
<mask> getGlobalStatus() {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/api/Api.js |
|
<mask> const { path, method } = this.GLOBAL_STATUS;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> setUpstream(url) {
<mask> const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
<mask> const config = {
<mask> data: url,
<mask> headers: { 'Content-Type': 'application/json' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> testUpstream(servers) {
<mask> const { path, method } = this.GLOBAL_TEST_UPSTREAM_DNS;
<mask> const config = {
<mask> data: servers,
<mask> headers: { 'Content-Type': 'application/json' },
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> remove await apiClient.setDnsConfig(config);
dispatch(addSuccessToast('config_successfully_saved'));
</s> add const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/api/Api.js |
|
const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); | <mask> toNumber,
<mask> } from '../../../../helpers/form';
<mask> import { BLOCKING_MODES } from '../../../../helpers/constants';
<mask>
<mask> const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<mask> <Field
<mask> key={mode}
<mask> name="blocking_mode"
<mask> type="radio"
<mask> component={renderRadioField}
<mask> value={mode}
<mask> placeholder={t(mode)}
<mask> disabled={processing}
<mask> />
<mask> ));
<mask>
<mask> let Form = ({
<mask> handleSubmit, submitting, invalid, processing, blockingMode, t,
<mask> }) => (
<mask> <form onSubmit={handleSubmit}>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove }) => (
</s> add }) => </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
}) => | <mask> ));
<mask>
<mask> let Form = ({
<mask> handleSubmit, submitting, invalid, processing, blockingMode, t,
<mask> }) => (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
<label htmlFor="ratelimit"
className="form__label form__label--with-desc"> | <mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ratelimit" className="form__label form__label--with-desc">
<mask> <Trans>rate_limit</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>rate_limit_desc</Trans>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove }) => (
</s> add }) => </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
{checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | <mask> validate={[required, biggerOrEqualZero]}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="edns_cs_enabled"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('edns_enable')}
<mask> disabled={processing}
<mask> subtitle={t('edns_cs_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="dnssec_enabled"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('dnssec_enable')}
<mask> disabled={processing}
<mask> subtitle={t('dnssec_enable_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="disable_ipv6"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('disable_ipv6')}
<mask> disabled={processing}
<mask> subtitle={t('disable_ipv6_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings mb-4">
<mask> <label className="form__label form__label--with-desc">
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
{Object.values(BLOCKING_MODES)
.map(mode => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))} | <mask> <label className="form__label form__label--with-desc">
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> {Object.values(BLOCKING_MODES).map(mode => (
<mask> <li key={mode}>
<mask> <Trans >{`blocking_mode_${mode}`}</Trans>
<mask> </li>
<mask> ))}
<mask> </div>
<mask> <div className="custom-controls-stacked">
<mask> {getFields(processing, t)}
<mask> </div>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
{customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> | <mask> </div>
<mask> </div>
<mask> {blockingMode === BLOCKING_MODES.custom_ip && (
<mask> <Fragment>
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<mask> <Trans>blocking_ipv4</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>blocking_ipv4_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv4"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ip_address" className="form__label form__label--with-desc">
<mask> <Trans>blocking_ipv6</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
<label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> | <mask> </div>
<mask> </div>
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ip_address" className="form__label form__label--with-desc">
<mask> <Trans>blocking_ipv6</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>blocking_ipv6_desc</Trans>
<mask> </div>
<mask> <Field
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
<Trans>{description}</Trans> | <mask> <label htmlFor="ip_address" className="form__label form__label--with-desc">
<mask> <Trans>blocking_ipv6</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>blocking_ipv6_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv6"
<mask> component={renderInputField}
<mask> className="form-control"
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove name="blocking_ipv6"
</s> add name={name} </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
name={name} | <mask> <div className="form__desc form__desc--top">
<mask> <Trans>blocking_ipv6_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv6"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv6, required]}
<mask> />
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove </div>
</s> add </div>)} </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
validate={[validateIp, required]} | <mask> name="blocking_ipv6"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv6, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Fragment>
<mask> )}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove name="blocking_ipv6"
</s> add name={name} </s> remove </div>
</s> add </div>)} </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove </Fragment>
)}
</s> add </Fragment>} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
</div>)} | <mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv6, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Fragment>
<mask> )}
<mask> </div>
<mask> <button
<mask> type="submit"
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} </s> remove name="blocking_ipv6"
</s> add name={name} </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove submitting || invalid || processingSetUpstream || processingTestUpstream
</s> add submitting || invalid || processingSetConfig || processingTestUpstream | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
</form>; | <mask> disabled={submitting || invalid || processing}
<mask> >
<mask> <Trans>save_btn</Trans>
<mask> </button>
<mask> </form>
<mask> );
<mask>
<mask> Form.propTypes = {
<mask> blockingMode: PropTypes.string.isRequired,
<mask> handleSubmit: PropTypes.func.isRequired,
<mask> submitting: PropTypes.bool.isRequired,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove submitting || invalid || processingSetUpstream || processingTestUpstream
</s> add submitting || invalid || processingSetConfig || processingTestUpstream </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import classnames from 'classnames';
<mask>
<mask> import { renderSelectField } from '../../../../helpers/form';
<mask> import Examples from './Examples';
<mask>
<mask> let Form = (props) => {
<mask> const {
<mask> t,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
|
<mask> const {
<mask> t,
<mask> handleSubmit,
<mask> testUpstream,
<mask> upstreamDns,
<mask> bootstrapDns,
<mask> allServers,
<mask> submitting,
<mask> invalid,
<mask> processingSetUpstream,
<mask> processingTestUpstream,
<mask> } = props;
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream,
</s> add processingSetConfig, </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove }) => (
</s> add }) => </s> remove language,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
|
processingSetConfig, | <mask> bootstrapDns,
<mask> allServers,
<mask> submitting,
<mask> invalid,
<mask> processingSetUpstream,
<mask> processingTestUpstream,
<mask> } = props;
<mask>
<mask> const testButtonClass = classnames({
<mask> 'btn btn-primary btn-standard mr-2': true,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove language,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
fastest_addr,
parallel_requests,
upstream_dns,
bootstrap_dns, | <mask> invalid,
<mask> processingSetConfig,
<mask> processingTestUpstream,
<mask> } = props;
<mask>
<mask> const testButtonClass = classnames({
<mask> 'btn btn-primary btn-standard mr-2': true,
<mask> 'btn btn-primary btn-standard mr-2 btn-loading': processingTestUpstream,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream,
</s> add processingSetConfig, </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove handleUpstreamChange,
setUpstream,
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
const INPUT_FIELDS = getInputFields(parallel_requests, fastest_addr);
| <mask> });
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> {INPUT_FIELDS.map(({
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove }) => (
</s> add }) => </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove {Object.values(BLOCKING_MODES).map(mode => (
<li key={mode}>
<Trans >{`blocking_mode_${mode}`}</Trans>
</li>
))}
</s> add {Object.values(BLOCKING_MODES)
.map(mode => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))} </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
{INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} | <mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <label className="form__label" htmlFor="upstream_dns">
<mask> <Trans>upstream_dns</Trans>
<mask> </label>
<mask> <Field
<mask> id="upstream_dns"
<mask> name="upstream_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> placeholder={t('upstream_dns')}
<mask> disabled={processingSetUpstream || processingTestUpstream}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="all_servers"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('upstream_parallel')}
<mask> disabled={processingSetUpstream}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <Examples />
<mask> <hr />
<mask> </div>
<mask> <div className="col-12">
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
<div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> | <mask> <div className="col-12">
<mask> <Examples />
<mask> <hr />
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group">
<mask> <label
<mask> className="form__label form__label--with-desc"
<mask> htmlFor="bootstrap_dns"
<mask> >
<mask> <Trans>bootstrap_dns</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>bootstrap_dns_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="bootstrap_dns"
<mask> name="bootstrap_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea form-control--textarea-small"
<mask> placeholder={t('bootstrap_dns')}
<mask> disabled={processingSetUpstream}
<mask> />
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="card-actions">
<mask> <div className="btn-list">
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetConfig}
/> | <mask> <div className="form__desc form__desc--top">
<mask> <Trans>bootstrap_dns_desc</Trans>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="card-actions">
<mask> <div className="btn-list">
<mask> <button
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove {Object.values(BLOCKING_MODES).map(mode => (
<li key={mode}>
<Trans >{`blocking_mode_${mode}`}</Trans>
</li>
))}
</s> add {Object.values(BLOCKING_MODES)
.map(mode => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
upstream_dns,
bootstrap_dns, | <mask> type="button"
<mask> className={testButtonClass}
<mask> onClick={() =>
<mask> testUpstream({
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> })
<mask> }
<mask> disabled={!upstreamDns || processingTestUpstream}
<mask> >
<mask> <Trans>test_upstream_btn</Trans>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} </s> remove language,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
disabled={!upstream_dns || processingTestUpstream} | <mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> })
<mask> }
<mask> disabled={!upstreamDns || processingTestUpstream}
<mask> >
<mask> <Trans>test_upstream_btn</Trans>
<mask> </button>
<mask> <button
<mask> type="submit"
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, </s> remove submitting || invalid || processingSetUpstream || processingTestUpstream
</s> add submitting || invalid || processingSetConfig || processingTestUpstream </s> remove language,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove </form>
);
</s> add </form>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
submitting || invalid || processingSetConfig || processingTestUpstream | <mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard"
<mask> disabled={
<mask> submitting || invalid || processingSetUpstream || processingTestUpstream
<mask> }
<mask> >
<mask> <Trans>apply_btn</Trans>
<mask> </button>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} </s> remove </form>
);
</s> add </form>; </s> remove </div>
</s> add </div>)} </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
upstream_dns: PropTypes.string,
bootstrap_dns: PropTypes.string,
fastest_addr: PropTypes.bool,
parallel_requests: PropTypes.bool, | <mask> testUpstream: PropTypes.func,
<mask> submitting: PropTypes.bool,
<mask> invalid: PropTypes.bool,
<mask> initialValues: PropTypes.object,
<mask> upstreamDns: PropTypes.string,
<mask> bootstrapDns: PropTypes.string,
<mask> allServers: PropTypes.bool,
<mask> processingTestUpstream: PropTypes.bool,
<mask> processingSetUpstream: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream: PropTypes.bool,
</s> add processingSetConfig: PropTypes.bool, </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
processingSetConfig: PropTypes.bool, | <mask> upstreamDns: PropTypes.string,
<mask> bootstrapDns: PropTypes.string,
<mask> allServers: PropTypes.bool,
<mask> processingTestUpstream: PropTypes.bool,
<mask> processingSetUpstream: PropTypes.bool,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> const selector = formValueSelector('upstreamForm');
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
</s> add upstream_dns: PropTypes.string,
bootstrap_dns: PropTypes.string,
fastest_addr: PropTypes.bool,
parallel_requests: PropTypes.bool, </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
const fastest_addr = selector(state, 'fastest_addr');
const parallel_requests = selector(state, 'parallel_requests');
| <mask>
<mask> const selector = formValueSelector('upstreamForm');
<mask>
<mask> Form = connect((state) => {
<mask> const upstreamDns = selector(state, 'upstream_dns');
<mask> const bootstrapDns = selector(state, 'bootstrap_dns');
<mask> const allServers = selector(state, 'all_servers');
<mask> return {
<mask> upstreamDns,
<mask> bootstrapDns,
<mask> allServers,
<mask> };
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove processingSetUpstream: PropTypes.bool,
</s> add processingSetConfig: PropTypes.bool, </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, | <mask> const upstreamDns = selector(state, 'upstream_dns');
<mask> const bootstrapDns = selector(state, 'bootstrap_dns');
<mask> const allServers = selector(state, 'all_servers');
<mask> return {
<mask> upstreamDns,
<mask> bootstrapDns,
<mask> allServers,
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove const upstreamDns = selector(state, 'upstream_dns');
const bootstrapDns = selector(state, 'bootstrap_dns');
const allServers = selector(state, 'all_servers');
</s> add const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
const fastest_addr = selector(state, 'fastest_addr');
const parallel_requests = selector(state, 'parallel_requests');
</s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove language,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
this.props.setDnsConfig(values); | <mask> import Card from '../../../ui/Card';
<mask>
<mask> class Upstream extends Component {
<mask> handleSubmit = (values) => {
<mask> this.props.setUpstream(values);
<mask> };
<mask>
<mask> handleTest = (values) => {
<mask> this.props.testUpstream(values);
<mask> };
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove this.props.getDnsSettings();
</s> add </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> upstreamDns: upstream_dns,
<mask> bootstrapDns: bootstrap_dns,
<mask> allServers: all_servers,
<mask> processingSetUpstream,
<mask> processingTestUpstream,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Card
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove all_servers,
</s> add fastest_addr,
parallel_requests, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
|
dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
}, | <mask> t,
<mask> processingTestUpstream,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Card
<mask> title={t('upstream_dns')}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> remove setUpstream,
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
fastest_addr,
parallel_requests, | <mask> <Form
<mask> initialValues={{
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> all_servers,
<mask> }}
<mask> testUpstream={this.handleTest}
<mask> onSubmit={this.handleSubmit}
<mask> processingTestUpstream={processingTestUpstream}
<mask> processingSetUpstream={processingSetUpstream}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream={processingSetUpstream}
</s> add processingSetConfig={processingSetConfig} </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
processingSetConfig={processingSetConfig} | <mask> }}
<mask> testUpstream={this.handleTest}
<mask> onSubmit={this.handleSubmit}
<mask> processingTestUpstream={processingTestUpstream}
<mask> processingSetUpstream={processingSetUpstream}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> );
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove all_servers,
</s> add fastest_addr,
parallel_requests, </s> remove </div>
</s> add </div>)} </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
<mask> }
<mask> }
<mask>
<mask> Upstream.propTypes = {
<mask> upstreamDns: PropTypes.string,
<mask> bootstrapDns: PropTypes.string,
<mask> allServers: PropTypes.bool,
<mask> setUpstream: PropTypes.func.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> processingSetUpstream: PropTypes.bool.isRequired,
<mask> processingTestUpstream: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
</s> add upstream_dns: PropTypes.string,
bootstrap_dns: PropTypes.string,
fastest_addr: PropTypes.bool,
parallel_requests: PropTypes.bool, </s> remove processingSetUpstream: PropTypes.bool,
</s> add processingSetConfig: PropTypes.bool, </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
|
<mask> bootstrapDns: PropTypes.string,
<mask> allServers: PropTypes.bool,
<mask> setUpstream: PropTypes.func.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> processingSetUpstream: PropTypes.bool.isRequired,
<mask> processingTestUpstream: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Upstream);
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
</s> add upstream_dns: PropTypes.string,
bootstrap_dns: PropTypes.string,
fastest_addr: PropTypes.bool,
parallel_requests: PropTypes.bool, </s> remove processingSetUpstream: PropTypes.bool,
</s> add processingSetConfig: PropTypes.bool, </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
|
dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, | <mask> Upstream.propTypes = {
<mask> testUpstream: PropTypes.func.isRequired,
<mask> processingTestUpstream: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Upstream);
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add </s> remove setUpstream: PropTypes.func.isRequired,
</s> add </s> remove dashboard: PropTypes.object.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
<mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsSettings();
<mask> this.props.getAccessList();
<mask> this.props.getDnsConfig();
<mask> }
<mask>
<mask> render() {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove dashboard,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> dashboard,
<mask> settings,
<mask> access,
<mask> setAccessList,
<mask> testUpstream,
<mask> setUpstream,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove setUpstream,
</s> add </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
<mask> settings,
<mask> access,
<mask> setAccessList,
<mask> testUpstream,
<mask> setUpstream,
<mask> dnsConfig,
<mask> setDnsConfig,
<mask> } = this.props;
<mask>
<mask> const isDataLoading = dashboard.processingDnsSettings
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove dashboard,
</s> add </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
const isDataLoading = access.processing || dnsConfig.processingGetConfig; | <mask> dnsConfig,
<mask> setDnsConfig,
<mask> } = this.props;
<mask>
<mask> const isDataLoading = dashboard.processingDnsSettings
<mask> || access.processing
<mask> || dnsConfig.processingGetConfig;
<mask> const isDataReady = !dashboard.processingDnsSettings
<mask> && !access.processing
<mask> && !dnsConfig.processingGetConfig;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {isDataLoading && <Loading />}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove setUpstream,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
{isDataLoading ?
<Loading /> : | <mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {isDataLoading && <Loading />}
<mask> {isDataReady && (
<mask> <Fragment>
<mask> <Config
<mask> dnsConfig={dnsConfig}
<mask> setDnsConfig={setDnsConfig}
<mask> />
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> </s> remove upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
<mask> dnsConfig={dnsConfig}
<mask> setDnsConfig={setDnsConfig}
<mask> />
<mask> <Upstream
<mask> upstreamDns={dashboard.upstreamDns}
<mask> bootstrapDns={dashboard.bootstrapDns}
<mask> allServers={dashboard.allServers}
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> processingSetUpstream={settings.processingSetUpstream}
<mask> setUpstream={setUpstream}
<mask> testUpstream={testUpstream}
<mask> />
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
</s> add </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
<mask> upstreamDns={dashboard.upstreamDns}
<mask> bootstrapDns={dashboard.bootstrapDns}
<mask> allServers={dashboard.allServers}
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> processingSetUpstream={settings.processingSetUpstream}
<mask> setUpstream={setUpstream}
<mask> testUpstream={testUpstream}
<mask> />
<mask> <Access access={access} setAccessList={setAccessList} />
<mask> </Fragment>
<mask> )}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
</s> add </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove </div>
</s> add </div>)} </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
|
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig} | <mask> processingTestUpstream={settings.processingTestUpstream}
<mask> testUpstream={testUpstream}
<mask> />
<mask> <Access access={access} setAccessList={setAccessList} />
<mask> </Fragment>}
<mask> </Fragment>
<mask> );
<mask> }
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
</s> add </s> remove upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
</s> add </s> remove </span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
</s> add </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> </s> remove processingSetUpstream={processingSetUpstream}
</s> add processingSetConfig={processingSetConfig} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
</Fragment>} | <mask> setUpstream={setUpstream}
<mask> testUpstream={testUpstream}
<mask> />
<mask> <Access access={access} setAccessList={setAccessList} />
<mask> </Fragment>
<mask> )}
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
</s> add </s> remove </div>
</s> add </div>)} </s> remove </span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
</s> add </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
<mask> }
<mask> }
<mask>
<mask> Dns.propTypes = {
<mask> dashboard: PropTypes.object.isRequired,
<mask> settings: PropTypes.object.isRequired,
<mask> setUpstream: PropTypes.func.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> getAccessList: PropTypes.func.isRequired,
<mask> setAccessList: PropTypes.func.isRequired,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove setUpstream: PropTypes.func.isRequired,
</s> add </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
Subsets and Splits