docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep
|
<mask> </div>
<mask>
<mask> <Tabs controlClass="form">
<mask> <div label="settings" title={props.t('main_settings')}>
<mask> {settingsCheckboxes.map(setting => (
<mask> <div className="form__group" key={setting.name}>
<mask> <Field
<mask> name={setting.name}
<mask> type="checkbox"
<mask> component={renderSelectField}
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}> </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => ( </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => ( </s> remove <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag" key="0">link</a>,
</s> add <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
key="0">link</a>, </s> remove normalizeOnBlur={data => data.trim()}
</s> add normalizeOnBlur={(data) => data.trim()} </s> remove {whitelist ? (
<Trans>enter_valid_allowlist</Trans>
) : (
<Trans>enter_valid_blocklist</Trans>
)}
</s> add {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> </button>
<mask> </div>
<mask> </div>
<mask> <div className="services">
<mask> {SERVICES.map(service => (
<mask> <Field
<mask> key={service.id}
<mask> icon={`service_${service.id}`}
<mask> name={`blocked_services.${service.id}`}
<mask> type="checkbox"
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => ( </s> remove {settingsCheckboxes.map(setting => (
</s> add {settingsCheckboxes.map((setting) => ( </s> remove {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}> </s> remove <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag" key="0">link</a>,
</s> add <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
key="0">link</a>, </s> remove {whitelist ? (
<Trans>enter_valid_allowlist</Trans>
) : (
<Trans>enter_valid_blocklist</Trans>
)}
</s> add {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>} </s> remove const renderFieldsWrapper = (placeholder, buttonTitle) =>
function cell(row) {
const {
fields,
} = row;
return (
<div className="form__group">
{fields.map((ip, index) => (
<div key={index} className="mb-1">
<Field
name={ip}
component={renderGroupField}
type="text"
className="form-control"
placeholder={placeholder}
isActionAvailable={index !== 0}
removeField={() => fields.remove(index)}
normalizeOnBlur={data => data.trim()}
/>
</div>
))}
<button
type="button"
className="btn btn-link btn-block btn-sm"
onClick={() => fields.push()}
title={buttonTitle}
>
<svg className="icon icon--close">
<use xlinkHref="#plus" />
</svg>
</button>
</div>
);
};
</s> add const renderFieldsWrapper = (placeholder, buttonTitle) => function cell(row) {
const {
fields,
} = row;
return (
<div className="form__group">
{fields.map((ip, index) => (
<div key={index} className="mb-1">
<Field
name={ip}
component={renderGroupField}
type="text"
className="form-control"
placeholder={placeholder}
isActionAvailable={index !== 0}
removeField={() => fields.remove(index)}
normalizeOnBlur={(data) => data.trim()}
/>
</div>
))}
<button
type="button"
className="btn btn-link btn-block btn-sm"
onClick={() => fields.push()}
title={buttonTitle}
>
<svg className="icon icon--close">
<use xlinkHref="#plus" />
</svg>
</button>
</div>
);
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/Form.js
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard"
<mask> disabled={
<mask> submitting ||
<mask> invalid ||
<mask> pristine ||
<mask> processingAdding ||
<mask> processingUpdating
<mask> }
<mask> >
<mask> <Trans>save_btn</Trans>
<mask> </button>
<mask> </div>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove onClick={this.handleSubmit}
</s> add onClick={handleSubmit} </s> remove const isSavingDisabled =
invalid ||
submitting ||
processingConfig ||
processingValidate ||
!valid_key ||
!valid_cert ||
!valid_pair;
</s> add const isSavingDisabled = invalid
|| submitting
|| processingConfig
|| processingValidate
|| !valid_key
|| !valid_cert
|| !valid_pair; </s> remove onClick={() =>
testUpstream({
upstream_dns,
bootstrap_dns,
})
</s> add onClick={() => testUpstream({
upstream_dns,
bootstrap_dns,
}) </s> remove const subtitle =
stats.interval === 1
? t('for_last_24_hours')
: t('for_last_days', { count: stats.interval });
</s> add const subtitle = stats.interval === 1
? t('for_last_24_hours')
: t('for_last_days', { count: stats.interval }); </s> remove } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'clientForm',
<mask> enableReinitialize: true,
<mask> validate,
<mask> }),
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import ReactModal from 'react-modal';
<mask>
<mask> import { MODAL_TYPE } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/Modal.js
|
keep keep keep keep replace
|
<mask> processingUpdating: PropTypes.bool.isRequired,
<mask> tagsOptions: PropTypes.array.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Modal);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(AutoClients);
</s> add export default withTranslation()(AutoClients); </s> remove export default withNamespaces()(ClientsTable);
</s> add export default withTranslation()(ClientsTable); </s> remove export default withNamespaces()(KeyStatus);
</s> add export default withTranslation()(KeyStatus);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/Modal.js
|
keep replace keep keep keep keep keep
|
<mask> import React, { Component, Fragment } from 'react';
<mask> import { withNamespaces } from 'react-i18next';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import ClientsTable from './ClientsTable';
<mask> import AutoClients from './AutoClients';
<mask> import PageTitle from '../../ui/PageTitle';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/index.js
|
keep keep keep keep replace
|
<mask> getClients: PropTypes.func.isRequired,
<mask> getStats: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Clients);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(ClientsTable);
</s> add export default withTranslation()(ClientsTable); </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(DnsAllowlist);
</s> add export default withTranslation()(DnsAllowlist); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Settings);
</s> add export default withTranslation()(Settings);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/index.js
|
keep keep replace keep keep keep replace replace
|
<mask> const { value } = row;
<mask>
<mask> return (
<mask> <div className="logs__row logs__row--overflow">
<mask> <span className="logs__text logs__text--wrap">{getFormattedWhois(value, t)}</span>
<mask> </div>
<mask> );
<mask> };
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove return (
</s> add return ( </s> remove {value.map(address => (
</s> add {value.map((address) => ( </s> remove {value.map(tag => (
</s> add {value.map((tag) => ( </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove const clientCell = (t, toggleClientStatus, processing, disallowedClients) =>
function cell(row) {
const { value } = row;
const blocked = isBlockedClient(disallowedClients, value);
</s> add const clientCell = (t, toggleClientStatus, processing, disallowedClients) => function cell(row) {
const { value } = row;
const blocked = isBlockedClient(disallowedClients, value);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Clients/whoisCell.js
|
keep replace keep keep replace keep keep
|
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderInputField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
<mask>
<mask> const renderInterfaces = (interfaces => (
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const renderInterfaces = (interfaces => (
</s> add const renderInterfaces = ((interfaces) => ( </s> remove import { renderInputField, required, domain, answer } from '../../../helpers/form';
</s> add import {
renderInputField, required, domain, answer,
} from '../../../helpers/form'; </s> remove import { renderInputField, ipv4, mac, required } from '../../../../helpers/form';
</s> add import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace keep keep keep replace keep keep
|
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderInputField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
<mask>
<mask> const renderInterfaces = (interfaces => (
<mask> Object.keys(interfaces).map((item) => {
<mask> const option = interfaces[item];
<mask> const { name } = option;
<mask> const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':'));
<mask> let interfaceIP = option.ip_addresses[0];
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { renderInputField, required, ipv4, isPositive, toNumber } from '../../../helpers/form';
</s> add import {
renderInputField, required, ipv4, isPositive, toNumber,
} from '../../../helpers/form'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { renderInputField, required, domain, answer } from '../../../helpers/form';
</s> add import {
renderInputField, required, domain, answer,
} from '../../../helpers/form'; </s> remove import { renderInputField, ipv4, mac, required } from '../../../../helpers/form';
</s> add import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> );
<mask> })
<mask> ));
<mask>
<mask> const renderInterfaceValues = (interfaceValues => (
<mask> <ul className="list-unstyled mt-1 mb-0">
<mask> <li>
<mask> <span className="interface__title">MTU: </span>
<mask> {interfaceValues.mtu}
<mask> </li>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove .map(ip => <span key={ip} className="interface__ip">{ip}</span>)
</s> add .map((ip) => <span key={ip} className="interface__ip">{ip}</span>) </s> remove }) => (
<Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice">
</s> add }) => <Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice"> </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>} </s> remove {value.map(address => (
</s> add {value.map((address) => ( </s> remove {value.map(tag => (
</s> add {value.map((tag) => ( </s> remove }) => (
<Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
</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">
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <li>
<mask> <span className="interface__title"><Trans>dhcp_ip_addresses</Trans>: </span>
<mask> {
<mask> interfaceValues.ip_addresses
<mask> .map(ip => <span key={ip} className="interface__ip">{ip}</span>)
<mask> }
<mask> </li>
<mask> </ul>
<mask> ));
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const renderInterfaceValues = (interfaceValues => (
</s> add const renderInterfaceValues = ((interfaceValues) => ( </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>} </s> remove }) => (
<Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice">
</s> add }) => <Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice"> </s> remove }) => (
<Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
</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"> </s> remove <br/>
</s> add <br /> </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>
);
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>;
renderFilterField.propTypes = {
input: PropTypes.object.isRequired,
id: PropTypes.string.isRequired,
className: PropTypes.string,
placeholder: PropTypes.string,
type: PropTypes.string,
disabled: PropTypes.string,
autoComplete: PropTypes.string,
tooltip: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask>
<mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(t('dhcp_reset'))) {
<mask> Object.keys(fields).forEach(field => change(field, fields[field]));
<mask> resetDhcp();
<mask> }
<mask> };
<mask>
<mask> let Form = (props) => {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove Object.keys(fields).forEach(field => change(field, fields[field]));
</s> add Object.keys(fields).forEach((field) => change(field, fields[field])); </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
</s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) { </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) { </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) { </s> remove } else if (percent > 10) {
</s> add } if (percent > 10) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> } = props;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> {!processingInterfaces && interfaces &&
<mask> <div className="row">
<mask> <div className="col-sm-12 col-md-6">
<mask> <div className="form__group form__group--settings">
<mask> <label>{t('dhcp_interface_select')}</label>
<mask> <Field
<mask> name="interface_name"
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove }) =>
<form onSubmit={handleSubmit}>
</s> add }) => <form onSubmit={handleSubmit}> </s> remove {interfaceValue &&
<div className="col-sm-12 col-md-6">
{interfaces[interfaceValue] &&
renderInterfaceValues(interfaces[interfaceValue])}
</s> add {interfaceValue
&& <div className="col-sm-12 col-md-6">
{interfaces[interfaceValue]
&& renderInterfaceValues(interfaces[interfaceValue])} </s> remove const isSavingDisabled =
invalid ||
submitting ||
processingConfig ||
processingValidate ||
!valid_key ||
!valid_cert ||
!valid_pair;
</s> add const isSavingDisabled = invalid
|| submitting
|| processingConfig
|| processingValidate
|| !valid_key
|| !valid_cert
|| !valid_pair; </s> remove {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}> </s> remove } else if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName
</s> add } if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName </s> remove {!dashboard.processingProfile && dashboard.name &&
<a href="control/logout" className="btn btn-sm btn-outline-secondary">
</s> add {!dashboard.processingProfile && dashboard.name
&& <a href="control/logout" className="btn btn-sm btn-outline-secondary">
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> {renderInterfaces(interfaces)}
<mask> </Field>
<mask> </div>
<mask> </div>
<mask> {interfaceValue &&
<mask> <div className="col-sm-12 col-md-6">
<mask> {interfaces[interfaceValue] &&
<mask> renderInterfaceValues(interfaces[interfaceValue])}
<mask> </div>
<mask> }
<mask> </div>
<mask> }
<mask> <hr/>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {!dashboard.processingProfile && dashboard.name &&
<a href="control/logout" className="btn btn-sm btn-outline-secondary">
</s> add {!dashboard.processingProfile && dashboard.name
&& <a href="control/logout" className="btn btn-sm btn-outline-secondary"> </s> remove {!processingInterfaces && interfaces &&
<div className="row">
</s> add {!processingInterfaces && interfaces
&& <div className="row"> </s> remove {buttonMessage &&
<button className="btn btn-success" onClick={reloadPage}>
</s> add {buttonMessage
&& <button className="btn btn-success" onClick={reloadPage}> </s> remove } else if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName
</s> add } if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>} </s> remove {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)}
</s> add {dnsAddresses.map((ip) => <li key={ip}>{ip}</li>)}
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep keep replace keep keep
|
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({ form: 'dhcpForm' }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Form.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import { SMALL_TABLE_DEFAULT_PAGE_SIZE } from '../../../helpers/constants';
<mask>
<mask> class Leases extends Component {
<mask> cellWrap = ({ value }) => (
<mask> <div className="logs__row logs__row--overflow">
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Leases.js
|
keep keep keep keep replace
|
<mask> leases: PropTypes.array,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Leases);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Info);
</s> add export default withTranslation()(Info); </s> remove export default withNamespaces()(Guide);
</s> add export default withTranslation()(Guide); </s> remove export default withNamespaces()(Checkbox);
</s> add export default withTranslation()(Checkbox); </s> remove export default withNamespaces()(enhanceWithClickOutside(Menu));
</s> add export default withTranslation()(enhanceWithClickOutside(Menu)); </s> remove export default withNamespaces()(Status);
</s> add export default withTranslation()(Status); </s> remove export default withNamespaces()(Footer);
</s> add export default withTranslation()(Footer);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/Leases.js
|
keep keep keep replace keep keep replace keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderInputField, ipv4, mac, required } from '../../../../helpers/form';
<mask>
<mask> const Form = (props) => {
<mask> const {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { renderInputField, required, domain, answer } from '../../../helpers/form';
</s> add import {
renderInputField, required, domain, answer,
} from '../../../helpers/form'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/Form.js
|
keep keep keep keep replace keep keep
|
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({ form: 'leaseForm' }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import ReactModal from 'react-modal';
<mask>
<mask> import Form from './Form';
<mask>
<mask> const Modal = (props) => {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/Modal.js
|
keep keep keep keep replace
|
<mask> toggleLeaseModal: PropTypes.func.isRequired,
<mask> processingAdding: PropTypes.bool.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Modal);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(StaticLeases);
</s> add export default withTranslation()(StaticLeases); </s> remove export default withNamespaces()(Table);
</s> add export default withTranslation()(Table); </s> remove export default withNamespaces()(Version);
</s> add export default withTranslation()(Version);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/Modal.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import { SMALL_TABLE_DEFAULT_PAGE_SIZE } from '../../../../helpers/constants';
<mask>
<mask> import Modal from './Modal';
<mask>
<mask> class StaticLeases extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/index.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> type="button"
<mask> className="btn btn-icon btn-outline-secondary btn-sm"
<mask> title={t('delete_table_action')}
<mask> disabled={processingDeleting}
<mask> onClick={() =>
<mask> this.handleDelete(ip, mac, hostname)
<mask> }
<mask> >
<mask> <svg className="icons">
<mask> <use xlinkHref="#delete"/>
<mask> </svg>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove onClick={() =>
this.props.handleDelete({
answer: value.row.answer,
domain: value.row.domain,
})
</s> add onClick={() => this.props.handleDelete({
answer: value.row.answer,
domain: value.row.domain,
}) </s> remove onClick={() =>
toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
})
</s> add onClick={() => toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
}) </s> remove onClick={() =>
toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
})
</s> add onClick={() => toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
}) </s> remove Cell: value => (
</s> add Cell: (value) => ( </s> remove const renderFieldsWrapper = (placeholder, buttonTitle) =>
function cell(row) {
const {
fields,
} = row;
return (
<div className="form__group">
{fields.map((ip, index) => (
<div key={index} className="mb-1">
<Field
name={ip}
component={renderGroupField}
type="text"
className="form-control"
placeholder={placeholder}
isActionAvailable={index !== 0}
removeField={() => fields.remove(index)}
normalizeOnBlur={data => data.trim()}
/>
</div>
))}
<button
type="button"
className="btn btn-link btn-block btn-sm"
onClick={() => fields.push()}
title={buttonTitle}
>
<svg className="icon icon--close">
<use xlinkHref="#plus" />
</svg>
</button>
</div>
);
};
</s> add const renderFieldsWrapper = (placeholder, buttonTitle) => function cell(row) {
const {
fields,
} = row;
return (
<div className="form__group">
{fields.map((ip, index) => (
<div key={index} className="mb-1">
<Field
name={ip}
component={renderGroupField}
type="text"
className="form-control"
placeholder={placeholder}
isActionAvailable={index !== 0}
removeField={() => fields.remove(index)}
normalizeOnBlur={(data) => data.trim()}
/>
</div>
))}
<button
type="button"
className="btn btn-link btn-block btn-sm"
onClick={() => fields.push()}
title={buttonTitle}
>
<svg className="icon icon--close">
<use xlinkHref="#plus" />
</svg>
</button>
</div>
);
}; </s> remove onClick={() =>
testUpstream({
upstream_dns,
bootstrap_dns,
})
</s> add onClick={() => testUpstream({
upstream_dns,
bootstrap_dns,
})
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/index.js
|
keep keep keep keep replace
|
<mask> processingDeleting: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(StaticLeases);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Version);
</s> add export default withTranslation()(Version); </s> remove export default withNamespaces()(Table);
</s> add export default withTranslation()(Table); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(DnsBlocklist);
</s> add export default withTranslation()(DnsBlocklist); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/StaticLeases/index.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask> import Leases from './Leases';
<mask> import StaticLeases from './StaticLeases/index';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/index.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> getToggleDhcpButton = () => {
<mask> const {
<mask> config, check, processingDhcp, processingConfig,
<mask> } = this.props.dhcp;
<mask> const otherDhcpFound =
<mask> check && check.otherServer && check.otherServer.found === DHCP_STATUS_RESPONSE.YES;
<mask> const filledConfig = Object.keys(config).every((key) => {
<mask> if (key === 'enabled' || key === 'icmp_timeout_msec') {
<mask> return true;
<mask> }
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const filter = filters.find(filter => filter.id === id)
|| whitelistFilters.find(filter => filter.id === id);
</s> add const filter = filters.find((filter) => filter.id === id)
|| whitelistFilters.find((filter) => filter.id === id); </s> remove } else if (interval === 72 || interval === 168) {
</s> add } if (interval === 72 || interval === 168) { </s> remove } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove updatedDisallowedClients = updatedDisallowedClients.filter(client => client !== ip);
</s> add updatedDisallowedClients = updatedDisallowedClients.filter((client) => client !== ip); </s> remove const rmTimeout = t => t && clearTimeout(t);
</s> add const rmTimeout = (t) => t && clearTimeout(t); </s> remove const filter = filters.find(filter => filter.id === filterId)
|| whitelistFilters.find(filter => filter.id === filterId);
</s> add const filter = filters.find((filter) => filter.id === filterId)
|| whitelistFilters.find((filter) => filter.id === filterId);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/index.js
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> </div>
<mask> <hr className="mt-4 mb-4" />
<mask> </Fragment>
<mask> );
<mask> } else if (
<mask> check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
<mask> check.staticIP.ip &&
<mask> interfaceName
<mask> ) {
<mask> return (
<mask> <Fragment>
<mask> <div className="text-secondary mb-2">
<mask> <Trans
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>} </s> remove } else if (isAboutExpire) {
</s> add } if (isAboutExpire) { </s> remove } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove const isDataReady =
!settings.processing &&
!services.processing &&
!stats.processingGetConfig &&
!queryLogs.processingGetConfig;
</s> add const isDataReady = !settings.processing
&& !services.processing
&& !stats.processingGetConfig
&& !queryLogs.processingGetConfig; </s> remove {whitelist ? (
<Trans>enter_valid_allowlist</Trans>
) : (
<Trans>enter_valid_blocklist</Trans>
)}
</s> add {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>} </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/index.js
|
keep keep keep keep replace
|
<mask> t: PropTypes.func.isRequired,
<mask> resetDhcp: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Dhcp);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules); </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dhcp/index.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import { renderTextareaField } from '../../../../helpers/form';
<mask>
<mask> const fields = [
<mask> {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Access/Form.js
|
keep keep keep keep replace
|
<mask> t: PropTypes.func.isRequired,
<mask> textarea: PropTypes.bool,
<mask> };
<mask>
<mask> export default flow([withNamespaces(), reduxForm({ form: 'accessForm' })])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Access/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Form from './Form';
<mask> import Card from '../../../ui/Card';
<mask>
<mask> class Access extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Access/index.js
|
keep keep keep keep replace
|
<mask> setAccessList: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Access);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules); </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Access/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { connect } from 'react-redux';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import {
<mask> renderInputField,
<mask> renderRadioField,
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Field, FieldArray, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
</s> add import {
Field, FieldArray, reduxForm, formValueSelector,
} from 'redux-form';
import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> validateIp: ipv6,
<mask> }];
<mask>
<mask> const getFields = (processing, t) => Object.values(BLOCKING_MODES)
<mask> .map(mode => (
<mask> <Field
<mask> key={mode}
<mask> name="blocking_mode"
<mask> type="radio"
<mask> component={renderRadioField}
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove return (
</s> add return ( </s> remove return (
</s> add return ( </s> remove const getIntervalFields = (processing, t, toNumber) =>
STATS_INTERVALS_DAYS.map((interval) => {
const title =
interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval }); </s> remove .map(mode => (
</s> add .map((mode) => ( </s> remove const getIntervalFields = (processing, t, toNumber) =>
QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title =
interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval }); </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/Form.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<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"
<mask> className="form__label form__label--with-desc">
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {!processingInterfaces && interfaces &&
<div className="row">
</s> add {!processingInterfaces && interfaces
&& <div className="row"> </s> remove );
});
</s> add );
}); </s> remove );
});
</s> add );
}); </s> remove {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}> </s> remove const isSavingDisabled =
invalid ||
submitting ||
processingConfig ||
processingValidate ||
!valid_key ||
!valid_cert ||
!valid_pair;
</s> add const isSavingDisabled = invalid
|| submitting
|| processingConfig
|| processingValidate
|| !valid_key
|| !valid_cert
|| !valid_pair; </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/Form.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> validate={[required, biggerOrEqualZero]}
<mask> />
<mask> </div>
<mask> </div>
<mask> {checkboxes.map(({ name, placeholder, subtitle }) =>
<mask> <div className="col-12" key={name}>
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name={name}
<mask> type="checkbox"
<mask> component={renderSelectField}
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {settingsCheckboxes.map(setting => (
</s> add {settingsCheckboxes.map((setting) => ( </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => ( </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => ( </s> remove normalizeOnBlur={data => data.trim()}
</s> add normalizeOnBlur={(data) => data.trim()} </s> remove {!processingInterfaces && interfaces &&
<div className="row">
</s> add {!processingInterfaces && interfaces
&& <div className="row"> </s> remove normalizeOnBlur={data => data.trim()}
</s> add normalizeOnBlur={(data) => data.trim()}
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> {Object.values(BLOCKING_MODES)
<mask> .map(mode => (
<mask> <li key={mode}>
<mask> <Trans>{`blocking_mode_${mode}`}</Trans>
<mask> </li>
<mask> ))}
<mask> </div>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)}
</s> add {dnsAddresses.map((ip) => <li key={ip}>{ip}</li>)} </s> remove {value.map(address => (
</s> add {value.map((address) => ( </s> remove {value.map(tag => (
</s> add {value.map((tag) => ( </s> remove <br/>
</s> add <br /> </s> remove <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag" key="0">link</a>,
</s> add <a href="https://github.com/AdguardTeam/AdGuardHome/wiki/Hosts-Blocklists#ctag"
key="0">link</a>, </s> remove {MENU_ITEMS.map(item => (
</s> add {MENU_ITEMS.map((item) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/Form.js
|
keep keep keep keep replace keep keep keep keep
|
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'blockingModeForm',
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Card from '../../../ui/Card';
<mask> import Form from './Form';
<mask>
<mask> const Config = ({ t, dnsConfig, setDnsConfig }) => {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/index.js
|
keep keep keep keep replace
|
<mask> setDnsConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Config);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Upstream);
</s> add export default withTranslation()(Upstream); </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Config/index.js
|
keep keep replace keep replace keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> const Examples = props => (
<mask> <div className="list leading-loose">
<mask> <p>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/Examples.js
|
keep keep keep keep replace
|
<mask> Examples.propTypes = {
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Examples);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Logs);
</s> add export default withTranslation()(Logs); </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig); </s> remove export default withNamespaces()(LogsConfig);
</s> add export default withTranslation()(LogsConfig); </s> remove export default withNamespaces()(DnsBlocklist);
</s> add export default withTranslation()(DnsBlocklist);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/Examples.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import { connect } from 'react-redux';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import classnames from 'classnames';
<mask>
<mask> import Examples from './Examples';
<mask> import { renderSelectField } from '../../../../helpers/form';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Field, FieldArray, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
</s> add import {
Field, FieldArray, reduxForm, formValueSelector,
} from 'redux-form';
import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/Form.js
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> <div className="btn-list">
<mask> <button
<mask> type="button"
<mask> className={testButtonClass}
<mask> onClick={() =>
<mask> testUpstream({
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> })
<mask> }
<mask> disabled={!upstream_dns || processingTestUpstream}
<mask> >
<mask> <Trans>test_upstream_btn</Trans>
<mask> </button>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove onClick={() =>
toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
})
</s> add onClick={() => toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
}) </s> remove onClick={() =>
this.props.handleDelete({
answer: value.row.answer,
domain: value.row.domain,
})
</s> add onClick={() => this.props.handleDelete({
answer: value.row.answer,
domain: value.row.domain,
}) </s> remove onClick={() =>
toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
})
</s> add onClick={() => toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
}) </s> remove submitting ||
invalid ||
pristine ||
processingAdding ||
processingUpdating
</s> add submitting
|| invalid
|| pristine
|| processingAdding
|| processingUpdating </s> remove onClick={this.handleSubmit}
</s> add onClick={handleSubmit} </s> remove onClick={() =>
this.handleDelete(ip, mac, hostname)
</s> add onClick={() => this.handleDelete(ip, mac, hostname)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/Form.js
|
keep keep keep keep replace keep keep keep keep
|
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'upstreamForm',
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Form from './Form';
<mask> import Card from '../../../ui/Card';
<mask>
<mask> class Upstream extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/index.js
|
keep keep keep keep replace
|
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Upstream);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config); </s> remove export default withNamespaces()(Rewrites);
</s> add export default withTranslation()(Rewrites); </s> remove export default withNamespaces()(Services);
</s> add export default withTranslation()(Services); </s> remove export default withNamespaces()(Encryption);
</s> add export default withTranslation()(Encryption); </s> remove export default withNamespaces()(SetupGuide);
</s> add export default withTranslation()(SetupGuide); </s> remove export default withNamespaces()(AutoClients);
</s> add export default withTranslation()(AutoClients);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/Upstream/index.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Upstream from './Upstream';
<mask> import Access from './Access';
<mask> import Config from './Config';
<mask> import PageTitle from '../../ui/PageTitle';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/index.js
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {isDataLoading ?
<mask> <Loading /> :
<mask> <Fragment>
<mask> <Upstream
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> testUpstream={testUpstream}
<mask> dnsConfig={dnsConfig}
<mask> setDnsConfig={setDnsConfig}
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const isDataReady =
!settings.processing &&
!services.processing &&
!stats.processingGetConfig &&
!queryLogs.processingGetConfig;
</s> add const isDataReady = !settings.processing
&& !services.processing
&& !stats.processingGetConfig
&& !queryLogs.processingGetConfig; </s> remove {whitelist ? (
<Trans>enter_valid_allowlist</Trans>
) : (
<Trans>enter_valid_blocklist</Trans>
)}
</s> add {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>} </s> remove }) => (
<Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
</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"> </s> remove }) => (
<Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice">
</s> add }) => <Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice"> </s> remove } else if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName
</s> add } if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName </s> remove {MENU_ITEMS.map(item => (
</s> add {MENU_ITEMS.map((item) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/index.js
|
keep keep keep keep replace
|
<mask> getDnsConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Dns);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules); </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Dns/index.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces, Trans } from 'react-i18next';
<mask> import format from 'date-fns/format';
<mask>
<mask> import { EMPTY_DATE } from '../../../helpers/constants';
<mask>
<mask> const CertificateStatus = ({
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/CertificateStatus.js
|
keep keep keep keep replace
|
<mask> notAfter: PropTypes.string,
<mask> dnsNames: PropTypes.string,
<mask> };
<mask>
<mask> export default withNamespaces()(CertificateStatus);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(PopoverFilter);
</s> add export default withTranslation()(PopoverFilter); </s> remove export default withNamespaces()(Status);
</s> add export default withTranslation()(Status); </s> remove export default withNamespaces()(enhanceWithClickOutside(Dropdown));
</s> add export default withTranslation()(enhanceWithClickOutside(Dropdown)); </s> remove meta: PropTypes.object.isRequired,
</s> add </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>
);
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>;
renderFilterField.propTypes = {
input: PropTypes.object.isRequired,
id: PropTypes.string.isRequired,
className: PropTypes.string,
placeholder: PropTypes.string,
type: PropTypes.string,
disabled: PropTypes.string,
autoComplete: PropTypes.string,
tooltip: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> remove export default withNamespaces()(EncryptionTopline);
</s> add export default withTranslation()(EncryptionTopline);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/CertificateStatus.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import { connect } from 'react-redux';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import {
<mask> renderInputField,
<mask> renderSelectField,
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Field, FieldArray, reduxForm, formValueSelector } from 'redux-form';
import { Trans, withNamespaces } from 'react-i18next';
</s> add import {
Field, FieldArray, reduxForm, formValueSelector,
} from 'redux-form';
import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> enabled: false,
<mask> };
<mask> // eslint-disable-next-line no-alert
<mask> if (window.confirm(t('encryption_reset'))) {
<mask> Object.keys(fields).forEach(field => change(field, fields[field]));
<mask> setTlsConfig(fields);
<mask> }
<mask> };
<mask>
<mask> let Form = (props) => {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove Object.keys(fields).forEach(field => change(field, fields[field]));
</s> add Object.keys(fields).forEach((field) => change(field, fields[field])); </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
</s> remove export const toggleDhcp = values => async (dispatch) => {
</s> add export const toggleDhcp = (values) => async (dispatch) => { </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) { </s> remove }
</s> add }; </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/Form.js
|
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> certificateSource,
<mask> privateKeySource,
<mask> } = props;
<mask>
<mask> const isSavingDisabled =
<mask> invalid ||
<mask> submitting ||
<mask> processingConfig ||
<mask> processingValidate ||
<mask> !valid_key ||
<mask> !valid_cert ||
<mask> !valid_pair;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12">
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove submitting ||
invalid ||
pristine ||
processingAdding ||
processingUpdating
</s> add submitting
|| invalid
|| pristine
|| processingAdding
|| processingUpdating </s> remove {!processingInterfaces && interfaces &&
<div className="row">
</s> add {!processingInterfaces && interfaces
&& <div className="row"> </s> remove onClick={this.handleSubmit}
</s> add onClick={handleSubmit} </s> remove const tlsAddress = (dnsAddresses && dnsAddresses.filter(item => item.includes('tls://'))) || '';
const httpsAddress =
(dnsAddresses && dnsAddresses.filter(item => item.includes('https://'))) || '';
</s> add const tlsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('tls://'))) || '';
const httpsAddress = (dnsAddresses && dnsAddresses.filter((item) => item.includes('https://'))) || ''; </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) { </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> };
<mask> })(Form);
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'encryptionForm',
<mask> validate,
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces, Trans } from 'react-i18next';
<mask>
<mask> const KeyStatus = ({ validKey, keyType }) => (
<mask> <Fragment>
<mask> <div className="form__label form__label--bold">
<mask> <Trans>encryption_status</Trans>:
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import Card from '../ui/Card';
</s> add import Card from './Card';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/KeyStatus.js
|
keep keep keep keep replace
|
<mask> validKey: PropTypes.bool.isRequired,
<mask> keyType: PropTypes.string.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(KeyStatus);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Clients);
</s> add export default withTranslation()(Clients); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default withNamespaces()(StaticLeases);
</s> add export default withTranslation()(StaticLeases); </s> remove export default withNamespaces()(Version);
</s> add export default withTranslation()(Version); </s> remove export default withNamespaces()(Table);
</s> add export default withTranslation()(Table);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/KeyStatus.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask> import debounce from 'lodash/debounce';
<mask>
<mask> import { DEBOUNCE_TIMEOUT, ENCRYPTION_SOURCE } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask> import Card from '../../ui/Card';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/index.js
|
keep keep keep keep replace
|
<mask> encryption: PropTypes.object.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Encryption);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(SetupGuide);
</s> add export default withTranslation()(SetupGuide); </s> remove export default withNamespaces()(Rewrites);
</s> add export default withTranslation()(Rewrites); </s> remove export default withNamespaces()(Services);
</s> add export default withTranslation()(Services); </s> remove export default withNamespaces()(Upstream);
</s> add export default withTranslation()(Upstream); </s> remove export default withNamespaces()(App);
</s> add export default withTranslation()(App); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Encryption/index.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderSelectField, toNumber } from '../../../helpers/form';
<mask> import { FILTERS_INTERVALS_HOURS } from '../../../helpers/constants';
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/FiltersConfig/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> const getTitleForInterval = (interval, t) => {
<mask> if (interval === 0) {
<mask> return t('disabled');
<mask> } else if (interval === 72 || interval === 168) {
<mask> return t('interval_days', { count: interval / 24 });
<mask> }
<mask>
<mask> return t('interval_hours', { count: interval });
<mask> };
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const tooltipTitle =
interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval }); </s> remove return (
</s> add return ( </s> remove return (
</s> add return ( </s> remove const getIntervalFields = (processing, t, toNumber) =>
STATS_INTERVALS_DAYS.map((interval) => {
const title =
interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval }); </s> remove const getIntervalFields = (processing, t, toNumber) =>
QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title =
interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval }); </s> remove const filter = filters.find(filter => filter.id === id)
|| whitelistFilters.find(filter => filter.id === id);
</s> add const filter = filters.find((filter) => filter.id === id)
|| whitelistFilters.find((filter) => filter.id === id);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/FiltersConfig/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> onChange={handleChange}
<mask> normalize={toNumber}
<mask> disabled={processing}
<mask> >
<mask> {FILTERS_INTERVALS_HOURS.map(interval => (
<mask> <option value={interval} key={interval}>
<mask> {getTitleForInterval(interval, t)}
<mask> </option>
<mask> ))}
<mask> </Field>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove <Trans>show_all_filter_type</Trans>
</s> add {t('show_all_filter_type')} </s> remove {Object.keys(LANGUAGES).map(lang => (
</s> add {Object.keys(LANGUAGES).map((lang) => ( </s> remove <Trans>show_filtered_type</Trans>
</s> add {t('show_filtered_type')} </s> remove );
});
</s> add );
}); </s> remove );
});
</s> add );
}); </s> remove {value.map(address => (
</s> add {value.map((address) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/FiltersConfig/Form.js
|
keep keep keep keep replace keep keep keep keep
|
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'filterConfigForm',
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/FiltersConfig/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask> import debounce from 'lodash/debounce';
<mask>
<mask> import { DEBOUNCE_TIMEOUT } from '../../../helpers/constants';
<mask> import Form from './Form';
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/FiltersConfig/index.js
|
keep keep keep keep replace
|
<mask> setFiltersConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(FiltersConfig);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules); </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/FiltersConfig/index.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderSelectField, renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/LogsConfig/Form.js
|
keep keep keep replace replace replace replace keep replace keep keep keep keep
|
<mask> import { renderSelectField, renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { QUERY_LOG_INTERVALS_DAYS } from '../../../helpers/constants';
<mask>
<mask> const getIntervalFields = (processing, t, toNumber) =>
<mask> QUERY_LOG_INTERVALS_DAYS.map((interval) => {
<mask> const title =
<mask> interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
<mask> <Field
<mask> key={interval}
<mask> name="interval"
<mask> type="radio"
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const getIntervalFields = (processing, t, toNumber) =>
STATS_INTERVALS_DAYS.map((interval) => {
const title =
interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalFields = (processing, t, toNumber) => STATS_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval }); </s> remove return (
</s> add return ( </s> remove const tooltipTitle =
interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval }); </s> remove } else if (interval === 72 || interval === 168) {
</s> add } if (interval === 72 || interval === 168) { </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/LogsConfig/Form.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> placeholder={title}
<mask> normalize={toNumber}
<mask> disabled={processing}
<mask> />
<mask> );
<mask> });
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, submitting, invalid, processing, processingClear, handleClear, t,
<mask> } = props;
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove );
});
</s> add );
}); </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
</s> remove }) =>
<form onSubmit={handleSubmit}>
</s> add }) => <form onSubmit={handleSubmit}> </s> remove import { renderInputField, required, domain, answer } from '../../../helpers/form';
</s> add import {
renderInputField, required, domain, answer,
} from '../../../helpers/form'; </s> remove import { renderInputField, ipv4, mac, required } from '../../../../helpers/form';
</s> add import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form'; </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>
);
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>;
renderFilterField.propTypes = {
input: PropTypes.object.isRequired,
id: PropTypes.string.isRequired,
className: PropTypes.string,
placeholder: PropTypes.string,
type: PropTypes.string,
disabled: PropTypes.string,
autoComplete: PropTypes.string,
tooltip: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/LogsConfig/Form.js
|
keep keep keep keep replace keep keep keep keep
|
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'logConfigForm',
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/LogsConfig/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Card from '../../ui/Card';
<mask> import Form from './Form';
<mask>
<mask> class LogsConfig extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/LogsConfig/index.js
|
keep keep keep keep replace
|
<mask> clearLogs: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(LogsConfig);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(Logs);
</s> add export default withTranslation()(Logs); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/LogsConfig/index.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { toggleAllServices } from '../../../helpers/helpers';
<mask> import { renderServiceField } from '../../../helpers/form';
<mask> import { SERVICES } from '../../../helpers/constants';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Services/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> </button>
<mask> </div>
<mask> </div>
<mask> <div className="services">
<mask> {SERVICES.map(service => (
<mask> <Field
<mask> key={service.id}
<mask> icon={`service_${service.id}`}
<mask> name={`blocked_services.${service.id}`}
<mask> type="checkbox"
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Services/Form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'servicesForm',
<mask> enableReinitialize: true,
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Services/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Form from './Form';
<mask> import Card from '../../ui/Card';
<mask>
<mask> class Services extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Services/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> if (values && values.blocked_services) {
<mask> const blocked_services = Object
<mask> .keys(values.blocked_services)
<mask> .filter(service => values.blocked_services[service]);
<mask> config = blocked_services;
<mask> }
<mask>
<mask> this.props.setBlockedServices(config);
<mask> };
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove .filter(service => values.blocked_services[service]);
</s> add .filter((service) => values.blocked_services[service]); </s> remove } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove const rmTimeout = t => t && clearTimeout(t);
</s> add const rmTimeout = (t) => t && clearTimeout(t); </s> remove updatedDisallowedClients = updatedDisallowedClients.filter(client => client !== ip);
</s> add updatedDisallowedClients = updatedDisallowedClients.filter((client) => client !== ip); </s> remove } else if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName
</s> add } if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Services/index.js
|
keep keep keep keep replace
|
<mask> services: PropTypes.object.isRequired,
<mask> setBlockedServices: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Services);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Rewrites);
</s> add export default withTranslation()(Rewrites); </s> remove export default withNamespaces()(Upstream);
</s> add export default withTranslation()(Upstream); </s> remove export default withNamespaces()(Encryption);
</s> add export default withTranslation()(Encryption); </s> remove export default withNamespaces()(SetupGuide);
</s> add export default withTranslation()(SetupGuide); </s> remove export default withNamespaces()(AutoClients);
</s> add export default withTranslation()(AutoClients); </s> remove export default withNamespaces()(Popover);
</s> add export default withTranslation()(Popover);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/Services/index.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> import { renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/StatsConfig/Form.js
|
keep keep keep keep replace replace replace replace keep replace keep keep
|
<mask>
<mask> import { renderRadioField, toNumber } from '../../../helpers/form';
<mask> import { STATS_INTERVALS_DAYS } from '../../../helpers/constants';
<mask>
<mask> const getIntervalFields = (processing, t, toNumber) =>
<mask> STATS_INTERVALS_DAYS.map((interval) => {
<mask> const title =
<mask> interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
<mask>
<mask> return (
<mask> <Field
<mask> key={interval}
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove const getIntervalFields = (processing, t, toNumber) =>
QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title =
interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval });
</s> add const getIntervalFields = (processing, t, toNumber) => QUERY_LOG_INTERVALS_DAYS.map((interval) => {
const title = interval === 1 ? t('interval_24_hour') : t('interval_days', { count: interval }); </s> remove return (
</s> add return ( </s> remove const tooltipTitle =
interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval });
</s> add const tooltipTitle = interval === 1
? t('number_of_dns_query_24_hours')
: t('number_of_dns_query_days', { count: interval }); </s> remove } else if (interval === 72 || interval === 168) {
</s> add } if (interval === 72 || interval === 168) { </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/StatsConfig/Form.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> placeholder={title}
<mask> normalize={toNumber}
<mask> disabled={processing}
<mask> />
<mask> );
<mask> });
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, processing, submitting, invalid, handleReset, processingReset, t,
<mask> } = props;
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove );
});
</s> add );
}); </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
</s> remove }) =>
<form onSubmit={handleSubmit}>
</s> add }) => <form onSubmit={handleSubmit}> </s> remove import { renderInputField, required, domain, answer } from '../../../helpers/form';
</s> add import {
renderInputField, required, domain, answer,
} from '../../../helpers/form'; </s> remove import { renderInputField, ipv4, mac, required } from '../../../../helpers/form';
</s> add import {
renderInputField, ipv4, mac, required,
} from '../../../../helpers/form'; </s> remove {!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>
);
</s> add {!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</div>
</Fragment>;
renderFilterField.propTypes = {
input: PropTypes.object.isRequired,
id: PropTypes.string.isRequired,
className: PropTypes.string,
placeholder: PropTypes.string,
type: PropTypes.string,
disabled: PropTypes.string,
autoComplete: PropTypes.string,
tooltip: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/StatsConfig/Form.js
|
keep keep keep keep replace keep keep keep keep
|
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default flow([
<mask> withNamespaces(),
<mask> reduxForm({
<mask> form: 'statsConfigForm',
<mask> }),
<mask> ])(Form);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(), </s> remove withNamespaces(),
</s> add withTranslation(),
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/StatsConfig/Form.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Card from '../../ui/Card';
<mask> import Form from './Form';
<mask>
<mask> class StatsConfig extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/StatsConfig/index.js
|
keep keep keep keep replace
|
<mask> resetStats: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(StatsConfig);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules); </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/StatsConfig/index.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import Services from './Services';
<mask> import StatsConfig from './StatsConfig';
<mask> import LogsConfig from './LogsConfig';
<mask> import FiltersConfig from './FiltersConfig';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/index.js
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask> setFiltersConfig,
<mask> t,
<mask> } = this.props;
<mask>
<mask> const isDataReady =
<mask> !settings.processing &&
<mask> !services.processing &&
<mask> !stats.processingGetConfig &&
<mask> !queryLogs.processingGetConfig;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('general_settings')} />
<mask> {!isDataReady && <Loading />}
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {isDataLoading ?
<Loading /> :
<Fragment>
</s> add {isDataLoading
? <Loading />
: <Fragment> </s> remove } else if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName
</s> add } if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName </s> remove {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
</s> add {!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>} </s> remove {!processingInterfaces && interfaces &&
<div className="row">
</s> add {!processingInterfaces && interfaces
&& <div className="row"> </s> remove }) => (
<Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice">
</s> add }) => <Fragment>
<div className="logs__input-wrap">
<input
{...input}
id={id}
placeholder={placeholder}
type={type}
className={className}
disabled={disabled}
autoComplete={autoComplete}
/>
<span className="logs__notice"> </s> remove {!dashboard.processingProfile && dashboard.name &&
<a href="control/logout" className="btn btn-sm btn-outline-secondary">
</s> add {!dashboard.processingProfile && dashboard.name
&& <a href="control/logout" className="btn btn-sm btn-outline-secondary">
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/index.js
|
keep keep keep keep replace
|
<mask> getFilteringStatus: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Settings);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(Logs);
</s> add export default withTranslation()(Logs); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(Access);
</s> add export default withTranslation()(Access); </s> remove export default withNamespaces()(CustomRules);
</s> add export default withTranslation()(CustomRules);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Settings/index.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import Guide from '../ui/Guide';
<mask> import Card from '../ui/Card';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import './Guide.css';
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/SetupGuide/index.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> <div className="mt-1">
<mask> <Trans>install_devices_address</Trans>:
<mask> </div>
<mask> <div className="mt-2 font-weight-bold">
<mask> {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)}
<mask> </div>
<mask> </div>
<mask> <Guide dnsAddresses={dnsAddresses} />
<mask> </Card>
<mask> </div>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove {whitelist ? (
<Trans>enter_valid_allowlist</Trans>
) : (
<Trans>enter_valid_blocklist</Trans>
)}
</s> add {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>} </s> remove {buttonMessage &&
<button className="btn btn-success" onClick={reloadPage}>
</s> add {buttonMessage
&& <button className="btn btn-success" onClick={reloadPage}> </s> remove <br/>
</s> add <br /> </s> remove {interfaceValue &&
<div className="col-sm-12 col-md-6">
{interfaces[interfaceValue] &&
renderInterfaceValues(interfaces[interfaceValue])}
</s> add {interfaceValue
&& <div className="col-sm-12 col-md-6">
{interfaces[interfaceValue]
&& renderInterfaceValues(interfaces[interfaceValue])} </s> remove {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) => <div className="col-12" key={name}> </s> remove .map(mode => (
</s> add .map((mode) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/SetupGuide/index.js
|
keep keep keep keep replace
|
<mask> dashboard: PropTypes.object.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(SetupGuide);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Encryption);
</s> add export default withTranslation()(Encryption); </s> remove export default withNamespaces()(Rewrites);
</s> add export default withTranslation()(Rewrites); </s> remove export default withNamespaces()(Services);
</s> add export default withTranslation()(Services); </s> remove export default withNamespaces()(Upstream);
</s> add export default withTranslation()(Upstream); </s> remove export default withNamespaces()(Config);
</s> add export default withTranslation()(Config); </s> remove export default withNamespaces()(StatsConfig);
</s> add export default withTranslation()(StatsConfig);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/SetupGuide/index.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> class Toast extends Component {
<mask> componentDidMount() {
<mask> const timeout = this.props.type === 'success' ? 5000 : 30000;
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Toasts/Toast.js
|
keep keep keep keep replace
|
<mask> type: PropTypes.string.isRequired,
<mask> removeToast: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Toast);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(BlockedDomains);
</s> add export default withTranslation()(BlockedDomains); </s> remove export default withNamespaces()(QueriedDomains);
</s> add export default withTranslation()(QueriedDomains); </s> remove meta: PropTypes.object.isRequired,
</s> add </s> remove export default withNamespaces()(KeyStatus);
</s> add export default withTranslation()(KeyStatus); </s> remove export default withNamespaces()(Clients);
</s> add export default withTranslation()(Clients); </s> remove export default withNamespaces()(enhanceWithClickOutside(Dropdown));
</s> add export default withTranslation()(enhanceWithClickOutside(Dropdown));
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Toasts/Toast.js
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> import Toast from './Toast';
<mask>
<mask> import './Toast.css';
<mask>
<mask> const Toasts = props => (
<mask> <TransitionGroup className="toasts">
<mask> {props.toasts.notices && props.toasts.notices.map((toast) => {
<mask> const { id } = toast;
<mask> return (
<mask> <CSSTransition
<mask> key={id}
<mask> timeout={500}
<mask> classNames="toast"
<mask> >
<mask> <Toast removeToast={props.removeToast} {...toast} />
<mask> </CSSTransition>
<mask> );
<mask> })}
<mask> </TransitionGroup>
<mask> );
<mask>
<mask> Toasts.propTypes = {
<mask> toasts: PropTypes.object,
<mask> removeToast: PropTypes.func,
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove } else if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO &&
check.staticIP.ip &&
interfaceName
</s> add } if (
check.staticIP.static === DHCP_STATUS_RESPONSE.NO
&& check.staticIP.ip
&& interfaceName </s> remove normalizeResponse = response => (
</s> add normalizeResponse = (response) => ( </s> remove const Tooltip = props => (
</s> add const Tooltip = (props) => ( </s> remove return (
</s> add return ( </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
</s> remove } else if (isAboutExpire) {
</s> add } if (isAboutExpire) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/Toasts/index.js
|
keep keep keep keep replace keep keep replace keep keep
|
<mask>
<mask> class Accordion extends Component {
<mask> state = {
<mask> isOpen: false,
<mask> }
<mask>
<mask> handleClick = () => {
<mask> this.setState(prevState => ({ isOpen: !prevState.isOpen }));
<mask> };
<mask>
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove this.setState(prevState => ({ isOpen: !prevState.isOpen }));
</s> add this.setState((prevState) => ({ isOpen: !prevState.isOpen })); </s> remove this.setState(prevState => ({ isMenuOpen: !prevState.isMenuOpen }));
</s> add this.setState((prevState) => ({ isMenuOpen: !prevState.isMenuOpen })); </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Accordion.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces } from 'react-i18next';
<mask>
<mask> import './Checkbox.css';
<mask>
<mask> class Checkbox extends Component {
<mask> render() {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Checkbox.js
|
keep keep keep keep replace
|
<mask> handleChange: PropTypes.func.isRequired,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Checkbox);
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove export default withNamespaces()(Leases);
</s> add export default withTranslation()(Leases); </s> remove export default withNamespaces()(enhanceWithClickOutside(Menu));
</s> add export default withTranslation()(enhanceWithClickOutside(Menu)); </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(DnsAllowlist);
</s> add export default withTranslation()(DnsAllowlist); </s> remove export default withNamespaces()(Dhcp);
</s> add export default withTranslation()(Dhcp); </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Checkbox.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import classnames from 'classnames';
<mask> import { withNamespaces } from 'react-i18next';
<mask> import enhanceWithClickOutside from 'react-click-outside';
<mask>
<mask> import './Dropdown.css';
<mask>
<mask> class Dropdown extends Component {
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { withNamespaces } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Dropdown.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> isOpen: false,
<mask> };
<mask>
<mask> toggleDropdown = () => {
<mask> this.setState(prevState => ({ isOpen: !prevState.isOpen }));
<mask> };
<mask>
<mask> hideDropdown = () => {
<mask> this.setState({ isOpen: false });
<mask> };
</s> + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597
Squashed commit of the following:
commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 14:54:10 2020 +0300
Fix translation in install options
commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <[email protected]>
Date: Wed May 20 13:11:34 2020 +0300
Remove commented code
commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 19:02:49 2020 +0300
Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version
commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 17:30:37 2020 +0300
Remove all unused dependencies
commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:35:24 2020 +0300
Remove unused dependencies
commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 16:14:09 2020 +0300
Update regular dependencies
commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 15:34:10 2020 +0300
Update all dev dependancies
commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 14:14:44 2020 +0300
Update all postcss packages
commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:45:02 2020 +0300
Prevent git from converting linebreaks in .js files
commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:43:01 2020 +0300
Prevent git from converting linebreaks in .js files
commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <[email protected]>
Date: Tue May 19 12:24:47 2020 +0300
Remove linebreak-style eslint rule
commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 20:55:47 2020 +0300
Add prop types
commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 18:52:07 2020 +0300
Update eslint and babel, fix eslint warnings
commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <[email protected]>
Date: Mon May 18 16:45:49 2020 +0300
Update css loading webpack rules
commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 16:13:49 2020 +0300
Suppress linebreak-style eslint error for Windows
commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:55:07 2020 +0300
Suppress eslint exit code
commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 14:05:18 2020 +0300
Edit css file warnings
commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 13:10:26 2020 +0300
Remove uglifyjs plugin
commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:29:17 2020 +0300
Fix DefinePlugin value
commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <[email protected]>
Date: Sat May 16 01:05:03 2020 +0300
Update webpack </s> remove this.setState(prevState => ({ isOpen: !prevState.isOpen }));
</s> add this.setState((prevState) => ({ isOpen: !prevState.isOpen })); </s> remove }
</s> add }; </s> remove this.setState(prevState => ({ isMenuOpen: !prevState.isMenuOpen }));
</s> add this.setState((prevState) => ({ isMenuOpen: !prevState.isMenuOpen })); </s> remove import { withNamespaces, Trans } from 'react-i18next';
</s> add import { withTranslation, Trans } from 'react-i18next'; </s> remove Object.keys(fields).forEach(field => change(field, fields[field]));
</s> add Object.keys(fields).forEach((field) => change(field, fields[field])); </s> remove dispatch(addErrorToast({ error: t('dns_test_not_ok_toast', { key }) }));
</s> add dispatch(addErrorToast({ error: i18next.t('dns_test_not_ok_toast', { key }) }));
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Dropdown.js
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.