docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
const isDev = BUILD_ENV === BUILD_ENVS.dev;
| <mask>
<mask> const BUILD_ENV = BUILD_ENVS[process.env.BUILD_ENV];
<mask>
<mask> const config = {
<mask> mode: BUILD_ENV,
<mask> target: 'web',
<mask> context: RESOURCES_PATH,
<mask> entry: {
<mask> main: ENTRY_REACT,
</s> Pull request #730: + client: Add Hot Module Replacement
Merg... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.common.js |
filename: '[name].[hash].js', | <mask> login: ENTRY_LOGIN,
<mask> },
<mask> output: {
<mask> path: PUBLIC_PATH,
<mask> filename: '[name].[chunkhash].js',
<mask> },
<mask> resolve: {
<mask> modules: ['node_modules'],
<mask> alias: {
<mask> MainRoot: path.resolve(__dirname, '... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.common.js |
// TODO: change to '@hot-loader/react-dom' when v16.13.1 is released
// https://stackoverflow.com/a/62671689/12942752
'react-dom': 'react-dom', | <mask> MainRoot: path.resolve(__dirname, '../'),
<mask> ClientRoot: path.resolve(__dirname, './src'),
<mask> },
<mask> },
<mask> module: {
<mask> rules: [
</s> Pull request #730: + client: Add Hot Module Replacement
Merge in DNS/adguard-home from feature/hmr to ma... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.common.js |
{
test: /\.ya?ml$/,
type: 'json',
use: 'yaml-loader',
}, | <mask> },
<mask> },
<mask> module: {
<mask> rules: [
<mask> {
<mask> test: /\.css$/i,
<mask> use: [
<mask> 'style-loader',
<mask> {
<mask> loader: MiniCssExtractPlugin.loader,
<... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.common.js |
{
loader: MiniCssExtractPlugin.loader,
options: {
hmr: isDev,
},
}, | <mask> {
<mask> test: /\.css$/i,
<mask> use: [
<mask> 'style-loader',
<mask> MiniCssExtractPlugin.loader,
<mask> {
<mask> loader: 'css-loader',
<mask> options: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.common.js |
filename: isDev ? '[name].css' : '[name].[hash].css',
chunkFilename: isDev ? '[id].css' : '[id].[hash].css', | <mask> filename: 'login.html',
<mask> template: HTML_LOGIN_PATH,
<mask> }),
<mask> new MiniCssExtractPlugin({
<mask> filename: '[name].[contenthash].css',
<mask> }),
<mask> new CopyPlugin({
<mask> patterns: [
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.common.js |
const yaml = require('js-yaml');
const fs = require('fs'); | <mask> const merge = require('webpack-merge');
<mask> const common = require('./webpack.common.js');
<mask> const { BASE_URL } = require('./constants');
<mask>
<mask> const ZERO_HOST = '0.0.0.0';
<mask> const LOCALHOST = '127.0.0.1';
<mask> const DEFAULT_PORT = 80;
</s> Pull request #730: + client: Add Hot Mod... | [
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.dev.js |
rules: [
{
test: /\.js$/,
exclude: /node_modules/,
loader: 'eslint-loader',
options: {
failOnError: true,
configFile: 'prod.eslintrc',
}, | <mask>
<mask>
<mask> module.exports = merge(common, {
<mask> module: {
<mask> rules: [{
<mask> test: /\.js$/,
<mask> exclude: /node_modules/,
<mask> loader: 'eslint-loader',
<mask> options: {
<mask> failOnError: true,
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.prod.js |
], | <mask> options: {
<mask> failOnError: true,
<mask> configFile: 'prod.eslintrc',
<mask> },
<mask> }],
<mask> },
<mask> plugins: [
<mask> new StyleLintPlugin({
<mask> files: '**/*.css',
<mask> }),
</s> Pull requ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97df19898f98e2fb8067765a56a6bc918b5d9051 | client/webpack.prod.js |
"form_error_negative": "Must be equal to 0 or greater", | <mask> "form_error_mac_format": "Invalid MAC format",
<mask> "form_error_positive": "Must be greater than 0",
<mask> "dhcp_form_gateway_input": "Gateway IP",
<mask> "dhcp_form_subnet_input": "Subnet mask",
<mask> "dhcp_form_range_title": "Range of IP addresses",
<mask> "dhcp_form_range_sta... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/__locales/en.json |
"dns_config": "DNS server configuration", | <mask> "query_log_configuration": "Logs configuration",
<mask> "query_log_disabled": "The query log is disabled and can be configured in the <0>settings</0>",
<mask> "query_log_strict_search": "Use double quotes for strict search",
<mask> "query_log_retention_confirm": "Are you sure you want to chan... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/__locales/en.json |
<div className="form__desc mb-3">
<Trans components={[<a href="#dns" key="0">link</a>]}>
upstream_dns_client_desc
</Trans>
</div> | <mask> </div>
<mask> </div>
<mask> </div>
<mask> <div label="upstream" title={props.t('upstream_dns')}>
<mask> <Field
<mask> id="upstreams"
<mask> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Clients/Form.js |
import Config from './Config'; | <mask>
<mask> import Upstream from './Upstream';
<mask> import Access from './Access';
<mask> import Rewrites from './Rewrites';
<mask> import PageTitle from '../../ui/PageTitle';
<mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
</s>... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Dns/index.js |
this.props.getDnsConfig(); | <mask> this.props.getDnsSettings();
<mask> this.props.getAccessList();
<mask> this.props.getRewritesList();
<mask> }
<mask>
<mask> render() {
<mask> const {
<mask> t,
</s> + client: handle EDNS Client Subnet setting </s> remove setDnsConfig,
</s... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Dns/index.js |
dnsConfig,
setDnsConfig, | <mask> deleteRewrite,
<mask> toggleRewritesModal,
<mask> } = this.props;
<mask>
<mask> const isDataLoading = dashboard.processingDnsSettings
<mask> || access.processing
<mask> || rewrites.processing
</s> + client: handle EDNS Client Subnet setting... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Dns/index.js |
const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| rewrites.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !rewrites.processing
&... | <mask> deleteRewrite,
<mask> toggleRewritesModal,
<mask> } = this.props;
<mask>
<mask> const isDataLoading =
<mask> dashboard.processingDnsSettings || access.processing || rewrites.processing;
<mask> const isDataReady =
<mask> !dashboard.p... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Dns/index.js |
<Config
dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig}
/> | <mask> {isDataReady && (
<mask> <Fragment>
<mask> <Upstream
<mask> upstreamDns={dashboard.upstreamDns}
<mask> bootstrapDns={dashboard.bootstrapDns}
<mask> allServers={das... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Dns/index.js |
dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired,
getDnsConfig: PropTypes.func.isRequired, | <mask> addRewrite: PropTypes.func.isRequired,
<mask> deleteRewrite: PropTypes.func.isRequired,
<mask> toggleRewritesModal: PropTypes.func.isRequired,
<mask> getDnsSettings: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces(... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/Dns/index.js |
<mask> import Services from './Services';
<mask> import StatsConfig from './StatsConfig';
<mask> import LogsConfig from './LogsConfig';
<mask> import FiltersConfig from './FiltersConfig';
<mask> import DnsConfig from './DnsConfig';
<mask>
<mask> import Checkbox from '../ui/Checkbox';
<mask> import Loading from... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/index.js | |
<mask> this.props.getBlockedServices();
<mask> this.props.getStatsConfig();
<mask> this.props.getLogsConfig();
<mask> this.props.getFilteringStatus();
<mask> this.props.getDnsConfig();
<mask> }
<mask>
<mask> renderSettings = (settings) => {
<mask> const ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/index.js | |
<mask> setStatsConfig,
<mask> resetStats,
<mask> stats,
<mask> queryLogs,
<mask> dnsConfig,
<mask> setLogsConfig,
<mask> clearLogs,
<mask> filtering,
<mask> setFiltersConfig,
<mask> setDnsCo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/index.js | |
<mask> setLogsConfig,
<mask> clearLogs,
<mask> filtering,
<mask> setFiltersConfig,
<mask> setDnsConfig,
<mask> t,
<mask> } = this.props;
<mask>
<mask> const isDataReady =
<mask> !settings.processing &&
</s> +... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/index.js | |
<mask> {this.renderSettings(settings.settingsList)}
<mask> </div>
<mask> </Card>
<mask> </div>
<mask> <div className="col-md-12">
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/index.js | |
<mask> setStatsConfig: PropTypes.func.isRequired,
<mask> resetStats: PropTypes.func.isRequired,
<mask> setFiltersConfig: PropTypes.func.isRequired,
<mask> getFilteringStatus: PropTypes.func.isRequired,
<mask> getDnsConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<m... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/components/Settings/index.js | |
import { getDnsConfig, setDnsConfig } from '../actions/dnsConfig'; | <mask> deleteRewrite,
<mask> toggleRewritesModal,
<mask> } from '../actions/rewrites';
<mask> import Dns from '../components/Settings/Dns';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> dashboard, settings, access, rewrites, dnsConfig,
</s> + client: handle EDNS ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Dns.js |
dashboard, settings, access, rewrites, dnsConfig, | <mask> import Dns from '../components/Settings/Dns';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> dashboard, settings, access, rewrites,
<mask> } = state;
<mask> const props = {
<mask> dashboard,
<mask> settings,
<mask> access,
</s> + c... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Dns.js |
dnsConfig, | <mask> dashboard,
<mask> settings,
<mask> access,
<mask> rewrites,
<mask> };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> handleUpstreamChange,
</s> + client: handle EDNS Client Subnet setting </s> remove dashboard, sett... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Dns.js |
getDnsConfig,
setDnsConfig, | <mask> toggleRewritesModal,
<mask> getDnsSettings,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
<mask> )(Dns);
</s> + client: handle EDNS Client Subnet setting </s> remove getDnsConfig,
setDnsConfig,
</s> add </s> remove getDn... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Dns.js |
<mask> import { getBlockedServices, setBlockedServices } from '../actions/services';
<mask> import { getStatsConfig, setStatsConfig, resetStats } from '../actions/stats';
<mask> import { clearLogs, getLogsConfig, setLogsConfig } from '../actions/queryLogs';
<mask> import { getFilteringStatus, setFiltersConfig } fro... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Settings.js | |
settings, services, stats, queryLogs, filtering, | <mask> import Settings from '../components/Settings';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const {
<mask> settings, services, stats, queryLogs, filtering, dnsConfig,
<mask> } = state;
<mask> const props = {
<mask> settings,
<mask> services,
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Settings.js |
<mask> services,
<mask> stats,
<mask> queryLogs,
<mask> filtering,
<mask> dnsConfig,
<mask> };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
</s> + client: handle EDNS Client Subnet setting </s> remove settings, services, st... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Settings.js | |
<mask> getLogsConfig,
<mask> setLogsConfig,
<mask> getFilteringStatus,
<mask> setFiltersConfig,
<mask> getDnsConfig,
<mask> setDnsConfig,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
</s> + client: handle EDNS Client Subn... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/containers/Settings.js | |
export const biggerOrEqualZero = (value) => {
if (value < 0) {
return <Trans>form_error_negative</Trans>;
}
return false;
};
| <mask> return false;
<mask> };
<mask>
<mask> export const port = (value) => {
<mask> if ((value || value === 0) && (value < 80 || value > 65535)) {
<mask> return <Trans>form_error_port_range</Trans>;
<mask> }
<mask> return false;
<mask> };
</s> + client: handle EDNS Client Subnet sett... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/helpers/form.js |
const DEFAULT_BLOCKING_IPV4 = '0.0.0.0';
const DEFAULT_BLOCKING_IPV6 = '::';
| <mask> import * as actions from '../actions/dnsConfig';
<mask> import { BLOCKING_MODES } from '../helpers/constants';
<mask>
<mask> const dnsConfig = handleActions(
<mask> {
<mask> [actions.getDnsConfigRequest]: state => ({ ...state, processingGetConfig: true }),
<mask> [actions.getDnsConfig... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/reducers/dnsConfig.js |
[actions.getDnsConfigSuccess]: (state, { payload }) => {
const {
blocking_ipv4,
blocking_ipv6,
...values
} = payload;
return {
...state,
...values,
blocking_ipv4: blocking_ipv4 ||... | <mask> {
<mask> [actions.getDnsConfigRequest]: state => ({ ...state, processingGetConfig: true }),
<mask> [actions.getDnsConfigFailure]: state =>
<mask> ({ ...state, processingGetConfig: false }),
<mask> [actions.getDnsConfigSuccess]: (state, { payload }) => ({
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/reducers/dnsConfig.js |
blocking_ipv4: DEFAULT_BLOCKING_IPV4,
blocking_ipv6: DEFAULT_BLOCKING_IPV6,
edns_cs_enabled: false, | <mask> processingGetConfig: false,
<mask> processingSetConfig: false,
<mask> blocking_mode: BLOCKING_MODES.nxdomain,
<mask> ratelimit: 20,
<mask> blocking_ipv4: '',
<mask> blocking_ipv6: '',
<mask> },
<mask> );
<mask>
<mask> export default dnsConfig;
</s> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/97e77cab643d6784067ce97c0f03ec3e4612c2c9 | client/src/reducers/dnsConfig.js |
title: 'Block domains using filters and hosts files',
subtitle: 'You can setup blocking rules in the <a href="#filters">Filters</a> settings.', | <mask> class Settings extends Component {
<mask> settings = {
<mask> filtering: {
<mask> enabled: false,
<mask> title: this.props.t('Block domains using filters and hosts files'),
<mask> subtitle: this.props.t('You can setup blocking rules in the <a href="#filters">... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/Settings/index.js |
title: 'Use AdGuard browsing security web service',
subtitle: 'AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.', | <mask> subtitle: this.props.t('You can setup blocking rules in the <a href="#filters">Filters</a> settings.'),
<mask> },
<mask> safebrowsing: {
<mask> enabled: false,
<mask> title: this.props.t('Use AdGuard browsing security web service'),
<mask> sub... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/Settings/index.js |
title: 'Use AdGuard parental control web service',
subtitle: 'AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.', | <mask> subtitle: this.props.t('AdGuard Home will check if domain is blacklisted by the browsing security web service. It will use privacy-friendly lookup API to perform the check: only a short prefix of the domain name SHA256 hash is sent to the server.'),
<mask> },
<mask> parental: {
<m... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/Settings/index.js |
title: 'Enforce safe search',
subtitle: 'AdGuard Home can enforce safe search in the following search engines: Google, Bing, Yandex.', | <mask> subtitle: this.props.t('AdGuard Home will check if domain contains adult materials. It uses the same privacy-friendly API as the browsing security web service.'),
<mask> },
<mask> safesearch: {
<mask> enabled: false,
<mask> title: this.props.t('Enforce saf... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/Settings/index.js |
import { withNamespaces } from 'react-i18next'; | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import './Checkbox.css';
<mask>
<mask> class Checkbox extends Component {
<mask> render() {
</s> Fix i18n in setting page not update when click change language button at footer </s> remove ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/ui/Checkbox.js |
t, | <mask> enabled,
<mask> handleChange,
<mask> } = this.props;
<mask> return (
<mask> <div className="form__group">
<mask> <label className="checkbox checkbox--settings">
</s> Fix i18n in setting page not update when click change language button at... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/ui/Checkbox.js |
<span className="checkbox__label-title">{ t(title) }</span>
<span className="checkbox__label-subtitle" dangerouslySetInnerHTML={{ __html: t(subtitle) }}/> | <mask> <span className="checkbox__marker"/>
<mask> <input type="checkbox" className="checkbox__input" onChange={handleChange} checked={enabled}/>
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text">
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/ui/Checkbox.js |
t: PropTypes.func, | <mask> enabled: PropTypes.bool.isRequired,
<mask> handleChange: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Checkbox);
</s> Fix i18n in setting page not update when click change language button at footer </s> remove export default Checkbox;
</s> add export default ... | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/ui/Checkbox.js |
export default withNamespaces()(Checkbox); | <mask> enabled: PropTypes.bool.isRequired,
<mask> handleChange: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default Checkbox;
</s> Fix i18n in setting page not update when click change language button at footer </s> remove title: this.props.t('Enforce safe search'),
... | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9863c1f1acf2a1977bdc825b11bc5301de915619 | client/src/components/ui/Checkbox.js |
<mask> }
<mask>
<mask> // Initialize urlfilter objects
<mask> func (d *Dnsfilter) initFiltering(allowFilters, blockFilters []Filter) error {
<mask> d.engineLock.Lock()
<mask> defer d.engineLock.Unlock()
<mask> d.reset()
<mask> rulesStorage, filteringEngine, err := createFilteringEngine(blockFilters)
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/98b6eb320f951fca5d3588cb037a6df741d8fecd | dnsfilter/dnsfilter.go | |
d.engineLock.Lock()
d.reset() | <mask> if err != nil {
<mask> return err
<mask> }
<mask> d.rulesStorage = rulesStorage
<mask> d.filteringEngine = filteringEngine
<mask> d.rulesStorageWhite = rulesStorageWhite
<mask> d.filteringEngineWhite = filteringEngineWhite
<mask> d.engineLock.Unlock()
<mask>
</s> - DNS: didn't process request... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/98b6eb320f951fca5d3588cb037a6df741d8fecd | dnsfilter/dnsfilter.go |
d.engineLock.Unlock() | <mask> d.rulesStorageWhite = rulesStorageWhite
<mask> d.filteringEngineWhite = filteringEngineWhite
<mask>
<mask> // Make sure that the OS reclaims memory as soon as possible
<mask> debug.FreeOSMemory()
<mask> log.Debug("initialized filtering engine")
</s> - DNS: didn't process requests while updating filt... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/98b6eb320f951fca5d3588cb037a6df741d8fecd | dnsfilter/dnsfilter.go |
<mask> sudo: false
<mask> go:
<mask> - 1.11.x
<mask> - 1.x
<mask>
<mask> cache:
<mask> directories:
<mask> - $HOME/.cache/go-build
<mask> - $HOME/gopath/pkg/mod
<mask> - $HOME/Library/Caches/go-build
<mask>
<mask> os:
<mask> - linux
<mask> - osx
<mask>
<mask> before_install:
</... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/98bfb82787e4e78a8d7006a19c372feb6b204ea9 | .travis.yml | |
cache:
directories:
- $HOME/.cache/go-build
- $HOME/gopath/pkg/mod
- $HOME/Library/Caches/go-build
| <mask> install:
<mask> - npm --prefix client install
<mask>
<mask> script:
<mask> - node -v
<mask> - npm -v
<mask> # Run tests
<mask> - go test -race -v -bench=. -coverprofile=coverage.txt -covermode=atomic ./...
</s> Add Docker Hub image builds </s> remove
cache:
directories:
- $HOME/.cache/... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/98bfb82787e4e78a8d7006a19c372feb6b204ea9 | .travis.yml |
<mask> - make build/static/index.html
<mask> - make
<mask>
<mask> after_success:
<mask> - bash <(curl -s https://codecov.io/bash) </s> Add Docker Hub image builds </s> remove
cache:
directories:
- $HOME/.cache/go-build
- $HOME/gopath/pkg/mod
- $HOME/Library/Caches/go-build
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/98bfb82787e4e78a8d7006a19c372feb6b204ea9 | .travis.yml | |
RaSlaacOnly bool `yaml:"ra_slaac_only"` // send ICMPv6.RA packets without MO flags
RaAllowSlaac bool `yaml:"ra_allow_slaac"` // send ICMPv6.RA packets with MO flags
| <mask> RangeStart string `yaml:"range_start"`
<mask>
<mask> LeaseDuration uint32 `yaml:"lease_duration"` // in seconds
<mask>
<mask> ipStart net.IP // starting IP address for dynamic leases
<mask> leaseTime time.Duration // the time during which a dynamic lease is considered valid
<mask> dnsIPA... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/990f531f54dc31119e93a2d9762d11680282f772 | dhcpd/server.go |
ra raCtx // RA module
| <mask> sid dhcpv6.Duid
<mask>
<mask> conf V6ServerConf
<mask> }
<mask>
<mask> // WriteDiskConfig4 - write configuration
<mask> func (s *v6Server) WriteDiskConfig4(c *V4ServerConf) {
</s> + DHCP: add ra_slaac_only, ra_allow_slaac config settings
Close # 2076
Squashed commit of the following:
commit... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/990f531f54dc31119e93a2d9762d11680282f772 | dhcpd/v6.go |
<mask> if err != nil {
<mask> return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
<mask> }
<mask>
<mask> log.Debug("DHCPv6: starting...")
<mask> s.conf.dnsIPAddrs = getIfaceIPv6(*iface)
<mask> if len(s.conf.dnsIPAddrs) == 0 {
<mask> log.Debug("DHCPv6: no IPv6 address f... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/990f531f54dc31119e93a2d9762d11680282f772 | dhcpd/v6.go | |
err = s.initRA(iface)
if err != nil {
return err
}
// don't initialize DHCPv6 server if we must force the clients to use SLAAC
if s.conf.RaSlaacOnly {
log.Debug("DHCPv6: not starting DHCPv6 server due to ra_slaac_only=true")
return nil
}
log.Debug("DHCPv6: starting...")
| <mask> return nil
<mask> }
<mask>
<mask> if len(iface.HardwareAddr) != 6 {
<mask> return fmt.Errorf("DHCPv6: invalid MAC %s", iface.HardwareAddr)
<mask> }
<mask> s.sid = dhcpv6.Duid{
</s> + DHCP: add ra_slaac_only, ra_allow_slaac config settings
Close # 2076
Squashed commit of the following:
commit ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/990f531f54dc31119e93a2d9762d11680282f772 | dhcpd/v6.go |
s.ra.Close()
// DHCPv6 server may not be initialized if ra_slaac_only=true | <mask> // Stop - stop server
<mask> func (s *v6Server) Stop() {
<mask> if s.srv == nil {
<mask> return
<mask> }
<mask>
<mask> log.Debug("DHCPv6: stopping")
</s> + DHCP: add ra_slaac_only, ra_allow_slaac config settings
Close # 2076
Squashed commit of the following:
commit 7a938fc6ffa0adc1e705f59778d7e7... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/990f531f54dc31119e93a2d9762d11680282f772 | dhcpd/v6.go |
if s.conf.ipStart == nil || s.conf.ipStart.To16() == nil { | <mask> return s, nil
<mask> }
<mask>
<mask> s.conf.ipStart = net.ParseIP(conf.RangeStart)
<mask> if s.conf.ipStart == nil {
<mask> return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
<mask> }
<mask>
<mask> if conf.LeaseDuration == 0 {
<mask> s.conf.leaseTime = time.Hour * ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/990f531f54dc31119e93a2d9762d11680282f772 | dhcpd/v6.go |
export const getAllBlockedServicesRequest = createAction('GET_ALL_BLOCKED_SERVICES_REQUEST');
export const getAllBlockedServicesFailure = createAction('GET_ALL_BLOCKED_SERVICES_FAILURE');
export const getAllBlockedServicesSuccess = createAction('GET_ALL_BLOCKED_SERVICES_SUCCESS');
export const getAllBlockedServices = ... | <mask> }
<mask> };
<mask>
<mask> export const setBlockedServicesRequest = createAction('SET_BLOCKED_SERVICES_REQUEST');
<mask> export const setBlockedServicesFailure = createAction('SET_BLOCKED_SERVICES_FAILURE');
<mask> export const setBlockedServicesSuccess = createAction('SET_BLOCKED_SERVICES_SUCCESS');
... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/actions/services.js |
BLOCKED_SERVICES_ALL = { path: 'blocked_services/all', method: 'GET' };
| <mask> BLOCKED_SERVICES_SET = { path: 'blocked_services/set', method: 'POST' };
<mask>
<mask> getBlockedServicesAvailableServices() {
<mask> const { path, method } = this.BLOCKED_SERVICES_SERVICES;
<mask> return this.makeRequest(path, method);
<mask> }
</s> Pull request: 3972-hostlis... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/api/Api.js |
getAllBlockedServices() {
const { path, method } = this.BLOCKED_SERVICES_ALL;
return this.makeRequest(path, method);
}
| <mask> }
<mask>
<mask> getBlockedServices() {
<mask> const { path, method } = this.BLOCKED_SERVICES_LIST;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> setBlockedServices(config) {
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed comm... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/api/Api.js |
import { FORM_NAME } from '../../../helpers/constants'; | <mask> import flow from 'lodash/flow';
<mask>
<mask> import { toggleAllServices } from '../../../helpers/helpers';
<mask> import { renderServiceField } from '../../../helpers/form';
<mask> import { FORM_NAME, SERVICES } from '../../../helpers/constants';
<mask>
<mask> const Form = (props) => {
<mask> cons... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
blockedServices, | <mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit,
<mask> change,
<mask> pristine,
<mask> submitting,
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
onClick={() => toggleAllServices(blockedServices, change, true)} | <mask> <button
<mask> type="button"
<mask> className="btn btn-secondary btn-block"
<mask> disabled={processing || processingSet}
<mask> onClick={() => toggleAllServices(SERVICES, ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
onClick={() => toggleAllServices(blockedServices, change, false)} | <mask> <button
<mask> type="button"
<mask> className="btn btn-secondary btn-block"
<mask> disabled={processing || processingSet}
<mask> onClick={() => toggleAllServices(SERVICES, ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
{blockedServices.map((service) => ( | <mask> </button>
<mask> </div>
<mask> </div>
<mask> <div className="services">
<mask> {SERVICES.map((service) => (
<mask> <Field
<mask> key={service.id}
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
icon={service.icon_svg} | <mask> <div className="services">
<mask> {SERVICES.map((service) => (
<mask> <Field
<mask> key={service.id}
<mask> icon={`service_${service.id}`}
<mask> name={`blocked_se... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
blockedServices: PropTypes.array.isRequired, | <mask> );
<mask> };
<mask>
<mask> Form.propTypes = {
<mask> pristine: PropTypes.bool.isRequired,
<mask> handleSubmit: PropTypes.func.isRequired,
<mask> change: PropTypes.func.isRequired,
<mask> submitting: PropTypes.bool.isRequired,
<mask> processing: PropTypes.bool.isRequired,
</s> P... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/Form.js |
import { getBlockedServices, getAllBlockedServices, setBlockedServices } from '../../../actions/services'; | <mask>
<mask> import { useDispatch, useSelector } from 'react-redux';
<mask> import Form from './Form';
<mask> import Card from '../../ui/Card';
<mask> import { getBlockedServices, setBlockedServices } from '../../../actions/services';
<mask> import PageTitle from '../../ui/PageTitle';
<mask>
<mask> const get... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/index.js |
dispatch(getAllBlockedServices()); | <mask>
<mask> useEffect(() => {
<mask> dispatch(getBlockedServices());
<mask> }, []);
<mask>
<mask> const handleSubmit = (values) => {
<mask> if (!values || !values.blocked_services) {
<mask> return;
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/index.js |
blockedServices={services.allServices} | <mask> >
<mask> <div className="form">
<mask> <Form
<mask> initialValues={initialValues}
<mask> processing={services.processing}
<mask> processingSet={services.processingSet}
<mask> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Filters/Services/index.js |
const services = useSelector((store) => store?.services); | <mask> const { t } = useTranslation();
<mask> const filters = useSelector((state) => state.filtering.filters, shallowEqual);
<mask> const whitelistFilters = useSelector((state) => state.filtering.whitelistFilters, shallowEqual);
<mask> const isDetailed = useSelector((state) => state.queryLogs.isDeta... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/Cells/ResponseCell.js |
...(service_name && services.allServices
&& { service_name: getServiceName(services.allServices, service_name) } | <mask> encryption_status: boldStatusLabel,
<mask> install_settings_dns: upstreamString,
<mask> elapsed: formattedElapsedMs,
<mask> response_code: status,
<mask> ...(service_name
<mask> && { service_name: getServiceName(service_name) }
<mask> ),
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/Cells/ResponseCell.js |
if (!service_name || !services.allServices) { | <mask>
<mask> const getDetailedInfo = (reason) => {
<mask> switch (reason) {
<mask> case FILTERED_STATUS.FILTERED_BLOCKED_SERVICE:
<mask> if (!service_name) {
<mask> return formattedElapsedMs;
<mask> }
<mask> return get... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/Cells/ResponseCell.js |
return getServiceName(services.allServices, service_name); | <mask> case FILTERED_STATUS.FILTERED_BLOCKED_SERVICE:
<mask> if (!service_name) {
<mask> return formattedElapsedMs;
<mask> }
<mask> return getServiceName(service_name);
<mask> case FILTERED_STATUS.FILTERED_BLACK_LIST:
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/Cells/ResponseCell.js |
...(FILTERED_STATUS.FILTERED_BLOCKED_SERVICE && service_name && services.allServices
&& { service_name: getServiceName(services.allServices, service_name) }), | <mask> time_table_header: formatTime(time, LONG_TIME_FORMAT),
<mask> date: formatDateTime(time, DEFAULT_SHORT_DATE_FORMAT_OPTIONS),
<mask> encryption_status: isBlocked
<mask> ? <div className="bg--danger">{requestStatus}</div> : requestStatus,
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/Cells/index.js |
import { getAllBlockedServices } from '../../actions/services'; | <mask> import { getDnsConfig } from '../../actions/dnsConfig';
<mask> import { getAccessList } from '../../actions/access';
<mask> import {
<mask> getLogsConfig,
<mask> resetFilteredLogs,
<mask> setFilteredLogs,
<mask> toggleDetailedLogs,
</s> Pull request: 3972-hostlists-services
Updates #3972... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/index.js |
dispatch(getAllBlockedServices()); | <mask> (async () => {
<mask> setIsLoading(true);
<mask> dispatch(getFilteringStatus());
<mask> dispatch(getClients());
<mask> try {
<mask> await Promise.all([
<mask> dispatch(getLogsConfig()),
<mask> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Logs/index.js |
import { connect, useSelector } from 'react-redux'; | <mask> import React, { useState } from 'react';
<mask> import { connect } from 'react-redux';
<mask> import PropTypes from 'prop-types';
<mask> import {
<mask> Field, FieldArray, reduxForm, formValueSelector,
<mask> } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
</s> Pul... | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Form.js |
import { CLIENT_ID_LINK, FORM_NAME } from '../../../helpers/constants'; | <mask> CheckboxField,
<mask> renderServiceField,
<mask> } from '../../../helpers/form';
<mask> import { validateClientId, validateRequiredValue } from '../../../helpers/validators';
<mask> import { CLIENT_ID_LINK, FORM_NAME, SERVICES } from '../../../helpers/constants';
<mask> import './Service.css';
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Form.js |
const services = useSelector((store) => store?.services); | <mask> tagsOptions,
<mask> } = props;
<mask>
<mask> const [activeTabLabel, setActiveTabLabel] = useState('settings');
<mask>
<mask> const tabs = {
<mask> settings: {
<mask> title: 'settings',
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit o... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Form.js |
onClick={() => (
toggleAllServices(services.allServices, change, true)
)} | <mask> <button
<mask> type="button"
<mask> className="btn btn-secondary btn-block"
<mask> disabled={useGlobalServices}
<mask> onClick={() => toggleAllServices(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Form.js |
onClick={() => (
toggleAllServices(services.allServices, change, false)
)} | <mask> <button
<mask> type="button"
<mask> className="btn btn-secondary btn-block"
<mask> disabled={useGlobalServices}
<mask> onClick={() => toggleAllServices(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Form.js |
{services.allServices.length > 0 && (
<div className="services">
{services.allServices.map((service) => (
<Field
key={service.id}
icon={service.... | <mask> <Trans>unblock_all</Trans>
<mask> </button>
<mask> </div>
<mask> </div>
<mask> <div className="services">
<mask> {SERVICES.map((service) => (
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Form.js |
.service__text {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
| <mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .services {
<mask> display: flex;
<mask> flex-flow: row wrap;
<mask> }
<mask>
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/Service.css |
import { ClientsTable } from './ClientsTable'; | <mask> import React, { Component, Fragment } from 'react';
<mask> import { withTranslation } from 'react-i18next';
<mask> import PropTypes from 'prop-types';
<mask>
<mask> import ClientsTable from './ClientsTable';
<mask> import AutoClients from './AutoClients';
<mask> import PageTitle from '../../ui/PageTitle'... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/Settings/Clients/index.js |
<mask> <path
<mask> d="M15 3C10.57 3 6.701 5.419 4.623 9h2.39a10.063 10.063 0 0 1 4.05-3.19c-.524.89-.961 1.973-1.3 3.19h2.108c.79-2.459 1.998-4 3.129-4s2.339 1.541 3.129 4h2.107c-.338-1.217-.774-2.3-1.299-3.19A10.062 10.062 0 0 1 22.989 9h2.389C23.298 5.419 19.43 3 15 3zm7.035 9.129c-1.37... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/ui/Icons.js | |
<mask> <path stroke="currentColor" strokeWidth="1.5" strokeLinecap="round"
<mask> d="M8.036 10.93l3.93 4.07 4.068-3.93" />
<mask> </g>
<mask> </symbol>
<mask>
<mask> <symbol id="service_vimeo" viewBox="0 0 50 50" fill="currentColor">
<mask> ... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/ui/Icons.js | |
flex-shrink: 0; | <mask> }
<mask>
<mask> .custom-switch-indicator {
<mask> display: inline-block;
<mask> height: 1.25rem;
<mask> width: 2.25rem;
<mask> background: #e9ecef;
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a4... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/components/ui/Tabler.css |
<mask> custom_rules: '/custom_rules',
<mask> blocked_services: '/blocked_services',
<mask> };
<mask>
<mask> export const SERVICES = [
<mask> {
<mask> id: '9gag',
<mask> name: '9GAG',
<mask> },
<mask> {
<mask> id: 'amazon',
<mask> name: 'Amazon',
<mask> ... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/helpers/constants.js | |
import cn from 'classnames';
| <mask> import PropTypes from 'prop-types';
<mask> import { Trans } from 'react-i18next';
<mask> import { createOnBlurHandler } from './helpers';
<mask> import { R_MAC_WITHOUT_COLON, R_UNIX_ABSOLUTE_PATH, R_WIN_ABSOLUTE_PATH } from './constants';
<mask>
<mask> export const renderField = (props, elementType) => {
... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/helpers/form.js |
}) => (
<>
<label className={cn('service custom-switch', { [modifier]: modifier })}>
<input
{...input}
type="checkbox"
className="custom-switch-input"
value={placeholder.toLowerCase()}
disabled={disabled}
... | <mask> disabled,
<mask> modifier,
<mask> icon,
<mask> meta: { touched, error },
<mask> }) => <Fragment>
<mask> <label className={`service custom-switch ${modifier}`}>
<mask> <input
<mask> {...input}
<mask> type="checkbox"
<mask> className="custom... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"k... | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/helpers/form.js |
<mask> DHCP_VALUES_PLACEHOLDERS,
<mask> FILTERED,
<mask> FILTERED_STATUS,
<mask> R_CLIENT_ID,
<mask> SERVICES_ID_NAME_MAP,
<mask> STANDARD_DNS_PORT,
<mask> STANDARD_HTTPS_PORT,
<mask> STANDARD_WEB_PORT,
<mask> SPECIAL_FILTER_ID,
<mask> } from './constants';
</s> Pull reque... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/helpers/helpers.js | |
* @param {array} services
* @param {string} id | <mask> export const filterOutComments = (lines) => lines
<mask> .filter((line) => !line.startsWith(COMMENT_LINE_DEFAULT_TOKEN));
<mask>
<mask> /**
<mask> * @param {string} serviceId
<mask> * @returns {string}
<mask> */
<mask> export const getServiceName = (serviceId) => SERVICES_ID_NAME_MAP[serviceId] |... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/helpers/helpers.js |
export const getService = (services, id) => services.find((s) => s.id === id);
/**
* @param {array} services
* @param {string} id
* @returns {string}
*/
export const getServiceName = (services, id) => getService(services, id)?.name;
/**
* @param {array} services
* @param {string} id
* @returns {string}
*/
exp... | <mask> /**
<mask> * @param {string} serviceId
<mask> * @returns {string}
<mask> */
<mask> export const getServiceName = (serviceId) => SERVICES_ID_NAME_MAP[serviceId] || serviceId;
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c... | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/helpers/helpers.js |
[actions.getAllBlockedServicesRequest]: (state) => ({ ...state, processingAll: true }),
[actions.getAllBlockedServicesFailure]: (state) => ({ ...state, processingAll: false }),
[actions.getAllBlockedServicesSuccess]: (state, { payload }) => ({
...state,
allServices: paylo... | <mask> }),
<mask>
<mask> [actions.setBlockedServicesRequest]: (state) => ({ ...state, processingSet: true }),
<mask> [actions.setBlockedServicesFailure]: (state) => ({ ...state, processingSet: false }),
<mask> [actions.setBlockedServicesSuccess]: (state) => ({
<mask> .... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/reducers/services.js |
processingAll: true, | <mask> {
<mask> processing: true,
<mask> processingSet: false,
<mask> list: [],
<mask> allServices: [],
<mask> },
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: 239550f8 ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/reducers/services.js |
allServices: [], | <mask> processingAll: true,
<mask> processingSet: false,
<mask> list: [],
<mask> },
<mask> );
<mask>
<mask> export default services;
</s> Pull request: 3972-hostlists-services
Updates #3972.
Squashed commit of the following:
commit 9dc0efe2453cb6c738d97d39b02c86eccb18a42c
Merge: ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | client/src/reducers/services.js |
<mask> "github.com/AdguardTeam/urlfilter/rules"
<mask> "golang.org/x/exp/slices"
<mask> )
<mask>
<mask> // svc represents a single blocked service.
<mask> type svc struct {
<mask> name string
<mask> rules []string
<mask> }
<mask>
<mask> // servicesData contains raw blocked service data.
<mask> //
<m... | [
"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",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go | |
l := len(blockedServices) | <mask> var serviceIDs []string
<mask>
<mask> // initBlockedServices initializes package-level blocked service data.
<mask> func initBlockedServices() {
<mask> l := len(servicesData)
<mask> serviceIDs = make([]string, l)
<mask> serviceRules = make(map[string][]*rules.NetworkRule, l)
<mask>
<mask> for i, s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
for i, s := range blockedServices {
netRules := make([]*rules.NetworkRule, 0, len(s.Rules))
for _, text := range s.Rules { | <mask> l := len(servicesData)
<mask> serviceIDs = make([]string, l)
<mask> serviceRules = make(map[string][]*rules.NetworkRule, l)
<mask>
<mask> for i, s := range servicesData {
<mask> netRules := make([]*rules.NetworkRule, 0, len(s.rules))
<mask> for _, text := range s.rules {
<mask> rule, err := r... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/9951d861d17ec92ad172aa3c5547ce2b0d8a161d | internal/filtering/blocked.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.