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
|
<mask> baseClassName: PropTypes.string.isRequired,
<mask> icon: PropTypes.string,
<mask> };
<mask>
<mask> export default withNamespaces()(enhanceWithClickOutside(Dropdown));
</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 meta: PropTypes.object.isRequired,
</s> add </s> remove export default withNamespaces()(PopoverFilter);
</s> add export default withTranslation()(PopoverFilter); </s> remove export default withNamespaces()(CertificateStatus);
</s> add export default withTranslation()(CertificateStatus); </s> remove export default withNamespaces()(Status);
</s> add export default withTranslation()(Status); </s> remove export default withNamespaces()(Toast);
</s> add export default withTranslation()(Toast); </s> remove export default withNamespaces()(KeyStatus);
</s> add export default withTranslation()(KeyStatus);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Dropdown.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 isAfter from 'date-fns/is_after';
<mask> import addDays from 'date-fns/add_days';
<mask>
<mask> import Topline from './Topline';
<mask> import { EMPTY_DATE } 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/ui/EncryptionTopline.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> topline_expired_certificate
<mask> </Trans>
<mask> </Topline>
<mask> );
<mask> } else if (isAboutExpire) {
<mask> return (
<mask> <Topline type="warning">
<mask> <Trans components={[<a href="#encryption" key="0">link</a>]}>
<mask> topline_expiring_certificate
<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 } 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)) { </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) { </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 } 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/ui/EncryptionTopline.js
|
keep keep keep keep replace
|
<mask> EncryptionTopline.propTypes = {
<mask> notAfter: PropTypes.string.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(EncryptionTopline);
</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()(CertificateStatus);
</s> add export default withTranslation()(CertificateStatus); </s> remove export default withNamespaces()(BlockedDomains);
</s> add export default withTranslation()(BlockedDomains); </s> remove export default withNamespaces()(KeyStatus);
</s> add export default withTranslation()(KeyStatus); </s> remove export default withNamespaces()(QueriedDomains);
</s> add export default withTranslation()(QueriedDomains); </s> remove export default withNamespaces()(Toast);
</s> add export default withTranslation()(Toast); </s> remove export default withNamespaces()(enhanceWithClickOutside(Dropdown));
</s> add export default withTranslation()(enhanceWithClickOutside(Dropdown));
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/EncryptionTopline.js
|
keep keep replace keep keep keep keep keep
|
<mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import { REPOSITORY, PRIVACY_POLICY_LINK } from '../../helpers/constants';
<mask> import { LANGUAGES } from '../../helpers/twosky';
<mask> import i18n from '../../i18n';
<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/ui/Footer.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> className="form-control select select--language"
<mask> value={i18n.language}
<mask> onChange={this.changeLanguage}
<mask> >
<mask> {Object.keys(LANGUAGES).map(lang => (
<mask> <option key={lang} value={lang}>
<mask> {LANGUAGES[lang]}
<mask> </option>
<mask> ))}
<mask> </select>
</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 {FILTERS_INTERVALS_HOURS.map(interval => (
</s> add {FILTERS_INTERVALS_HOURS.map((interval) => ( </s> remove <Trans>show_filtered_type</Trans>
</s> add {t('show_filtered_type')} </s> remove {value.map(address => (
</s> add {value.map((address) => ( </s> remove .map(mode => (
</s> add .map((mode) => ( </s> remove {value.map(tag => (
</s> add {value.map((tag) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Footer.js
|
keep keep keep keep replace
|
<mask> processingVersion: PropTypes.bool,
<mask> getVersion: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Footer);
</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()(App);
</s> add export default withTranslation()(App); </s> remove export default withNamespaces()(UpdateTopline);
</s> add export default withTranslation()(UpdateTopline); </s> remove export default withNamespaces()(Version);
</s> add export default withTranslation()(Version); </s> remove export default withNamespaces()(Header);
</s> add export default withTranslation()(Header); </s> add meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired, </s> remove export default withNamespaces()(Checkbox);
</s> add export default withTranslation()(Checkbox);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Footer.js
|
keep replace keep replace replace keep
|
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import Tabs from '../ui/Tabs';
<mask> import Icons from '../ui/Icons';
<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 { 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/ui/Guide.js
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> import Icons from '../ui/Icons';
<mask>
<mask> const Guide = (props) => {
<mask> const { dnsAddresses } = props;
<mask> const tlsAddress = (dnsAddresses && dnsAddresses.filter(item => item.includes('tls://'))) || '';
<mask> const httpsAddress =
<mask> (dnsAddresses && dnsAddresses.filter(item => item.includes('https://'))) || '';
<mask> const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
<mask>
<mask> return (
<mask> <div>
<mask> <Icons />
</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 Tabs from '../ui/Tabs';
import Icons from '../ui/Icons';
</s> add import Tabs from './Tabs';
import Icons from './Icons'; </s> remove const needToGetAdditionalLogs = (logs.length < TABLE_DEFAULT_PAGE_SIZE ||
totalData.logs.length < TABLE_DEFAULT_PAGE_SIZE) &&
oldest !== '';
</s> add const needToGetAdditionalLogs = (logs.length < TABLE_DEFAULT_PAGE_SIZE
|| totalData.logs.length < TABLE_DEFAULT_PAGE_SIZE)
&& oldest !== ''; </s> remove } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove const otherDhcpFound =
check && check.otherServer && check.otherServer.found === DHCP_STATUS_RESPONSE.YES;
</s> add const otherDhcpFound = check && check.otherServer
&& check.otherServer.found === DHCP_STATUS_RESPONSE.YES; </s> remove export const isValidAbsolutePath = value => R_WIN_ABSOLUTE_PATH.test(value)
</s> add export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Guide.js
|
keep keep keep keep replace
|
<mask> dnsAddresses: PropTypes.array,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Guide);
</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()(Leases);
</s> add export default withTranslation()(Leases); </s> remove export default withNamespaces()(DnsBlocklist);
</s> add export default withTranslation()(DnsBlocklist); </s> remove export default withNamespaces()(Settings);
</s> add export default withTranslation()(Settings); </s> remove export default withNamespaces()(LogsConfig);
</s> add export default withTranslation()(LogsConfig); </s> remove export default withNamespaces()(FiltersConfig);
</s> add export default withTranslation()(FiltersConfig);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Guide.js
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace
|
<mask> import { ResponsiveLine } from '@nivo/line';
<mask>
<mask> import './Line.css';
<mask>
<mask> const Line = ({ data, color }) => (
<mask> data &&
<mask> <ResponsiveLine
<mask> data={data}
<mask> margin={{
<mask> top: 15,
<mask> right: 0,
<mask> bottom: 1,
<mask> left: 20,
<mask> }}
<mask> minY="auto"
<mask> stacked={false}
<mask> curve='linear'
<mask> axisBottom={null}
<mask> axisLeft={null}
<mask> enableGridX={false}
<mask> enableGridY={false}
<mask> enableDots={false}
<mask> enableArea={true}
<mask> animate={false}
<mask> colorBy={() => (color)}
<mask> tooltip={slice => (
<mask> <div>
<mask> {slice.data.map(d => (
<mask> <div key={d.serie.id} className="line__tooltip">
<mask> <span className="line__tooltip-text">
<mask> <strong>{d.data.y}</strong>
<mask> <br/>
</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, 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/ui/Line.js
|
keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep replace replace replace keep keep keep keep
|
<mask> <br/>
<mask> <small>{d.data.x}</small>
<mask> </span>
<mask> </div>
<mask> ))}
<mask> </div>
<mask> )}
<mask> theme={{
<mask> tooltip: {
<mask> container: {
<mask> padding: '0',
<mask> background: '#333',
<mask> borderRadius: '4px',
<mask> },
<mask> },
<mask> }}
<mask> />
<mask> );
<mask>
<mask> Line.propTypes = {
<mask> data: PropTypes.array.isRequired,
<mask> color: PropTypes.string.isRequired,
</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 <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,
}; </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 {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 accessor: row => this.props.normalizedTopClients.configured[row.name] || 0,
</s> add accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0,
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Line.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import './PageTitle.css';
<mask>
<mask> const PageTitle = props => (
<mask> <div className="page-header">
<mask> <h1 className="page-title">
<mask> {props.title}
<mask> {props.children}
<mask> </h1>
</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 Topline = props => (
</s> add const Topline = (props) => ( </s> remove const Examples = props => (
</s> add const Examples = (props) => ( </s> remove const Tooltip = props => (
</s> add const Tooltip = (props) => ( </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/ui/PageTitle.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> import { getSourceData } from '../../helpers/trackers/trackers';
<mask> import { captitalizeWords } from '../../helpers/helpers';
<mask>
<mask> import './Popover.css';
<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 { withNamespaces } 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 { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Popover.js
|
keep keep keep keep replace
|
<mask> Popover.propTypes = {
<mask> data: PropTypes.object.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Popover);
</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()(AutoClients);
</s> add export default withTranslation()(AutoClients); </s> remove export default withNamespaces()(Rewrites);
</s> add export default withTranslation()(Rewrites); </s> remove export default withNamespaces()(SetupGuide);
</s> add export default withTranslation()(SetupGuide); </s> remove export default withNamespaces()(Services);
</s> add export default withTranslation()(Services); </s> remove export default withNamespaces()(Encryption);
</s> add export default withTranslation()(Encryption);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Popover.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> import './Popover.css';
<mask>
<mask> class PopoverFilter 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 { 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/ui/PopoverFilter.js
|
keep keep keep keep replace
|
<mask> filter: PropTypes.string,
<mask> service: PropTypes.string,
<mask> };
<mask>
<mask> export default withNamespaces()(PopoverFilter);
</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()(CertificateStatus);
</s> add export default withTranslation()(CertificateStatus); </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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/PopoverFilter.js
|
keep replace keep replace
|
<mask> import PropTypes from 'prop-types';
<mask> import { withNamespaces, Trans } from 'react-i18next';
<mask>
<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, 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, Trans } from 'react-i18next';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Status.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> <Card bodyType="card-body card-body--status">
<mask> <div className="h4 font-weight-light mb-4">
<mask> <Trans>{message}</Trans>
<mask> </div>
<mask> {buttonMessage &&
<mask> <button className="btn btn-success" onClick={reloadPage}>
<mask> <Trans>{buttonMessage}</Trans>
<mask> </button>}
<mask> </Card>
<mask> </div>
<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 Card from '../ui/Card';
</s> add import Card from './Card'; </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 {dnsAddresses.map(ip => <li key={ip}>{ip}</li>)}
</s> add {dnsAddresses.map((ip) => <li key={ip}>{ip}</li>)} </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 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/ui/Status.js
|
keep keep keep keep replace
|
<mask> buttonMessage: PropTypes.string,
<mask> reloadPage: PropTypes.func,
<mask> };
<mask>
<mask> export default withNamespaces()(Status);
</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()(CertificateStatus);
</s> add export default withTranslation()(CertificateStatus); </s> remove export default withNamespaces()(PopoverFilter);
</s> add export default withTranslation()(PopoverFilter); </s> remove export default withNamespaces()(enhanceWithClickOutside(Dropdown));
</s> add export default withTranslation()(enhanceWithClickOutside(Dropdown)); </s> remove export default withNamespaces()(enhanceWithClickOutside(Menu));
</s> add export default withTranslation()(enhanceWithClickOutside(Menu)); </s> remove export default withNamespaces()(Leases);
</s> add export default withTranslation()(Leases); </s> remove export default withNamespaces()(App);
</s> add export default withTranslation()(App);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Status.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> a {
<mask> color: #467fcf;
<mask> text-decoration: none;
<mask> background-color: transparent;
<mask> -webkit-text-decoration-skip: objects;
<mask> }
<mask>
<mask> a:hover {
<mask> color: #295a9f;
<mask> text-decoration: underline;
</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 -webkit-text-decoration-skip: ink;
text-decoration-skip: ink;
</s> add -webkit-text-decoration-skip: auto;
text-decoration-skip-ink: auto </s> remove }}
/>
);
</s> add },
}}
/>; </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 dispatch(addSuccessToast(t('client_blocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_blocked', { ip }))); </s> remove dispatch(addSuccessToast(t('list_updated', { count: updated })));
</s> add dispatch(addSuccessToast(i18next.t('list_updated', { count: updated })));
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> line-height: 1.4;
<mask> }
<mask>
<mask> a {
<mask> -webkit-text-decoration-skip: ink;
<mask> text-decoration-skip: ink;
<mask> }
<mask>
<mask> h1 a,
<mask> h2 a,
<mask> h3 a,
</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 -webkit-text-decoration-skip: objects;
</s> add -webkittext-decoration-skip-ink: objects </s> remove accessor: row => this.props.normalizedTopClients.auto[row.ip] || 0,
</s> add accessor: (row) => this.props.normalizedTopClients.auto[row.ip] || 0, </s> remove accessor: row => this.props.normalizedTopClients.configured[row.name] || 0,
</s> add accessor: (row) => this.props.normalizedTopClients.configured[row.name] || 0, </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) { </s> remove dispatch(addSuccessToast(t('client_blocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_blocked', { ip }))); </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/Tabler.css
|
keep keep keep keep replace
|
<mask>
<mask> .fe-trash-2:before {
<mask> background-image: url('./svg/trash-2.svg');
<mask> }
<mask> /* stylelint-enable */ </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 window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f,
</s> add window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : (f) => f, </s> remove export const checkHost = host => async (dispatch) => {
</s> add export const checkHost = (host) => async (dispatch) => { </s> remove } else if (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) { </s> remove dispatch(addSuccessToast(t('client_blocked', { ip })));
</s> add dispatch(addSuccessToast(i18next.t('client_blocked', { ip }))); </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) { </s> remove import { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
</s> add import {
addClient, updateClient, deleteClient, toggleClientModal,
} from '../actions/clients';
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Tabler.css
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import './Tooltip.css';
<mask>
<mask> const Tooltip = props => (
<mask> <div data-tooltip={props.text} className={`tooltip-custom ${props.type || ''}`}></div>
<mask> );
<mask>
<mask> Tooltip.propTypes = {
<mask> text: PropTypes.string.isRequired,
</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 const Examples = props => (
</s> add const Examples = (props) => ( </s> remove const Topline = props => (
</s> add const Topline = (props) => ( </s> remove const PageTitle = props => (
</s> add const PageTitle = (props) => ( </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/ui/Tooltip.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import './Topline.css';
<mask>
<mask> const Topline = props => (
<mask> <div className={`alert alert-${props.type} topline`}>
<mask> <div className="container">
<mask> {props.children}
<mask> </div>
<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 const PageTitle = props => (
</s> add const PageTitle = (props) => ( </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 Examples = props => (
</s> add const Examples = (props) => ( </s> remove const Tooltip = props => (
</s> add const Tooltip = (props) => ( </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => ( </s> remove {SERVICES.map(service => (
</s> add {SERVICES.map((service) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Topline.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 classnames from 'classnames';
<mask>
<mask> import './Overlay.css';
<mask>
<mask> const UpdateOverlay = (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 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/ui/UpdateOverlay.js
|
keep keep keep keep replace
|
<mask> UpdateOverlay.propTypes = {
<mask> processingUpdate: PropTypes.bool,
<mask> };
<mask>
<mask> export default withNamespaces()(UpdateOverlay);
</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()(UpdateTopline);
</s> add export default withTranslation()(UpdateTopline); </s> remove export default withNamespaces()(Actions);
</s> add export default withTranslation()(Actions); </s> remove export default withNamespaces()(Table);
</s> add export default withTranslation()(Table); </s> remove export default withNamespaces()(Footer);
</s> add export default withTranslation()(Footer); </s> remove export default withNamespaces()(Modal);
</s> add export default withTranslation()(Modal); </s> remove export default flow([withNamespaces(), reduxForm({ form: 'accessForm' })])(Form);
</s> add export default flow([withTranslation(), reduxForm({ form: 'accessForm' })])(Form);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/UpdateOverlay.js
|
keep replace keep keep keep replace keep
|
<mask> import PropTypes from 'prop-types';
<mask> import { Trans, withNamespaces } from 'react-i18next';
<mask>
<mask> import Topline from './Topline';
<mask>
<mask> const UpdateTopline = props => (
<mask> <Topline type="info">
</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 const Examples = props => (
</s> add const Examples = (props) => ( </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove const Topline = props => (
</s> add const Topline = (props) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/UpdateTopline.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> ]}
<mask> >
<mask> update_announcement
<mask> </Trans>
<mask> {props.canAutoUpdate &&
<mask> <button
<mask> type="button"
<mask> className="btn btn-sm btn-primary ml-3"
<mask> onClick={props.getUpdate}
<mask> disabled={props.processingUpdate}
<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 {isActionAvailable &&
<span className="input-group-append">
</s> add {isActionAvailable
&& <span className="input-group-append"> </s> remove onClick={() =>
toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
})
</s> add onClick={() => toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
}) </s> remove onClick={() =>
toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
})
</s> add onClick={() => toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
}) </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 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={this.handleSubmit}
</s> add onClick={handleSubmit}
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/UpdateTopline.js
|
keep keep keep keep replace
|
<mask> getUpdate: PropTypes.func,
<mask> processingUpdate: PropTypes.bool,
<mask> };
<mask>
<mask> export default withNamespaces()(UpdateTopline);
</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()(UpdateOverlay);
</s> add export default withTranslation()(UpdateOverlay); </s> remove export default withNamespaces()(Footer);
</s> add export default withTranslation()(Footer); </s> add meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired, </s> remove export default withNamespaces()(Checkbox);
</s> add export default withTranslation()(Checkbox); </s> remove export default withNamespaces()(Status);
</s> add export default withTranslation()(Status); </s> remove export default withNamespaces()(enhanceWithClickOutside(Menu));
</s> add export default withTranslation()(enhanceWithClickOutside(Menu));
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/UpdateTopline.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 './Version.css';
<mask>
<mask> const Version = (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 { 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/ui/Version.js
|
keep keep keep keep replace
|
<mask> processingVersion: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Version);
</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()(StaticLeases);
</s> add export default withTranslation()(StaticLeases); </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()(Footer);
</s> add export default withTranslation()(Footer); </s> remove export default withNamespaces()(Dns);
</s> add export default withTranslation()(Dns); </s> remove export default withNamespaces()(DnsBlocklist);
</s> add export default withTranslation()(DnsBlocklist);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/components/ui/Version.js
|
keep keep keep keep replace keep keep keep keep
|
<mask> export default function configureStore(reducer, initialState) {
<mask> /* eslint-disable no-underscore-dangle */
<mask> const store = createStore(reducer, initialState, compose(
<mask> applyMiddleware(...middlewares),
<mask> window.__REDUX_DEVTOOLS_EXTENSION__ ? window.__REDUX_DEVTOOLS_EXTENSION__() : f => f,
<mask> ));
<mask> /* eslint-enable */
<mask> return store;
<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 /* stylelint-enable */ </s> add </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 export const checkHost = host => async (dispatch) => {
</s> add export const checkHost = (host) => async (dispatch) => { </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 return (
</s> add return (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/configureStore.js
|
keep keep keep replace keep keep keep keep keep
|
<mask> import { connect } from 'react-redux';
<mask> import { getClients } from '../actions';
<mask> import { getStats } from '../actions/stats';
<mask> import { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
<mask> import Clients from '../components/Settings/Clients';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { dashboard, clients, stats } = state;
<mask> const 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 import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs';
</s> add import {
getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage,
} from '../actions/queryLogs'; </s> remove import { addSuccessToast, getClients } from '../actions';
</s> add import { getClients } from '../actions'; </s> add import { addSuccessToast } from '../actions/toasts'; </s> remove import { addErrorToast, addSuccessToast, getClients } from './index';
</s> add import { getClients } from './index';
import { addErrorToast, addSuccessToast } from './toasts'; </s> remove import { t } from 'i18next';
</s> add import i18next from '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/containers/Clients.js
|
keep replace keep replace
|
<mask> import { connect } from 'react-redux';
<mask> import { addSuccessToast, getClients } from '../actions';
<mask> import { getFilteringStatus, setRules } from '../actions/filtering';
<mask> import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs';
</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 { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
</s> add import {
addClient, updateClient, deleteClient, toggleClientModal,
} from '../actions/clients'; </s> remove import { addErrorToast, addSuccessToast, getClients } from './index';
</s> add import { getClients } from './index';
import { addErrorToast, addSuccessToast } from './toasts'; </s> remove import { t } from 'i18next';
</s> add import i18next from '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/containers/Logs.js
|
keep add keep keep keep keep keep
|
<mask> } from '../actions/queryLogs';
<mask> import Logs from '../components/Logs';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { queryLogs, dashboard, filtering } = state;
<mask> const props = { queryLogs, dashboard, filtering };
<mask> return 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 import { getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage } from '../actions/queryLogs';
</s> add import {
getLogs, getLogsConfig, setLogsPagination, setLogsFilter, setLogsPage,
} from '../actions/queryLogs'; </s> remove import { addClient, updateClient, deleteClient, toggleClientModal } from '../actions/clients';
</s> add import {
addClient, updateClient, deleteClient, toggleClientModal,
} from '../actions/clients'; </s> remove import { addSuccessToast, getClients } from '../actions';
</s> add import { getClients } from '../actions'; </s> remove import { Trans, withNamespaces } from 'react-i18next';
</s> add import { Trans, withTranslation } from 'react-i18next'; </s> remove import Tabs from '../ui/Tabs';
import Icons from '../ui/Icons';
</s> add import Tabs from './Tabs';
import Icons from './Icons'; </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/containers/Logs.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> import PropTypes from 'prop-types';
<mask> import {
<mask> R_IPV4, R_MAC, R_HOST, R_IPV6, R_CIDR, R_CIDR_IPV6,
<mask> UNSAFE_PORTS, R_URL_REQUIRES_PROTOCOL, R_WIN_ABSOLUTE_PATH, R_UNIX_ABSOLUTE_PATH,
<mask> } from '../helpers/constants';
<mask> import { createOnBlurHandler } from './helpers';
<mask>
<mask> export const renderField = (props, elementType) => {
<mask> const {
<mask> input, id, className, placeholder, type, disabled, normalizeOnBlur,
</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 onBlur = event => createOnBlurHandler(event, input, normalizeOnBlur);
</s> add const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur); </s> remove import { normalizeTextarea, sortClients, isVersionGreater } from '../helpers/helpers';
import { SETTINGS_NAMES, CHECK_TIMEOUT } from '../helpers/constants';
</s> add import { isVersionGreater, normalizeTextarea, sortClients } from '../helpers/helpers';
import { CHECK_TIMEOUT, SETTINGS_NAMES } from '../helpers/constants'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { t } from 'i18next';
</s> add import i18next from 'i18next'; </s> remove import { addErrorToast, addSuccessToast } from './index';
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> input, id, className, placeholder, type, disabled, normalizeOnBlur,
<mask> autoComplete, meta: { touched, error },
<mask> } = props;
<mask>
<mask> const onBlur = event => createOnBlurHandler(event, input, normalizeOnBlur);
<mask>
<mask> const element = React.createElement(elementType, {
<mask> ...input,
<mask> id,
<mask> className,
</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 onBlur = event => createOnBlurHandler(event, input, normalizeOnBlur);
</s> add const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur); </s> remove } from '../helpers/constants';
</s> add } from './constants'; </s> remove export const renderInputField = props => renderField(props, 'input');
</s> add export const renderInputField = (props) => renderField(props, 'input'); </s> remove }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> });
<mask> return (
<mask> <Fragment>
<mask> {element}
<mask> {!disabled && touched && (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask> };
<mask>
<mask> renderField.propTypes = {
</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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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 }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> renderField.propTypes = {
<mask> id: PropTypes.string.isRequired,
<mask> input: PropTypes.object.isRequired,
<mask> meta: PropTypes.object.isRequired,
<mask> className: PropTypes.string,
<mask> placeholder: PropTypes.string,
<mask> type: PropTypes.string,
<mask> disabled: PropTypes.bool,
<mask> autoComplete: PropTypes.bool,
</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>)}
</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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> add renderMultiselect.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
options: PropTypes.object,
};
</s> remove }) => (
<Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> remove }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> add meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep add keep keep keep keep keep
|
<mask> disabled: PropTypes.bool,
<mask> autoComplete: PropTypes.bool,
<mask> normalizeOnBlur: PropTypes.func,
<mask> };
<mask>
<mask> export const renderTextareaField = (props) => renderField(props, 'textarea');
<mask>
<mask> export const renderInputField = (props) => renderField(props, 'input');
</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 const renderTextareaField = props => renderField(props, 'textarea');
</s> add export const renderTextareaField = (props) => renderField(props, 'textarea'); </s> remove export const renderInputField = props => renderField(props, 'input');
</s> add export const renderInputField = (props) => renderField(props, 'input'); </s> remove meta: PropTypes.object.isRequired,
</s> add </s> remove export default withNamespaces()(Footer);
</s> add export default withTranslation()(Footer); </s> remove export default withNamespaces()(UpdateTopline);
</s> add export default withTranslation()(UpdateTopline); </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/helpers/form.js
|
keep replace keep replace
|
<mask>
<mask> export const renderTextareaField = props => renderField(props, 'textarea');
<mask>
<mask> export const renderInputField = props => renderField(props, 'input');
</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> add meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired, </s> remove const PageTitle = props => (
</s> add const PageTitle = (props) => ( </s> remove const Topline = props => (
</s> add const Topline = (props) => ( </s> remove const Tooltip = props => (
</s> add const Tooltip = (props) => ( </s> remove const UpdateTopline = props => (
</s> add const UpdateTopline = (props) => (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> removeField,
<mask> meta: { touched, error },
<mask> normalizeOnBlur,
<mask> }) => {
<mask> const onBlur = event => createOnBlurHandler(event, input, normalizeOnBlur);
<mask>
<mask> return (
<mask> <Fragment>
<mask> <div className="input-group">
<mask> <input
</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 onBlur = event => createOnBlurHandler(event, input, normalizeOnBlur);
</s> add const onBlur = (event) => createOnBlurHandler(event, input, normalizeOnBlur); </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 }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> remove }) => (
<Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> remove return (
</s> add return (
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask> disabled={disabled}
<mask> autoComplete={autoComplete}
<mask> onBlur={onBlur}
<mask> />
<mask> {isActionAvailable &&
<mask> <span className="input-group-append">
<mask> <button
<mask> type="button"
<mask> className="btn btn-secondary btn-icon"
<mask> onClick={removeField}
<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 {props.canAutoUpdate &&
<button
</s> add {props.canAutoUpdate
&& <button </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 onClick={this.handleSubmit}
</s> add onClick={handleSubmit} </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 onClick={() =>
toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
})
</s> add onClick={() => toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
}) </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,
})
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask> </button>
<mask> </span>
<mask> }
<mask> </div>
<mask> {!disabled &&
<mask> touched &&
<mask> (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask> };
<mask>
<mask> export const 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 {!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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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 }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> };
<mask>
<mask> export const renderRadioField = ({
<mask> input, placeholder, disabled, meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className="custom-control custom-radio custom-control-inline">
<mask> <input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<mask> <span className="custom-control-label">{placeholder}</span>
<mask> </label>
<mask> {!disabled &&
<mask> touched &&
<mask> (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
<mask> export const renderSelectField = ({
<mask> input,
<mask> placeholder,
<mask> subtitle,
</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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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 }) => (
<Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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>
<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/helpers/form.js
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> disabled,
<mask> onClick,
<mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className={`checkbox ${modifier}`} onClick={onClick}>
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text checkbox__label-text--long">
<mask> <span className="checkbox__label-title">{placeholder}</span>
<mask> {subtitle && (
<mask> <span
<mask> className="checkbox__label-subtitle"
</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 }) => (
<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="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> remove }) => (
<Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </s> remove {isActionAvailable &&
<span className="input-group-append">
</s> add {isActionAvailable
&& <span className="input-group-append"> </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 {!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/helpers/form.js
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> />
<mask> )}
<mask> </span>
<mask> </span>
<mask> </label>
<mask> {!disabled &&
<mask> touched &&
<mask> (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
<mask> export const renderServiceField = ({
<mask> input,
<mask> placeholder,
<mask> disabled,
</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 }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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 {!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 }) => (
<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={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className={`service custom-switch ${modifier}`}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
/>
<span className="service__switch custom-switch-indicator"></span>
<span className="service__text">{placeholder}</span>
<svg className="service__icon">
<use xlinkHref={`#${icon}`} />
</svg>
</label>
{!disabled && touched && error
&& <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderServiceField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
modifier: PropTypes.string,
icon: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> disabled,
<mask> modifier,
<mask> icon,
<mask> meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className={`service custom-switch ${modifier}`}>
<mask> <input
<mask> {...input}
<mask> type="checkbox"
<mask> className="custom-switch-input"
<mask> value={placeholder.toLowerCase()}
<mask> disabled={disabled}
<mask> />
<mask> <span className="service__switch custom-switch-indicator"></span>
<mask> <span className="service__text">{placeholder}</span>
<mask> <svg className="service__icon">
<mask> <use xlinkHref={`#${icon}`} />
<mask> </svg>
<mask> </label>
<mask> {!disabled &&
<mask> touched &&
<mask> (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
<mask> // Validation functions
<mask> // If the value is valid, the validation function should return undefined.
<mask> // https://redux-form.com/6.6.3/examples/fieldlevelvalidation/
<mask> export const required = (value) => {
</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 }) => (
<Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add }) => <Fragment>
<label className="custom-control custom-radio custom-control-inline">
<input {...input} type="radio" className="custom-control-input" disabled={disabled} />
<span className="custom-control-label">{placeholder}</span>
</label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderRadioField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
disabled: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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 {!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 </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
);
</s> add </label>
{!disabled
&& touched
&& (error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
}; </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/helpers/form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> export const portTLS = (value) => {
<mask> if (value === 0) {
<mask> return undefined;
<mask> } else if (value && (value < 80 || value > 65535)) {
<mask> return <Trans>form_error_port_range</Trans>;
<mask> }
<mask> return undefined;
<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 export const isValidAbsolutePath = value => R_WIN_ABSOLUTE_PATH.test(value)
</s> add export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value) </s> remove } else if (interval === 72 || interval === 168) {
</s> add } if (interval === 72 || interval === 168) { </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) { </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 (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const isValidAbsolutePath = value => R_WIN_ABSOLUTE_PATH.test(value)
<mask> || R_UNIX_ABSOLUTE_PATH.test(value);
<mask>
<mask> export const isValidPath = (value) => {
<mask> if (value && !isValidAbsolutePath(value) && !R_URL_REQUIRES_PROTOCOL.test(value)) {
<mask> return <Trans>form_error_url_or_path_format</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 } else if (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove export const toNumber = value => value && parseInt(value, 10);
</s> add export const toNumber = (value) => value && parseInt(value, 10); </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 (checkRewrite(reason) || checkRewriteHosts(reason)) {
</s> add } if (checkRewrite(reason) || checkRewriteHosts(reason)) { </s> remove } else if (checkWhiteList(reason)) {
</s> add } if (checkWhiteList(reason)) {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep keep keep keep replace
|
<mask> }
<mask> return undefined;
<mask> };
<mask>
<mask> export const toNumber = value => value && parseInt(value, 10);
</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 (value && (value < 80 || value > 65535)) {
</s> add }
if (value && (value < 80 || value > 65535)) { </s> remove export const isValidAbsolutePath = value => R_WIN_ABSOLUTE_PATH.test(value)
</s> add export const isValidAbsolutePath = (value) => R_WIN_ABSOLUTE_PATH.test(value) </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); </s> remove const countCell = dnsQueries =>
function cell(row) {
const { value } = row;
const percent = getPercent(dnsQueries, value);
const percentColor = getQueriedPercentColor(percent);
</s> add const countCell = (dnsQueries) => function cell(row) {
const { value } = row;
const percent = getPercent(dnsQueries, value);
const percentColor = getQueriedPercentColor(percent); </s> remove return (
</s> add return ( </s> remove const countCell = dnsQueries =>
function cell(row) {
const { value } = row;
const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
</s> add const countCell = (dnsQueries) => function cell(row) {
const { value } = row;
const percent = getPercent(dnsQueries, value);
const percentColor = getClientsPercentColor(percent);
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
|
client/src/helpers/form.js
|
keep add keep keep keep keep keep keep
|
<mask> "context"
<mask> "crypto/sha256"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
</s> * dnsfilter: use fastcache instead of gcache </s> remove "errors"
</s> add </s> add github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= </s> add "github.com/VictoriaMetrics/fastcache" </s> remove safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safeSearchCache gcache.Cache
</s> add safebrowsingCache *fastcache.Cache
parentalCache *fastcache.Cache
safeSearchCache *fastcache.Cache </s> remove func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
</s> add func setCacheResult(cache *fastcache.Cache, host string, res Result) {
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
_ = enc.Encode(res)
cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s => [%d]", cache, host, buf.Len())
}
func getCachedResult(cache *fastcache.Cache, host string) (result Result, isFound bool) { </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> "bytes"
<mask> "context"
<mask> "crypto/sha256"
<mask> "encoding/json"
<mask> "errors"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "os"
</s> * dnsfilter: use fastcache instead of gcache </s> add "encoding/gob" </s> add github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= </s> add "github.com/VictoriaMetrics/fastcache" </s> remove safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safeSearchCache gcache.Cache
</s> add safebrowsingCache *fastcache.Cache
parentalCache *fastcache.Cache
safeSearchCache *fastcache.Cache </s> remove func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
</s> add func setCacheResult(cache *fastcache.Cache, host string, res Result) {
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
_ = enc.Encode(res)
cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s => [%d]", cache, host, buf.Len())
}
func getCachedResult(cache *fastcache.Cache, host string) (result Result, isFound bool) { </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep add keep keep keep keep keep
|
<mask> "strings"
<mask> "sync/atomic"
<mask> "time"
<mask>
<mask> "github.com/joomcode/errorx"
<mask>
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter"
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9 h1:5Cp3cVwpQP4aCQ6jx6dNLP3IarbYiuStmIzYu+BjQwY=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> add github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= </s> remove "errors"
</s> add </s> remove safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safeSearchCache gcache.Cache
</s> add safebrowsingCache *fastcache.Cache
parentalCache *fastcache.Cache
safeSearchCache *fastcache.Cache </s> remove func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
</s> add func setCacheResult(cache *fastcache.Cache, host string, res Result) {
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
_ = enc.Encode(res)
cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s => [%d]", cache, host, buf.Len())
}
func getCachedResult(cache *fastcache.Cache, host string) (result Result, isFound bool) { </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace replace replace keep keep keep keep keep
|
<mask>
<mask> type dnsFilterContext struct {
<mask> stats Stats
<mask> dialCache gcache.Cache // "host" -> "IP" cache for safebrowsing and parental control servers
<mask> safebrowsingCache gcache.Cache
<mask> parentalCache gcache.Cache
<mask> safeSearchCache gcache.Cache
<mask> }
<mask>
<mask> var gctx dnsFilterContext // global dnsfilter context
<mask>
<mask> // Result holds state of hostname check
</s> * dnsfilter: use fastcache instead of gcache </s> remove func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
</s> add func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache *fastcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) { </s> remove isFound = ok
return cachedValue, isFound, err
</s> add return cachedValue, true </s> remove err = cache.Set(host, result)
if err != nil {
return Result{}, err
}
</s> add setCacheResult(cache, host, result) </s> remove // since it can be something else, validate that it belongs to proper type
cachedValue, ok := rawValue.(Result)
if !ok {
// this is not our type -- error
text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
log.Println(text)
err = errors.New(text)
return
</s> add var buf bytes.Buffer
buf.Write(rawValue)
dec := gob.NewDecoder(&buf)
cachedValue := Result{}
err := dec.Decode(&cachedValue)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache) </s> remove if err != nil {
return Result{}, err
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep replace keep keep keep replace replace replace replace replace replace replace replace replace keep keep
|
<mask> }
<mask>
<mask> func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
<mask> isFound = false // not found yet
<mask>
<mask> // get raw value
<mask> rawValue, err := cache.Get(host)
<mask> if err == gcache.KeyNotFoundError {
<mask> // not a real error, just not found
<mask> err = nil
<mask> return
<mask> }
<mask> if err != nil {
<mask> // real error
<mask> return
<mask> }
<mask>
</s> * dnsfilter: use fastcache instead of gcache </s> remove // since it can be something else, validate that it belongs to proper type
cachedValue, ok := rawValue.(Result)
if !ok {
// this is not our type -- error
text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
log.Println(text)
err = errors.New(text)
return
</s> add var buf bytes.Buffer
buf.Write(rawValue)
dec := gob.NewDecoder(&buf)
cachedValue := Result{}
err := dec.Decode(&cachedValue)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false </s> remove func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
</s> add func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache *fastcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) { </s> remove cachedValue, isFound, err := getCachedReason(cache, host)
</s> add cachedValue, isFound := getCachedResult(cache, host) </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep replace replace replace replace replace replace replace replace keep replace replace keep
|
<mask>
<mask> // since it can be something else, validate that it belongs to proper type
<mask> cachedValue, ok := rawValue.(Result)
<mask> if !ok {
<mask> // this is not our type -- error
<mask> text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
<mask> log.Println(text)
<mask> err = errors.New(text)
<mask> return
<mask> }
<mask> isFound = ok
<mask> return cachedValue, isFound, err
<mask> }
</s> * dnsfilter: use fastcache instead of gcache </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, host)
</s> add cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host) </s> remove cachedValue, isFound, err := getCachedReason(cache, host)
</s> add cachedValue, isFound := getCachedResult(cache, host) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> defer timer.LogElapsed("SafeSearch HTTP lookup for %s", host)
<mask> }
<mask>
<mask> // Check cache. Return cached result if it was found
<mask> cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, host)
<mask> if isFound {
<mask> atomic.AddUint64(&gctx.stats.Safesearch.CacheHits, 1)
<mask> log.Tracef("%s: found in SafeSearch cache", host)
<mask> return cachedValue, nil
<mask> }
</s> * dnsfilter: use fastcache instead of gcache </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache) </s> remove cachedValue, isFound, err := getCachedReason(cache, host)
</s> add cachedValue, isFound := getCachedResult(cache, host) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove // since it can be something else, validate that it belongs to proper type
cachedValue, ok := rawValue.(Result)
if !ok {
// this is not our type -- error
text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
log.Println(text)
err = errors.New(text)
return
</s> add var buf bytes.Buffer
buf.Write(rawValue)
dec := gob.NewDecoder(&buf)
cachedValue := Result{}
err := dec.Decode(&cachedValue)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> log.Tracef("%s: found in SafeSearch cache", host)
<mask> return cachedValue, nil
<mask> }
<mask>
<mask> if err != nil {
<mask> return Result{}, err
<mask> }
<mask>
<mask> safeHost, ok := d.SafeSearchDomain(host)
<mask> if !ok {
<mask> return Result{}, nil
<mask> }
<mask>
</s> * dnsfilter: use fastcache instead of gcache </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache) </s> remove cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, host)
</s> add cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove cachedValue, isFound, err := getCachedReason(cache, host)
</s> add cachedValue, isFound := getCachedResult(cache, host) </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove // since it can be something else, validate that it belongs to proper type
cachedValue, ok := rawValue.(Result)
if !ok {
// this is not our type -- error
text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
log.Println(text)
err = errors.New(text)
return
</s> add var buf bytes.Buffer
buf.Write(rawValue)
dec := gob.NewDecoder(&buf)
cachedValue := Result{}
err := dec.Decode(&cachedValue)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace replace replace replace replace keep keep keep keep keep
|
<mask>
<mask> res := Result{IsFiltered: true, Reason: FilteredSafeSearch}
<mask> if ip := net.ParseIP(safeHost); ip != nil {
<mask> res.IP = ip
<mask> err = gctx.safeSearchCache.Set(host, res)
<mask> if err != nil {
<mask> return Result{}, nil
<mask> }
<mask>
<mask> return res, nil
<mask> }
<mask>
<mask> // TODO this address should be resolved with upstream that was configured in dnsforward
<mask> addrs, err := net.LookupIP(safeHost)
</s> * dnsfilter: use fastcache instead of gcache </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove // since it can be something else, validate that it belongs to proper type
cachedValue, ok := rawValue.(Result)
if !ok {
// this is not our type -- error
text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
log.Println(text)
err = errors.New(text)
return
</s> add var buf bytes.Buffer
buf.Write(rawValue)
dec := gob.NewDecoder(&buf)
cachedValue := Result{}
err := dec.Decode(&cachedValue)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> return Result{}, fmt.Errorf("no ipv4 addresses in safe search response for %s", safeHost)
<mask> }
<mask>
<mask> // Cache result
<mask> err = gctx.safeSearchCache.Set(host, res)
<mask> if err != nil {
<mask> return Result{}, nil
<mask> }
<mask> return res, nil
<mask> }
<mask>
<mask> func (d *Dnsfilter) checkSafeBrowsing(host string) (Result, error) {
<mask> if log.GetLevel() >= log.DEBUG {
</s> * dnsfilter: use fastcache instead of gcache </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
</s> add func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache *fastcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) { </s> remove cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, host)
</s> add cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
</s> add func setCacheResult(cache *fastcache.Cache, host string, res Result) {
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
_ = enc.Encode(res)
cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s => [%d]", cache, host, buf.Len())
}
func getCachedResult(cache *fastcache.Cache, host string) (result Result, isFound bool) { </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep replace keep keep keep keep replace
|
<mask> // real implementation of lookup/check
<mask> func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
<mask> // if host ends with a dot, trim it
<mask> host = strings.ToLower(strings.Trim(host, "."))
<mask>
<mask> // check cache
<mask> cachedValue, isFound, err := getCachedReason(cache, host)
</s> * dnsfilter: use fastcache instead of gcache </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
</s> add func setCacheResult(cache *fastcache.Cache, host string, res Result) {
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
_ = enc.Encode(res)
cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s => [%d]", cache, host, buf.Len())
}
func getCachedResult(cache *fastcache.Cache, host string) (result Result, isFound bool) { </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache) </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove isFound = ok
return cachedValue, isFound, err
</s> add return cachedValue, true
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep replace replace replace keep keep keep
|
<mask> // check cache
<mask> cachedValue, isFound, err := getCachedReason(cache, host)
<mask> if isFound {
<mask> atomic.AddUint64(&lookupstats.CacheHits, 1)
<mask> log.Tracef("%s: found in the lookup cache", host)
<mask> return cachedValue, nil
<mask> }
<mask> if err != nil {
<mask> return Result{}, err
<mask> }
<mask>
<mask> // convert hostname to hash parameters
<mask> hashparam, hashes := hostnameToHashParam(host, hashparamNeedSlash)
</s> * dnsfilter: use fastcache instead of gcache </s> remove cachedValue, isFound, err := getCachedReason(cache, host)
</s> add cachedValue, isFound := getCachedResult(cache, host) </s> remove cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, host)
</s> add cachedValue, isFound := getCachedResult(gctx.safeSearchCache, host) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove // since it can be something else, validate that it belongs to proper type
cachedValue, ok := rawValue.(Result)
if !ok {
// this is not our type -- error
text := "SHOULD NOT HAPPEN: entry with invalid type was found in lookup cache"
log.Println(text)
err = errors.New(text)
return
</s> add var buf bytes.Buffer
buf.Write(rawValue)
dec := gob.NewDecoder(&buf)
cachedValue := Result{}
err := dec.Decode(&cachedValue)
if err != nil {
log.Debug("gob.Decode(): %s", err)
return Result{}, false </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> // handle status code
<mask> switch {
<mask> case resp.StatusCode == 204:
<mask> // empty result, save cache
<mask> err = cache.Set(host, Result{})
<mask> if err != nil {
<mask> return Result{}, err
<mask> }
<mask> return Result{}, nil
<mask> case resp.StatusCode != 200:
<mask> // error, don't save cache
<mask> return Result{}, nil
<mask> }
</s> * dnsfilter: use fastcache instead of gcache </s> remove err = cache.Set(host, result)
if err != nil {
return Result{}, err
}
</s> add setCacheResult(cache, host, result) </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache) </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = fastcache.New(c.SafeBrowsingCacheSize) </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove if err != nil {
return Result{}, err
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace replace replace replace keep keep keep keep keep
|
<mask> // error, don't save cache
<mask> return Result{}, err
<mask> }
<mask>
<mask> err = cache.Set(host, result)
<mask> if err != nil {
<mask> return Result{}, err
<mask> }
<mask> return result, nil
<mask> }
<mask>
<mask> //
<mask> // Adding rule and matching against the rules
</s> * dnsfilter: use fastcache instead of gcache </s> remove err = cache.Set(host, Result{})
if err != nil {
return Result{}, err
}
</s> add setCacheResult(cache, host, Result{}) </s> remove log.Tracef("%s: found in the lookup cache", host)
</s> add log.Tracef("%s: found in the lookup cache %p", host, cache) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove cachedValue, isFound, err := getCachedReason(cache, host)
</s> add cachedValue, isFound := getCachedResult(cache, host)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep replace keep keep keep
|
<mask>
<mask> if c != nil {
<mask> // initialize objects only once
<mask> if gctx.safebrowsingCache == nil {
<mask> gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.safeSearchCache == nil {
<mask> gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.parentalCache == nil {
<mask> gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> * dnsfilter: use fastcache instead of gcache </s> remove gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.parentalCache = fastcache.New(c.ParentalCacheSize) </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove err = cache.Set(host, Result{})
if err != nil {
return Result{}, err
}
</s> add setCacheResult(cache, host, Result{}) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> if gctx.safeSearchCache == nil {
<mask> gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.parentalCache == nil {
<mask> gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if len(c.ResolverAddress) != 0 && gctx.dialCache == nil {
<mask> gctx.dialCache = gcache.New(maxDialCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> }
</s> * dnsfilter: use fastcache instead of gcache </s> remove gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safeSearchCache = fastcache.New(c.SafeSearchCacheSize) </s> remove gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = fastcache.New(c.SafeBrowsingCacheSize) </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false </s> remove err = cache.Set(host, Result{})
if err != nil {
return Result{}, err
}
</s> add setCacheResult(cache, host, Result{}) </s> remove if err != nil {
return Result{}, err
}
</s> add </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
dnsfilter/dnsfilter.go
|
keep keep keep add keep keep keep keep keep
|
<mask> github.com/AdguardTeam/dnsproxy v0.15.0
<mask> github.com/AdguardTeam/golibs v0.1.3
<mask> github.com/AdguardTeam/urlfilter v0.4.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/bluele/gcache v0.0.0-20190203144525-2016d595ccb0
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
<mask> github.com/joomcode/errorx v0.8.0
<mask> github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18 h1:pl4eWIqvFe/Kg3zkn7NxevNzILnZYWDCG7qbA1CJik0=
github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= </s> add github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= </s> add github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= </s> add github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= </s> remove err = cache.Set(host, result)
if err != nil {
return Result{}, err
}
</s> add setCacheResult(cache, host, result) </s> remove safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safeSearchCache gcache.Cache
</s> add safebrowsingCache *fastcache.Cache
parentalCache *fastcache.Cache
safeSearchCache *fastcache.Cache
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.mod
|
keep keep add keep keep keep keep keep
|
<mask> github.com/AdguardTeam/urlfilter v0.4.1/go.mod h1:6YehXZ8e0Hx2MvqeQWLFom6IkPinm04tNhO1CkwAxmg=
<mask> github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
<mask> github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/VictoriaMetrics/fastcache v1.5.1 h1:qHgHjyoNFV7jgucU8QZUuU4gcdhfs8QW1kw68OD2Lag=
<mask> github.com/VictoriaMetrics/fastcache v1.5.1/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/VictoriaMetrics/fastcache v1.5.1 h1:qHgHjyoNFV7jgucU8QZUuU4gcdhfs8QW1kw68OD2Lag=
github.com/VictoriaMetrics/fastcache v1.5.1/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= </s> add github.com/VictoriaMetrics/fastcache v1.5.1 </s> add github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= </s> add github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18 h1:pl4eWIqvFe/Kg3zkn7NxevNzILnZYWDCG7qbA1CJik0=
github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9 h1:5Cp3cVwpQP4aCQ6jx6dNLP3IarbYiuStmIzYu+BjQwY=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.sum
|
keep keep keep add keep keep keep keep keep keep
|
<mask> github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
<mask> github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705 h1:UUppSQnhf4Yc6xGxSkoQpPhb7RVzuv5Nb1mwJ5VId9s=
<mask> github.com/StackExchange/wmi v0.0.0-20181212234831-e0a55b97c705/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
<mask> github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= </s> add github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9 h1:5Cp3cVwpQP4aCQ6jx6dNLP3IarbYiuStmIzYu+BjQwY=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove "errors"
</s> add </s> add "github.com/VictoriaMetrics/fastcache"
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.sum
|
keep keep keep add keep keep keep keep keep keep
|
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/ameshkov/dnscrypt v1.0.7 h1:7LS9wiC/6c00H3ZdZOlwQSYGTJvs12g5ui9D1VSZ2aQ=
<mask> github.com/ameshkov/dnscrypt v1.0.7/go.mod h1:rA74ASZ0j4JqPWaiN64hN97QXJ/zu5Kb2xgn295VzWQ=
<mask> github.com/ameshkov/dnsstamps v1.0.1 h1:LhGvgWDzhNJh+kBQd/AfUlq1vfVe109huiXw4JhnPug=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/ameshkov/goproxy v0.0.0-20190328085534-e9f6fabc24d4/go.mod h1:tKA6C/1BQYejT7L6ZX0klDrqloYenYETv3BCk8xCbrQ=
<mask> github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/VictoriaMetrics/fastcache v1.5.1 h1:qHgHjyoNFV7jgucU8QZUuU4gcdhfs8QW1kw68OD2Lag=
github.com/VictoriaMetrics/fastcache v1.5.1/go.mod h1:+jv9Ckb+za/P1ZRg/sulP5Ni1v49daAVERr0H3CuscE= </s> add github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= </s> add github.com/VictoriaMetrics/fastcache v1.5.1 </s> add github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18 h1:pl4eWIqvFe/Kg3zkn7NxevNzILnZYWDCG7qbA1CJik0=
github.com/cespare/xxhash/v2 v2.0.1-0.20190104013014-3767db7a7e18/go.mod h1:HD5P3vAIAh+Y2GAxg0PrPN1P8WkepXGpjbUPDHJqqKM= </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9 h1:5Cp3cVwpQP4aCQ6jx6dNLP3IarbYiuStmIzYu+BjQwY=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.sum
|
keep keep keep add keep keep keep keep keep keep
|
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6 h1:KXlsf+qt/X5ttPGEjR0tPH1xaWWoKBEg9Q1THAj2h3I=
<mask> github.com/beefsack/go-rate v0.0.0-20180408011153-efa7637bb9b6/go.mod h1:6YNgTHLutezwnBvyneBbwvB8C82y3dcoOj5EQJIdGXA=
<mask> github.com/bluele/gcache v0.0.0-20190203144525-2016d595ccb0 h1:vUdUwmQLnT/yuk8PsDhhMVkrfr4aMdcv/0GWzIqOjEY=
<mask> github.com/bluele/gcache v0.0.0-20190203144525-2016d595ccb0/go.mod h1:8c4/i2VlovMO2gBnHGQPN5EJw+H0lx1u/5p+cgsXtCk=
<mask> github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
<mask> github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
<mask> github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
<mask> github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
<mask> github.com/go-test/deep v1.0.1 h1:UQhStjbkDClarlmv0am7OXXO4/GaPdCGiUiMTvi28sg=
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/VictoriaMetrics/fastcache v1.5.1 </s> add github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/OneOfOne/xxhash v1.2.5 h1:zl/OfRA6nftbBK9qTohYBJ5xvw6C/oNKizR7cZGl3cI=
github.com/OneOfOne/xxhash v1.2.5/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q= </s> add github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9 h1:5Cp3cVwpQP4aCQ6jx6dNLP3IarbYiuStmIzYu+BjQwY=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove err = gctx.safeSearchCache.Set(host, res)
if err != nil {
return Result{}, nil
}
</s> add setCacheResult(gctx.safeSearchCache, host, res) </s> remove "errors"
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.sum
|
keep keep keep add keep keep keep keep
|
<mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264 h1:roWyi0eEdiFreSqW9V1wT9pNOVzrpo2NWsxja53slX0=
<mask> github.com/gobuffalo/packd v0.0.0-20181031195726-c82734870264/go.mod h1:Yf2toFaISlyQrr5TfO3h6DB9pl9mZRmyvBGQb/aQ/pI=
<mask> github.com/gobuffalo/packr v1.19.0 h1:3UDmBDxesCOPF8iZdMDBBWKfkBoYujIMIZePnobqIUI=
<mask> github.com/gobuffalo/packr v1.19.0/go.mod h1:MstrNkfCQhd5o+Ct4IJ0skWlxN8emOq8DsoT1G98VIU=
<mask> github.com/google/pprof v0.0.0-20190309163659-77426154d546/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
<mask> github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
<mask> github.com/inconshreveable/go-vhost v0.0.0-20160627193104-06d84117953b/go.mod h1:aA6DnFhALT3zH0y+A39we+zbrdMC2N0X/q21e6FI0LU=
<mask> github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/VictoriaMetrics/fastcache v1.5.1 </s> add github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9 h1:5Cp3cVwpQP4aCQ6jx6dNLP3IarbYiuStmIzYu+BjQwY=
github.com/spaolacci/murmur3 v1.0.1-0.20190317074736-539464a789e9/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= </s> remove func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) {
</s> add func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache *fastcache.Cache, hashparamNeedSlash bool, format formatHandler, handleBody bodyHandler) (Result, error) { </s> remove "errors"
</s> add </s> add "github.com/VictoriaMetrics/fastcache" </s> remove safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safeSearchCache gcache.Cache
</s> add safebrowsingCache *fastcache.Cache
parentalCache *fastcache.Cache
safeSearchCache *fastcache.Cache
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.sum
|
keep keep add keep keep keep keep keep keep
|
<mask> github.com/shirou/gopsutil v2.18.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
<mask> github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 h1:udFKJ0aHUL60LboW/A+DfgoHVedieIzIXE8uylPue0U=
<mask> github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0 h1:mu7brOsdaH5Dqf93vdch+mr/0To8Sgc+yInt/jE/RJM=
<mask> github.com/sparrc/go-ping v0.0.0-20181106165434-ef3ab45e41b0/go.mod h1:eMyUVp6f/5jnzM+3zahzl7q6UXLbgSc3MKg/+ow9QW0=
<mask> github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
<mask> github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
<mask> github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
<mask> github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
</s> * dnsfilter: use fastcache instead of gcache </s> add github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= </s> remove "errors"
</s> add </s> add "github.com/VictoriaMetrics/fastcache" </s> remove safebrowsingCache gcache.Cache
parentalCache gcache.Cache
safeSearchCache gcache.Cache
</s> add safebrowsingCache *fastcache.Cache
parentalCache *fastcache.Cache
safeSearchCache *fastcache.Cache </s> remove func getCachedReason(cache gcache.Cache, host string) (result Result, isFound bool, err error) {
</s> add func setCacheResult(cache *fastcache.Cache, host string, res Result) {
var buf bytes.Buffer
enc := gob.NewEncoder(&buf)
_ = enc.Encode(res)
cache.Set([]byte(host), buf.Bytes())
log.Debug("Stored in cache %p: %s => [%d]", cache, host, buf.Len())
}
func getCachedResult(cache *fastcache.Cache, host string) (result Result, isFound bool) { </s> remove rawValue, err := cache.Get(host)
if err == gcache.KeyNotFoundError {
// not a real error, just not found
err = nil
return
}
if err != nil {
// real error
return
</s> add rawValue := cache.Get(nil, []byte(host))
if len(rawValue) == 0 {
return Result{}, false
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f51df7d2e3eb4672d4762e14e22e831fdadd256
|
go.sum
|
keep keep add keep keep keep keep keep keep
|
<mask> "sort"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
</s> * control: safely restart DHCP server
* control: use mutex in all POST,PUT,DELETE handlers </s> add if method == "POST" || method == "PUT" || method == "DELETE" {
controlLock.Lock()
defer controlLock.Unlock()
}
</s> remove if !newconfig.Enabled {
err := dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
}
</s> add </s> add err = dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
</s> add var controlLock sync.Mutex
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f69fb73af7901b52a4717833de8554069c0b43b
|
control.go
|
keep add keep keep keep keep keep
|
<mask> }
<mask>
<mask> // ----------------
<mask> // helper functions
<mask> // ----------------
<mask>
<mask> func returnOK(w http.ResponseWriter) {
</s> * control: safely restart DHCP server
* control: use mutex in all POST,PUT,DELETE handlers </s> remove if !newconfig.Enabled {
err := dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
}
</s> add </s> add if method == "POST" || method == "PUT" || method == "DELETE" {
controlLock.Lock()
defer controlLock.Unlock()
}
</s> add err = dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
</s> add "sync"
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f69fb73af7901b52a4717833de8554069c0b43b
|
control.go
|
keep keep add keep keep keep keep keep
|
<mask> return
<mask> }
<mask>
<mask> if newconfig.Enabled {
<mask> err := dhcpServer.Start(&newconfig)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to start DHCP server: %s", err)
<mask> return
</s> * control: safely restart DHCP server
* control: use mutex in all POST,PUT,DELETE handlers </s> remove if !newconfig.Enabled {
err := dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
}
</s> add </s> add if method == "POST" || method == "PUT" || method == "DELETE" {
controlLock.Lock()
defer controlLock.Unlock()
}
</s> add var controlLock sync.Mutex
</s> add "sync"
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f69fb73af7901b52a4717833de8554069c0b43b
|
dhcp.go
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> httpError(w, http.StatusBadRequest, "Failed to start DHCP server: %s", err)
<mask> return
<mask> }
<mask> }
<mask> if !newconfig.Enabled {
<mask> err := dhcpServer.Stop()
<mask> if err != nil {
<mask> log.Error("failed to stop the DHCP server: %s", err)
<mask> }
<mask> }
<mask> config.DHCP = newconfig
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleDHCPInterfaces(w http.ResponseWriter, r *http.Request) {
</s> * control: safely restart DHCP server
* control: use mutex in all POST,PUT,DELETE handlers </s> add err = dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
</s> add if method == "POST" || method == "PUT" || method == "DELETE" {
controlLock.Lock()
defer controlLock.Unlock()
}
</s> add var controlLock sync.Mutex
</s> add "sync"
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f69fb73af7901b52a4717833de8554069c0b43b
|
dhcp.go
|
keep keep keep add keep keep keep keep
|
<mask> if r.Method != method {
<mask> http.Error(w, "This request must be "+method, http.StatusMethodNotAllowed)
<mask> return
<mask> }
<mask> handler(w, r)
<mask> }
<mask> }
<mask>
</s> * control: safely restart DHCP server
* control: use mutex in all POST,PUT,DELETE handlers </s> remove if !newconfig.Enabled {
err := dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
}
</s> add </s> add err = dhcpServer.Stop()
if err != nil {
log.Error("failed to stop the DHCP server: %s", err)
}
</s> add var controlLock sync.Mutex
</s> add "sync"
|
https://github.com/AdguardTeam/AdGuardHome/commit/6f69fb73af7901b52a4717833de8554069c0b43b
|
helpers.go
|
keep keep replace keep keep keep replace keep
|
<mask>
<mask> func (d *Dnsfilter) checkParental(host string) (Result, error) {
<mask> format2 := func(hashparam string) string {
<mask> url := fmt.Sprintf(defaultParentalURL, hashparam, d.config.parentalSensitivity)
<mask> return url
<mask> }
<mask> handleBody2 := func(body []byte, hashes map[string]bool) (Result, error) {
<mask> // parse json
</s> dnsfilter -- small code cleanup </s> remove result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format2, handleBody2)
</s> add result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format, handleBody)
|
https://github.com/AdguardTeam/AdGuardHome/commit/6fc50cd743a38f681b151703bbe06dd9cbc8e07c
|
dnsfilter/dnsfilter.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask> return result, nil
<mask> }
<mask> result, err := d.lookupCommon(host, &stats.Parental, parentalCache, false, format2, handleBody2)
<mask> return result, err
<mask> }
<mask>
<mask> // real implementation of lookup/check
<mask> func (d *Dnsfilter) lookupCommon(host string, lookupstats *LookupStats, cache gcache.Cache, hashparamNeedSlash bool, format func(hashparam string) string, handleBody func(body []byte, hashes map[string]bool) (Result, error)) (Result, error) {
</s> dnsfilter -- small code cleanup </s> remove handleBody2 := func(body []byte, hashes map[string]bool) (Result, error) {
</s> add handleBody := func(body []byte, hashes map[string]bool) (Result, error) { </s> remove format2 := func(hashparam string) string {
</s> add format := func(hashparam string) string {
|
https://github.com/AdguardTeam/AdGuardHome/commit/6fc50cd743a38f681b151703bbe06dd9cbc8e07c
|
dnsfilter/dnsfilter.go
|
keep keep add keep keep keep keep keep keep
|
<mask> showPagination={false}
<mask> noDataText={t('no_domains_found')}
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
<mask> };
<mask>
</s> - client: fix default page size for dashboard tables </s> add defaultPageSize={100} </s> add defaultPageSize={100}
|
https://github.com/AdguardTeam/AdGuardHome/commit/701233a4b786495be2f7f8e5e33ebf041481df01
|
client/src/components/Dashboard/BlockedDomains.js
|
keep keep keep add keep keep keep keep keep
|
<mask> ]}
<mask> showPagination={false}
<mask> noDataText={t('no_clients_found')}
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow"
<mask> />
<mask> </Card>
<mask> );
<mask>
</s> - client: fix default page size for dashboard tables </s> add defaultPageSize={100} </s> add defaultPageSize={100}
|
https://github.com/AdguardTeam/AdGuardHome/commit/701233a4b786495be2f7f8e5e33ebf041481df01
|
client/src/components/Dashboard/Clients.js
|
keep add keep keep keep keep keep
|
<mask> noDataText={t('no_domains_found')}
<mask> minRows={6}
<mask> className="-striped -highlight card-table-overflow stats__table"
<mask> />
<mask> </Card>
<mask> );
<mask>
</s> - client: fix default page size for dashboard tables </s> add defaultPageSize={100} </s> add defaultPageSize={100}
|
https://github.com/AdguardTeam/AdGuardHome/commit/701233a4b786495be2f7f8e5e33ebf041481df01
|
client/src/components/Dashboard/QueriedDomains.js
|
keep add keep keep keep keep keep
|
<mask> "path/filepath"
<mask> "strconv"
<mask>
<mask> "github.com/gobuffalo/packr"
<mask> "golang.org/x/crypto/ssh/terminal"
<mask> )
<mask>
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix() </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove NextFilterId++
</s> add </s> remove filter.ID = NextFilterId
</s> add filter.ID = assignUniqueFilterID()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
app.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask>
<mask> // Load filters from the disk
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i]
<mask> err = filter.load()
<mask> if err != nil {
<mask> // This is okay for the first start, the filter will be loaded later
<mask> log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
<mask> }
<mask> }
<mask>
<mask> address := net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
<mask>
<mask> runFiltersUpdatesTimer()
<mask>
<mask> http.Handle("/", optionalAuthHandler(http.FileServer(box)))
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove NextFilterId++
</s> add </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
app.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> userFilterID = 0 // special filter ID, always 0
<mask> )
<mask>
<mask> // Just a counter that we use for incrementing the filter ID
<mask> var NextFilterId = time.Now().Unix()
<mask>
<mask> // configuration is loaded from YAML
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type configuration struct {
<mask> ourConfigFilename string // Config filename (can be overriden via the command line arguments)
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove ID int64 // auto-assigned when filter is added (see NextFilterId)
</s> add ID int64 // auto-assigned when filter is added (see nextFilterID) </s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
config.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> URL string `json:"url"`
<mask> Name string `json:"name" yaml:"name"`
<mask> RulesCount int `json:"rulesCount" yaml:"-"`
<mask> LastUpdated time.Time `json:"lastUpdated,omitempty" yaml:"last_updated,omitempty"`
<mask> ID int64 // auto-assigned when filter is added (see NextFilterId)
<mask>
<mask> Contents []byte `json:"-" yaml:"-"` // not in yaml or json
<mask> }
<mask>
<mask> var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix() </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> remove filter.ID = NextFilterId
</s> add filter.ID = assignUniqueFilterID()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
config.go
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> // all entries we want to keep are at front, delete the rest
<mask> config.Filters = config.Filters[:i]
<mask> }
<mask>
<mask> // Set the next filter ID to max(filter.ID) + 1
<mask> for i := range config.Filters {
<mask> if NextFilterId < config.Filters[i].ID {
<mask> NextFilterId = config.Filters[i].ID + 1
<mask> }
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Saves configuration to the YAML file and also saves the user filter contents to a file
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix() </s> remove filter.ID = NextFilterId
</s> add filter.ID = assignUniqueFilterID()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
config.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask> }
<mask> }
<mask>
<mask> // Set necessary properties
<mask> filter.ID = NextFilterId
<mask> filter.Enabled = true
<mask> NextFilterId++
<mask>
<mask> // Download the filter contents
<mask> ok, err := filter.update(true)
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove NextFilterId++
</s> add </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
control.go
|
keep keep keep keep replace keep keep keep keep keep
|
<mask>
<mask> // Set necessary properties
<mask> filter.ID = NextFilterId
<mask> filter.Enabled = true
<mask> NextFilterId++
<mask>
<mask> // Download the filter contents
<mask> ok, err := filter.update(true)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Couldn't fetch filter from url %s: %s", filter.URL, err)
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove filter.ID = NextFilterId
</s> add filter.ID = assignUniqueFilterID() </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
}
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
control.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> // fetch URLs
<mask> updateCount := 0
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask> updated, err := filter.update(force)
<mask> if err != nil {
<mask> log.Printf("Failed to update filter %s: %s\n", filter.URL, err)
<mask> continue
<mask> }
<mask> if updated {
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> remove NextFilterId++
</s> add </s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
control.go
|
keep keep keep add keep keep keep keep keep keep
|
<mask> // Checks for filters updates
<mask> // If "force" is true -- does not check the filter's LastUpdated field
<mask> // Call "save" to persist the filter contents
<mask> func (filter *filter) update(force bool) (bool, error) {
<mask> if !filter.Enabled {
<mask> return false, nil
<mask> }
<mask> if !force && time.Since(filter.LastUpdated) <= updatePeriod {
<mask> return false, nil
<mask> }
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove // Added "ID" field to "filter" -- we need to populate this field now
// Added "config.ourDataDir" -- where we will now store filters contents
for i := range config.Filters {
filter := &config.Filters[i] // otherwise we will be operating on a copy
// Set the filter ID
log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
filter.ID = NextFilterId
NextFilterId++
// Forcibly update the filter
_, err := filter.update(true)
if err != nil {
log.Fatal(err)
}
// Saving it to the filters dir now
err = filter.save()
if err != nil {
log.Fatal(err)
}
}
// No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
</s> add // No more "dnsfilter.txt", filters are now kept in data/filters/ </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> remove NextFilterId++
</s> add </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
control.go
|
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep
|
<mask> func upgradeSchema0to1(diskConfig *map[string]interface{}) error {
<mask> trace("Called")
<mask>
<mask> // The first schema upgrade:
<mask> // Added "ID" field to "filter" -- we need to populate this field now
<mask> // Added "config.ourDataDir" -- where we will now store filters contents
<mask> for i := range config.Filters {
<mask> filter := &config.Filters[i] // otherwise we will be operating on a copy
<mask>
<mask> // Set the filter ID
<mask> log.Printf("Seting ID=%d for filter %s", NextFilterId, filter.URL)
<mask> filter.ID = NextFilterId
<mask> NextFilterId++
<mask>
<mask> // Forcibly update the filter
<mask> _, err := filter.update(true)
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask>
<mask> // Saving it to the filters dir now
<mask> err = filter.save()
<mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask> }
<mask>
<mask> // No more "dnsfilter.txt", filters are now loaded from config.ourDataDir/filters/
<mask> dnsFilterPath := filepath.Join(config.ourBinaryDir, "dnsfilter.txt")
<mask> _, err := os.Stat(dnsFilterPath)
<mask> if !os.IsNotExist(err) {
<mask> log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
<mask> err = os.Remove(dnsFilterPath)
</s> Protect against users deleting the filter ID's in the config file.
Incidentally, it also simplifies upgrade schema from 0 to 1. </s> remove // Load filters from the disk
for i := range config.Filters {
filter := &config.Filters[i]
err = filter.load()
if err != nil {
// This is okay for the first start, the filter will be loaded later
log.Printf("Couldn't load filter %d contents due to %s", filter.ID, err)
}
}
</s> add </s> add if filter.ID == 0 { // protect against users modifying the yaml and removing the ID
filter.ID = assignUniqueFilterID()
}
</s> add if filter.ID == 0 { // protect against users deleting the ID
filter.ID = assignUniqueFilterID()
} </s> remove // Set the next filter ID to max(filter.ID) + 1
for i := range config.Filters {
if NextFilterId < config.Filters[i].ID {
NextFilterId = config.Filters[i].ID + 1
}
}
</s> add updateUniqueFilterID(config.Filters) </s> remove NextFilterId++
</s> add </s> remove var NextFilterId = time.Now().Unix()
</s> add var nextFilterID int64 = time.Now().Unix()
|
https://github.com/AdguardTeam/AdGuardHome/commit/701fd10c1cc519d73e88c88b9be5dd9ad398276c
|
upgrade.go
|
keep keep add keep keep keep keep
|
<mask> return '';
<mask> };
<mask>
<mask> columns = [
<mask> {
<mask> Header: this.props.t('table_client'),
<mask> accessor: 'ip',
</s> * client: remove redundant table formatting for runtime clients table </s> remove Cell: ({ value }) => (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{value}
</span>
</div>
),
</s> add Cell: this.cellWrap, </s> remove Cell: (row) => {
if (row.value) {
return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={row.value}>
{row.value} <em>(IP)</em>
</span>
</div>
);
} else if (row.original && row.original.mac) {
return (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={row.original.mac}>
{row.original.mac} <em>(MAC)</em>
</span>
</div>
);
}
return '';
},
</s> add Cell: this.cellWrap,
|
https://github.com/AdguardTeam/AdGuardHome/commit/702db84e39bf6ee43de51ded9bd4dd154171f4ed
|
client/src/components/Settings/Clients/AutoClients.js
|
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace keep keep
|
<mask> {
<mask> Header: this.props.t('table_client'),
<mask> accessor: 'ip',
<mask> Cell: (row) => {
<mask> if (row.value) {
<mask> return (
<mask> <div className="logs__row logs__row--overflow">
<mask> <span className="logs__text" title={row.value}>
<mask> {row.value} <em>(IP)</em>
<mask> </span>
<mask> </div>
<mask> );
<mask> } else if (row.original && row.original.mac) {
<mask> return (
<mask> <div className="logs__row logs__row--overflow">
<mask> <span className="logs__text" title={row.original.mac}>
<mask> {row.original.mac} <em>(MAC)</em>
<mask> </span>
<mask> </div>
<mask> );
<mask> }
<mask>
<mask> return '';
<mask> },
<mask> },
<mask> {
<mask> Header: this.props.t('table_name'),
<mask> accessor: 'name',
<mask> Cell: ({ value }) => (
<mask> <div className="logs__row logs__row--overflow">
<mask> <span className="logs__text" title={value}>
<mask> {value}
<mask> </span>
<mask> </div>
<mask> ),
<mask> },
<mask> {
</s> * client: remove redundant table formatting for runtime clients table </s> add cellWrap = ({ value }) => (
<div className="logs__row logs__row--overflow">
<span className="logs__text" title={value}>
{value}
</span>
</div>
);
|
https://github.com/AdguardTeam/AdGuardHome/commit/702db84e39bf6ee43de51ded9bd4dd154171f4ed
|
client/src/components/Settings/Clients/AutoClients.js
|
keep keep keep replace keep replace keep keep keep
|
<mask> setts = RequestFilteringSettings{}
<mask> setts.FilteringEnabled = true
<mask> if c != nil {
<mask> c.SafeBrowsingCacheSize = 1000
<mask> c.SafeSearchCacheSize = 1000
<mask> c.ParentalCacheSize = 1000
<mask> c.CacheTime = 30
<mask> setts.SafeSearchEnabled = c.SafeSearchEnabled
<mask> setts.SafeBrowsingEnabled = c.SafeBrowsingEnabled
</s> * SB/PC: use 4-character hash in request
* use hash prefix as the cache key
Squashed commit of the following:
commit d719a84ee9b9cf43aaab4f53d07451645ea836db
Merge: d9d6d443 97df1989
Author: Simon Zolin <[email protected]>
Date: Thu Aug 13 11:41:28 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit d9d6d44376c44959f2216b08e577d8e5c5f65bff
Merge: 0a8b2483 de92c852
Author: Simon Zolin <[email protected]>
Date: Thu Aug 13 11:23:14 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit 0a8b24839683683a9d327ecf57a7d182b3996b1d
Merge: 0255a24a 9b9902f0
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 20:21:22 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit 0255a24a191efd2e4ef23d6a00a7a9fed8831730
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:16:57 2020 +0300
- TestServerCustomClientUpstream(): fix
commit d2311902f887be9621a9d9312c73f899dd269440
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:07:12 2020 +0300
* SB/PC: hard-code Family server IP addresses to prevent from requesting them at runtime
commit ee340108f11f98d49a7af2a7e8a228c25ab1537a
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:05:57 2020 +0300
* dnsproxy v0.30.1
commit f5f53ba7116ad525204d00b80352202eee88b78c
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 14:53:23 2020 +0300
minor
commit fb4631e2cd570b0fd5ae26ec2b1890361275a5a8
Author: Simon Zolin <[email protected]>
Date: Mon Aug 10 20:07:27 2020 +0300
* SB/PC: implement new cache
commit f9f58461a6efbcfacd798f7640a4645cf1971cb2
Author: Simon Zolin <[email protected]>
Date: Fri Aug 7 19:31:05 2020 +0300
doc
commit ed69626a6c119ab1a3b187f5afbd4cef708c3159
Author: Simon Zolin <[email protected]>
Date: Fri Aug 7 18:25:57 2020 +0300
* SB/PC: use hostname prefix for cache
commit afa8040c8c0836c7e59e6fb9aaf1caccd132ea8f
Author: Simon Zolin <[email protected]>
Date: Fri Jul 31 11:19:49 2020 +0300
* SB/PC: use 4-character hash in request </s> remove err := s.Start()
if err != nil {
t.Fatalf("Failed to start server: %s", err)
}
</s> add </s> remove proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
</s> add proxyConfig.TLSListenAddr = []*net.TCPAddr{s.conf.TLSListenAddr} </s> add assert.Nil(t, s.Start())
</s> remove func TestSafeBrowsingHash(t *testing.T) {
q, hashes := hostnameToHashParam("1.2.3.4.5.6")
assert.Equal(t, "0132d0fa.b5413b4e.5fa067c1.e7f6c011.", q)
assert.Equal(t, 4, len(hashes))
}
</s> add </s> remove UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
</s> add UDPListenAddr: []*net.UDPAddr{s.conf.UDPListenAddr},
TCPListenAddr: []*net.TCPAddr{s.conf.TCPListenAddr},
|
https://github.com/AdguardTeam/AdGuardHome/commit/705a9d909dfb37bb759ca1525af4d3748444f5f4
|
dnsfilter/dnsfilter_test.go
|
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep
|
<mask> }
<mask>
<mask> // SAFE BROWSING
<mask>
<mask> func TestSafeBrowsingHash(t *testing.T) {
<mask> q, hashes := hostnameToHashParam("1.2.3.4.5.6")
<mask> assert.Equal(t, "0132d0fa.b5413b4e.5fa067c1.e7f6c011.", q)
<mask> assert.Equal(t, 4, len(hashes))
<mask> }
<mask>
<mask> func TestSafeBrowsing(t *testing.T) {
<mask> d := NewForTest(&Config{SafeBrowsingEnabled: true}, nil)
<mask> defer d.Close()
<mask> gctx.stats.Safebrowsing.Requests = 0
<mask> d.checkMatch(t, "wmconvirus.narod.ru")
</s> * SB/PC: use 4-character hash in request
* use hash prefix as the cache key
Squashed commit of the following:
commit d719a84ee9b9cf43aaab4f53d07451645ea836db
Merge: d9d6d443 97df1989
Author: Simon Zolin <[email protected]>
Date: Thu Aug 13 11:41:28 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit d9d6d44376c44959f2216b08e577d8e5c5f65bff
Merge: 0a8b2483 de92c852
Author: Simon Zolin <[email protected]>
Date: Thu Aug 13 11:23:14 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit 0a8b24839683683a9d327ecf57a7d182b3996b1d
Merge: 0255a24a 9b9902f0
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 20:21:22 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit 0255a24a191efd2e4ef23d6a00a7a9fed8831730
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:16:57 2020 +0300
- TestServerCustomClientUpstream(): fix
commit d2311902f887be9621a9d9312c73f899dd269440
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:07:12 2020 +0300
* SB/PC: hard-code Family server IP addresses to prevent from requesting them at runtime
commit ee340108f11f98d49a7af2a7e8a228c25ab1537a
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:05:57 2020 +0300
* dnsproxy v0.30.1
commit f5f53ba7116ad525204d00b80352202eee88b78c
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 14:53:23 2020 +0300
minor
commit fb4631e2cd570b0fd5ae26ec2b1890361275a5a8
Author: Simon Zolin <[email protected]>
Date: Mon Aug 10 20:07:27 2020 +0300
* SB/PC: implement new cache
commit f9f58461a6efbcfacd798f7640a4645cf1971cb2
Author: Simon Zolin <[email protected]>
Date: Fri Aug 7 19:31:05 2020 +0300
doc
commit ed69626a6c119ab1a3b187f5afbd4cef708c3159
Author: Simon Zolin <[email protected]>
Date: Fri Aug 7 18:25:57 2020 +0300
* SB/PC: use hostname prefix for cache
commit afa8040c8c0836c7e59e6fb9aaf1caccd132ea8f
Author: Simon Zolin <[email protected]>
Date: Fri Jul 31 11:19:49 2020 +0300
* SB/PC: use 4-character hash in request </s> remove err := s.Start()
if err != nil {
t.Fatalf("Failed to start server: %s", err)
}
</s> add </s> remove proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
</s> add proxyConfig.TLSListenAddr = []*net.TCPAddr{s.conf.TLSListenAddr} </s> remove c.SafeBrowsingCacheSize = 1000
</s> add c.SafeBrowsingCacheSize = 10000
c.ParentalCacheSize = 10000 </s> remove c.ParentalCacheSize = 1000
</s> add </s> add assert.Nil(t, s.Start())
</s> remove UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
</s> add UDPListenAddr: []*net.UDPAddr{s.conf.UDPListenAddr},
TCPListenAddr: []*net.TCPAddr{s.conf.TCPListenAddr},
|
https://github.com/AdguardTeam/AdGuardHome/commit/705a9d909dfb37bb759ca1525af4d3748444f5f4
|
dnsfilter/dnsfilter_test.go
|
keep keep keep keep replace replace keep keep keep keep keep
|
<mask>
<mask> // createProxyConfig creates and validates configuration for the main proxy
<mask> func (s *Server) createProxyConfig() (proxy.Config, error) {
<mask> proxyConfig := proxy.Config{
<mask> UDPListenAddr: s.conf.UDPListenAddr,
<mask> TCPListenAddr: s.conf.TCPListenAddr,
<mask> Ratelimit: int(s.conf.Ratelimit),
<mask> RatelimitWhitelist: s.conf.RatelimitWhitelist,
<mask> RefuseAny: s.conf.RefuseAny,
<mask> CacheMinTTL: s.conf.CacheMinTTL,
<mask> CacheMaxTTL: s.conf.CacheMaxTTL,
</s> * SB/PC: use 4-character hash in request
* use hash prefix as the cache key
Squashed commit of the following:
commit d719a84ee9b9cf43aaab4f53d07451645ea836db
Merge: d9d6d443 97df1989
Author: Simon Zolin <[email protected]>
Date: Thu Aug 13 11:41:28 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit d9d6d44376c44959f2216b08e577d8e5c5f65bff
Merge: 0a8b2483 de92c852
Author: Simon Zolin <[email protected]>
Date: Thu Aug 13 11:23:14 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit 0a8b24839683683a9d327ecf57a7d182b3996b1d
Merge: 0255a24a 9b9902f0
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 20:21:22 2020 +0300
Merge remote-tracking branch 'origin/master' into sbpc
commit 0255a24a191efd2e4ef23d6a00a7a9fed8831730
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:16:57 2020 +0300
- TestServerCustomClientUpstream(): fix
commit d2311902f887be9621a9d9312c73f899dd269440
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:07:12 2020 +0300
* SB/PC: hard-code Family server IP addresses to prevent from requesting them at runtime
commit ee340108f11f98d49a7af2a7e8a228c25ab1537a
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 17:05:57 2020 +0300
* dnsproxy v0.30.1
commit f5f53ba7116ad525204d00b80352202eee88b78c
Author: Simon Zolin <[email protected]>
Date: Wed Aug 12 14:53:23 2020 +0300
minor
commit fb4631e2cd570b0fd5ae26ec2b1890361275a5a8
Author: Simon Zolin <[email protected]>
Date: Mon Aug 10 20:07:27 2020 +0300
* SB/PC: implement new cache
commit f9f58461a6efbcfacd798f7640a4645cf1971cb2
Author: Simon Zolin <[email protected]>
Date: Fri Aug 7 19:31:05 2020 +0300
doc
commit ed69626a6c119ab1a3b187f5afbd4cef708c3159
Author: Simon Zolin <[email protected]>
Date: Fri Aug 7 18:25:57 2020 +0300
* SB/PC: use hostname prefix for cache
commit afa8040c8c0836c7e59e6fb9aaf1caccd132ea8f
Author: Simon Zolin <[email protected]>
Date: Fri Jul 31 11:19:49 2020 +0300
* SB/PC: use 4-character hash in request </s> remove proxyConfig.TLSListenAddr = s.conf.TLSListenAddr
</s> add proxyConfig.TLSListenAddr = []*net.TCPAddr{s.conf.TLSListenAddr} </s> remove func TestSafeBrowsingHash(t *testing.T) {
q, hashes := hostnameToHashParam("1.2.3.4.5.6")
assert.Equal(t, "0132d0fa.b5413b4e.5fa067c1.e7f6c011.", q)
assert.Equal(t, 4, len(hashes))
}
</s> add </s> remove err := s.Start()
if err != nil {
t.Fatalf("Failed to start server: %s", err)
}
</s> add </s> remove c.SafeBrowsingCacheSize = 1000
</s> add c.SafeBrowsingCacheSize = 10000
c.ParentalCacheSize = 10000 </s> add assert.Nil(t, s.Start())
</s> remove c.ParentalCacheSize = 1000
</s> add
|
https://github.com/AdguardTeam/AdGuardHome/commit/705a9d909dfb37bb759ca1525af4d3748444f5f4
|
dnsforward/config.go
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.