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
"strings"
<mask> "os" <mask> "path/filepath" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" </s> Pull request: all: fix client custom upstream comments Updates #2947. Squashed commit o...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
wantSet: "blocking_mode: incorrect value",
<mask> name: "blocking_mode_good", <mask> wantSet: "", <mask> }, { <mask> name: "blocking_mode_bad", <mask> wantSet: "blocking_mode: incorrect value\n", <mask> }, { <mask> name: "ratelimit", <mask> wantSet: "", <mask> }, { <mask> name: "edns_cs_enabled", </s> Pull request: all: f...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
name: "upstream_dns_bad", wantSet: `wrong upstreams specification: address !!!: ` + `missing port in address`,
<mask> }, { <mask> name: "upstream_mode_fastest_addr", <mask> wantSet: "", <mask> }, { <mask> name: "upstream_dns_bad", <mask> wantSet: "wrong upstreams specification: missing port in address\n", <mask> }, { <mask> name: "bootstraps_bad", <mask> wantSet: "a can not be used as bootstrap ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
name: "bootstraps_bad", wantSet: `a can not be used as bootstrap dns cause: ` + `invalid bootstrap server address: ` + `Resolver a is not eligible to be a bootstrap DNS server`,
<mask> }, { <mask> name: "upstream_dns_bad", <mask> wantSet: "wrong upstreams specification: missing port in address\n", <mask> }, { <mask> name: "bootstraps_bad", <mask> wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootst...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`,
<mask> name: "bootstraps_bad", <mask> wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n", <mask> }, { <mask> name: "cache_bad_ttl", <mask> wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n"...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
wantSet: `upstream_mode: incorrect value`,
<mask> name: "cache_bad_ttl", <mask> wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n", <mask> }, { <mask> name: "upstream_mode_bad", <mask> wantSet: "upstream_mode: incorrect value\n", <mask> }, { <mask> name: "local_ptr_upstreams_good", <mask> wantSet: "", <mask> }, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
assert.Equal(t, tc.wantSet, strings.TrimSuffix(w.Body.String(), "\n"))
<mask> r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody) <mask> require.Nil(t, err) <mask> <mask> s.handleSetConfig(w, r) <mask> assert.Equal(t, tc.wantSet, w.Body.String()) <mask> w.Body.Reset() <mask> <mask> s.handleGetConfig(w, nil) <mask> assert.JSONEq(t, string(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/http_test.go
"!!!"
<mask> }, <mask> "upstream_dns_bad": { <mask> "req": { <mask> "upstream_dns": [ <mask> "" <mask> ] <mask> }, <mask> "want": { <mask> "upstream_dns": [ <mask> "8.8.8.8:53", </s> Pull request: all: fix client custom upstream comments Updates #2947. Squashed c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
<mask> "resolve_clients": false, <mask> "local_ptr_upstreams": [] <mask> } <mask> } <mask> } </s> Pull request: all: fix client custom upstream comments Updates #2947. Squashed commit of the following: commit 498a05459b1aa00bcffee490acfeecb567025971 Merge: 6a7a2f87 21e2c419 Author: Ainar Garip...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
}
<mask> "local_ptr_upstreams": [] <mask> } <mask> } <mask> } </s> Pull request: all: fix client custom upstream comments Updates #2947. Squashed commit of the following: commit 498a05459b1aa00bcffee490acfeecb567025971 Merge: 6a7a2f87 21e2c419 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue ...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json
<mask> } <mask> } <mask> return false <mask> } <mask> <mask> // Is not comment <mask> func isUpstream(line string) bool { <mask> return !strings.HasPrefix(line, "#") <mask> } <mask> <mask> func filterOutComments(lines []string) []string { <mask> var filtered []string <mask> for _, l := range lines...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/dnsforward/util.go
upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty) if len(upstreams) == 0 {
<mask> if !ok { <mask> return nil <mask> } <mask> <mask> if len(c.Upstreams) == 0 { <mask> return nil <mask> } <mask> <mask> if c.upstreamConfig == nil { <mask> conf, err := proxy.ParseUpstreamsConfig( </s> Pull request: all: fix client custom upstream comments Updates #2947. Squashed commit o...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/home/clients.go
upstreams,
<mask> } <mask> <mask> if c.upstreamConfig == nil { <mask> conf, err := proxy.ParseUpstreamsConfig( <mask> c.Upstreams, <mask> upstream.Options{ <mask> Bootstrap: config.DNS.BootstrapDNS, <mask> Timeout: dnsforward.DefaultTimeout, <mask> }, <mask> ) </s> Pull request: all: fix clien...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152
internal/home/clients.go
<mask> "rewritten": "Umgeschrieben", <mask> "safe_search": "Sichere Suche", <mask> "blocklist": "Sperrliste", <mask> "milliseconds_abbreviation": "ms" <mask> } </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7de72226855a961051e09b4b78f4dd71baadd Merg...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/de.json
}
<mask> "safe_search": "Sichere Suche", <mask> "blocklist": "Sperrliste", <mask> "milliseconds_abbreviation": "ms" <mask> } </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7de72226855a961051e09b4b78f4dd71baadd Merge: f9bbe861 36f3218b Author: Andrey Meshk...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/de.json
"choose_blocklist": "Choose blocklists", "choose_allowlist": "Choose allowlists",
<mask> "edit_blocklist": "Edit blocklist", <mask> "edit_allowlist": "Edit allowlist", <mask> "enter_valid_blocklist": "Enter a valid URL to the blocklist.", <mask> "enter_valid_allowlist": "Enter a valid URL to the allowlist.", <mask> "form_error_url_format": "Invalid URL format", <mask> "...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/en.json
"filter_removed_successfully": "The list has been successfully removed",
<mask> "domain": "Domain", <mask> "answer": "Answer", <mask> "filter_added_successfully": "The list has been successfully added", <mask> "filter_updated": "The list has been successfully updated", <mask> "statistics_configuration": "Statistics configuration", <mask> "statistics_retention":...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/en.json
"choose_from_list": "Choose from the list", "add_custom_list": "Add a custom list",
<mask> "check_desc": "Check if the host name is filtered", <mask> "check": "Check", <mask> "form_enter_host": "Enter a host name", <mask> "filtered_custom_rules": "Filtered by Custom filtering rules", <mask> "host_whitelisted": "The host is whitelisted", <mask> "check_ip": "IP addresses: {...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/en.json
"value_not_larger_than": "Value can't be larger than {{maximum}}", "filter_category_general": "General", "filter_category_security": "Security", "filter_category_regional": "Regional", "filter_category_other": "Other", "filter_category_general_desc": "Lists that block tracking and advertising on...
<mask> "enter_cache_ttl_max_override": "Enter maximum TTL", <mask> "cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server. This value can't larger than 3600 (1 hour)", <mask> "cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server", ...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/en.json
"nxdomain": "NXDOMAIN", "null_ip": "Nul IP",
<mask> "blocking_mode": "Blocking modus", <mask> "default": "Standaard", <mask> "custom_ip": "Aangepast IP", <mask> "blocking_ipv4": "Blokkeren IP4", <mask> "blocking_ipv6": "Blokkeren IP6", <mask> "dns_over_https": "DNS-via-HTTPS", <mask> "dns_over_tls": "DNS-via-TLS", </s> + client...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
"blocking_ipv4": "Blokkeren IP4", "blocking_ipv6": "Blokkeren IP6",
<mask> "nxdomain": "NXDOMAIN", <mask> "null_ip": "Nul IP", <mask> "custom_ip": "Aangepast IP", <mask> "dns_over_https": "DNS-via-HTTPS", <mask> "dns_over_tls": "DNS-via-TLS", <mask> "plain_dns": "Gewone DNS", <mask> "form_enter_rate_limit": "Voer ratio limiet in", <mask> "rate_li...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
"form_enter_rate_limit": "Voer ratio limiet in", "rate_limit": "Ratio limiet", "edns_enable": "Zet EDNS client subnet aan", "edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.", "rate_limit_desc": "Het aantal verzoeken per seconde die een enkele cli...
<mask> "dns_over_https": "DNS-via-HTTPS", <mask> "dns_over_tls": "DNS-via-TLS", <mask> "plain_dns": "Gewone DNS", <mask> "tracker_source": "Bron volger", <mask> "source_label": "Bron", <mask> "found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.", <mask> "category_la...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
"disable_ipv6": "Zet IPv6 uit", "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
<mask> "try_again": "Probeer opnieuw", <mask> "domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.", <mask> "example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.", <mask> "example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
"autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.", "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch ...
<mask> "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", <mask> "fastest_addr": "Snelste IP adres", <mask> "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen o...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
"tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>", "form_select_tags": "Kies client tags", "check_title": "Controleer de filtering", "check_desc": "Controleer of de hos...
<mask> "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.", <mask> "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0>...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
"filtered_custom_rules": "Gefilterd door aangepaste filterregels",
<mask> "check": "Controleren", <mask> "form_enter_host": "Voer een hostnaam in", <mask> "host_whitelisted": "De host staat op de toestemmingslijst", <mask> "check_ip": "IP-adressen: {{ip}}", <mask> "check_cname": "CNAME: {{cname}}", <mask> "check_reason": "Reden: {{reason}}", <mask> "...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/nl.json
<mask> "blocked_adult_websites": "Blokkerte voksennettsteder", <mask> "blocked_threats": "Blokkerte trusler", <mask> "allowed": "Unntak", <mask> "blocklist": "Blokkeringsliste" <mask> } </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7de72226855a9610...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/no.json
<mask> "rewritten": "Przepisane", <mask> "safe_search": "Bezpieczne wyszukiwanie", <mask> "blocklist": "Lista zablokowanych", <mask> "milliseconds_abbreviation": "ms" <mask> } </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7de72226855a961051e09b4b78...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/pl.json
}
<mask> "safe_search": "Bezpieczne wyszukiwanie", <mask> "blocklist": "Lista zablokowanych", <mask> "milliseconds_abbreviation": "ms" <mask> } </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7de72226855a961051e09b4b78f4dd71baadd Merge: f9bbe861 36f3218b A...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/__locales/pl.json
export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => {
<mask> export const addFilterRequest = createAction('ADD_FILTER_REQUEST'); <mask> export const addFilterFailure = createAction('ADD_FILTER_FAILURE'); <mask> export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS'); <mask> <mask> export const addFilter = (url, name, whitelist = false) => async (dispatch)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/actions/filtering.js
if (getState().filtering.isModalOpen) { dispatch(toggleFilteringModal()); }
<mask> dispatch(addFilterRequest()); <mask> try { <mask> await apiClient.addFilter({ url, name, whitelist }); <mask> dispatch(addFilterSuccess(url)); <mask> dispatch(toggleFilteringModal()); <mask> dispatch(addSuccessToast('filter_added_successfully')); <mask> disp...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/actions/filtering.js
export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => {
<mask> export const removeFilterRequest = createAction('REMOVE_FILTER_REQUEST'); <mask> export const removeFilterFailure = createAction('REMOVE_FILTER_FAILURE'); <mask> export const removeFilterSuccess = createAction('REMOVE_FILTER_SUCCESS'); <mask> <mask> export const removeFilter = (url, whitelist = false) => a...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/actions/filtering.js
if (getState().filtering.isModalOpen) { dispatch(toggleFilteringModal()); } dispatch(addSuccessToast('filter_removed_successfully'));
<mask> try { <mask> await apiClient.removeFilter({ url, whitelist }); <mask> dispatch(removeFilterSuccess(url)); <mask> dispatch(getFilteringStatus()); <mask> } catch (error) { <mask> dispatch(addErrorToast({ error })); <mask> dispatch(removeFilterFailure()); <mas...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/actions/filtering.js
export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => {
<mask> export const editFilterRequest = createAction('EDIT_FILTER_REQUEST'); <mask> export const editFilterFailure = createAction('EDIT_FILTER_FAILURE'); <mask> export const editFilterSuccess = createAction('EDIT_FILTER_SUCCESS'); <mask> <mask> export const editFilter = (url, data, whitelist = false) => async (di...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/actions/filtering.js
if (getState().filtering.isModalOpen) { dispatch(toggleFilteringModal()); }
<mask> dispatch(editFilterRequest()); <mask> try { <mask> await apiClient.setFilterUrl({ url, data, whitelist }); <mask> dispatch(editFilterSuccess(url)); <mask> dispatch(toggleFilteringModal()); <mask> dispatch(addSuccessToast('filter_updated')); <mask> dispatch(g...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/actions/filtering.js
.modal-body--medium { max-height: 20rem; overflow-y: scroll; } .modal-body__item:not(:first-child) { padding-top: 1.5rem; }
<mask> } <mask> } <mask> <mask> .font-monospace { <mask> font-family: var(--font-family-monospace); <mask> } <mask> <mask> .mw-75 { <mask> max-width: 75% !important; </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7de72226855a961051e09b4b78f4dd71b...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/App/index.css
if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) {
<mask> const { name, url } = values; <mask> const { filtering } = this.props; <mask> const whitelist = true; <mask> <mask> if (filtering.modalType === MODAL_TYPE.EDIT) { <mask> this.props.editFilter(filtering.modalFilterUrl, values, whitelist); <mask> } else {...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsAllowlist.js
openAddFiltersModal = () => { this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS }); };
<mask> handleRefresh = () => { <mask> this.props.refreshFilters({ whitelist: true }); <mask> }; <mask> <mask> render() { <mask> const { <mask> t, <mask> toggleFilteringModal, <mask> addFilter, <mask> toggleFilterStatus, </s> + clien...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsAllowlist.js
handleAdd={this.openAddFiltersModal}
<mask> toggleFilter={this.toggleFilter} <mask> whitelist={whitelist} <mask> /> <mask> <Actions <mask> handleAdd={() => toggleFilteringModal({ t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsAllowlist.js
filters={whitelistFilters}
<mask> </div> <mask> </div> <mask> </div> <mask> <Modal <mask> isOpen={isModalOpen} <mask> toggleFilteringModal={toggleFilteringModal} <mask> addFilter={addFilter} <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsAllowlist.js
toggleFilteringModal={toggleFilteringModal}
<mask> </div> <mask> </div> <mask> <Modal <mask> isOpen={isModalOpen} <mask> toggleModal={toggleFilteringModal} <mask> addFilter={addFilter} <mask> isFilterAdded={isFilterAdded} <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsAllowlist.js
import React, { Component } from 'react';
<mask> import React, { Component, Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { withTranslation } from 'react-i18next'; <mask> <mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; </s> + client: Add choosing filter lists Fix #1325 Squashed ...
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
<mask> import PageTitle from '../ui/PageTitle'; <mask> import Card from '../ui/Card'; <mask> import Modal from './Modal'; <mask> import Actions from './Actions'; <mask> import Table from './Table'; <mask> <mask> import { MODAL_TYPE } from '../../helpers/constants'; <mask> import { getCurrentFilter } from '../....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
import Table from './Table';
<mask> import Modal from './Modal'; <mask> import Actions from './Actions'; <mask> <mask> import { MODAL_TYPE } from '../../helpers/constants'; <mask> <mask> import { <mask> getCurrentFilter, <mask> getObjDiff, </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: com...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
import { getCurrentFilter, getObjDiff, } from '../../helpers/helpers'; const filtersCatalog = require('../../helpers/filters/filters.json');
<mask> import Actions from './Actions'; <mask> import Table from './Table'; <mask> <mask> import { MODAL_TYPE } from '../../helpers/constants'; <mask> import { getCurrentFilter } from '../../helpers/helpers'; <mask> <mask> class DnsBlocklist extends Component { <mask> componentDidMount() { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
handleSubmit = (values, _, { initialValues }) => { const { filtering: { modalFilterUrl, modalType } } = this.props;
<mask> componentDidMount() { <mask> this.props.getFilteringStatus(); <mask> } <mask> <mask> handleSubmit = (values) => { <mask> const { name, url } = values; <mask> const { filtering } = this.props; <mask> <mask> if (filtering.modalType === MODAL_TYPE.EDIT) { <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
switch (modalType) { case MODAL_TYPE.EDIT_FILTERS: this.props.editFilter(modalFilterUrl, values); break; case MODAL_TYPE.ADD_FILTERS: { const { name, url } = values; this.props.addFilter(url, name); break; ...
<mask> handleSubmit = (values) => { <mask> const { name, url } = values; <mask> const { filtering } = this.props; <mask> <mask> if (filtering.modalType === MODAL_TYPE.EDIT) { <mask> this.props.editFilter(filtering.modalFilterUrl, values); <mask> } else { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
openSelectTypeModal = () => { this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE }); };
<mask> handleRefresh = () => { <mask> this.props.refreshFilters({ whitelist: false }); <mask> }; <mask> <mask> render() { <mask> const { <mask> t, <mask> toggleFilteringModal, <mask> addFilter, </s> + client: Add choosing filter lists Fix #1325 ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
<>
<mask> || processingRemoveFilter <mask> || processingRefreshFilters; <mask> <mask> return ( <mask> <Fragment> <mask> <PageTitle <mask> title={t('dns_blocklists')} <mask> subtitle={t('dns_blocklists_desc')} <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
handleAdd={this.openSelectTypeModal}
<mask> handleDelete={this.handleDelete} <mask> toggleFilter={this.toggleFilter} <mask> /> <mask> <Actions <mask> handleAdd={() => toggleFilteri...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
filtersCatalog={filtersCatalog} filters={filters}
<mask> </div> <mask> <Modal <mask> isOpen={isModalOpen} <mask> toggleFilteringModal={toggleFilteringModal} <mask> addFilter={addFilter} <mask> isFilterAdded={isFilterAdded} <mask> p...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
toggleFilteringModal={toggleFilteringModal}
<mask> </div> <mask> </div> <mask> <Modal <mask> isOpen={isModalOpen} <mask> toggleModal={toggleFilteringModal} <mask> addFilter={addFilter} <mask> isFilterAdded={isFilterAdded} <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
</>
<mask> handleSubmit={this.handleSubmit} <mask> modalType={modalType} <mask> currentFilterData={currentFilterData} <mask> /> <mask> </Fragment> <mask> ); <mask> } <mask> } <mask> <mask> DnsBlocklist.propTypes =...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/DnsBlocklist.js
import { withTranslation } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withTranslation } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> import { renderInputField } from '../../helpers/form'; <mask> import { va...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
import classNames from 'classnames';
<mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withTranslation } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> import { renderInputField } from '../../helpers/form'; <mask> import { validatePath, validateRequiredValue }...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
import { renderInputField, renderSelectField } from '../../helpers/form'; import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants'; const getIconsData = (homepage, source) => ([ { iconName: 'dashboard', href: homepage, className: 'ml-1', }, { iconN...
<mask> import { Trans, withTranslation } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> import { renderInputField } from '../../helpers/form'; <mask> import { validatePath, validateRequiredValue } from '../../helpers/validators'; <mask> import { FORM_NAME } from '../../helpers/constants'; <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
modalType, toggleFilteringModal, selectedSources, filtersCatalog,
<mask> processingAddFilter, <mask> processingConfigFilter, <mask> whitelist, <mask> } = props; <mask> <mask> const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => { <mask> toggleFilteringModal(); </s> + client: Add choosing filter lists Fix #1325 Squashed commi...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => { toggleFilteringModal(); setTimeout(() => toggleFilteringModal({ type: modalType }), timeout); }; const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST); const openAddFiltersModal = () => openModa...
<mask> processingConfigFilter, <mask> whitelist, <mask> } = props; <mask> <mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> <div className="modal-body"> <mask> <div className="form__group"> <mask> <Field <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
{whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
<mask> normalizeOnBlur={(data) => data.trim()} <mask> /> <mask> </div> <mask> <div className="form__description"> <mask> {whitelist ? <Trans>enter_valid_allowlist</Trans> <mask> : <Trans>enter_v...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
</>} </div> <div className="modal-footer"> <button type="button" className="btn btn-secondary" onClick={closeModal} > {t('cancel_btn')} </button> <button type="subm...
<mask> <div className="form__description"> <mask> {whitelist ? <Trans>enter_valid_allowlist</Trans> <mask> : <Trans>enter_valid_blocklist</Trans>} <mask> </div> <mask> </div> <mask> <div className="modal-footer"> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", ...
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
modalType: PropTypes.string.isRequired, toggleFilteringModal: PropTypes.func.isRequired, filtersCatalog: PropTypes.object, selectedSources: PropTypes.object,
<mask> processingConfigFilter: PropTypes.bool.isRequired, <mask> whitelist: PropTypes.bool, <mask> }; <mask> <mask> export default flow([ <mask> withTranslation(), <mask> reduxForm({ form: FORM_NAME.FILTER }), </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following:...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Form.js
import { withTranslation } from 'react-i18next';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import ReactModal from 'react-modal'; <mask> import { Trans, withTranslation } from 'react-i18next'; <mask> <mask> import { MODAL_TYPE } from '../../helpers/constants'; <mask> import Form from './Form'; <mask> im...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
import { getMap } from '../../helpers/helpers';
<mask> import Form from './Form'; <mask> import '../ui/Modal.css'; <mask> <mask> ReactModal.setAppElement('#root'); <mask> <mask> const MODAL_TYPE_TO_TITLE_TYPE_MAP = { <mask> [MODAL_TYPE.EDIT_FILTERS]: 'edit', </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
this.props.toggleFilteringModal();
<mask> ReactModal.setAppElement('#root'); <mask> <mask> class Modal extends Component { <mask> closeModal = () => { <mask> this.props.toggleModal(); <mask> }; <mask> <mask> render() { <mask> const { <mask> isOpen, </s> + client: Add choosing filter lists Fix #1325 S...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
toggleFilteringModal, filters, t, filtersCatalog,
<mask> currentFilterData, <mask> whitelist, <mask> } = this.props; <mask> <mask> let initialValues; <mask> let selectedSources; <mask> switch (modalType) { </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f7d...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
let initialValues; let selectedSources; switch (modalType) { case MODAL_TYPE.EDIT_FILTERS: initialValues = currentFilterData; break; case MODAL_TYPE.CHOOSE_FILTERING_LIST: { const catalogSourcesToIdMap = getMap(Object.values...
<mask> currentFilterData, <mask> whitelist, <mask> } = this.props; <mask> <mask> const newListTitle = whitelist ? ( <mask> <Trans>new_allowlist</Trans> <mask> ) : ( <mask> <Trans>new_blocklist</Trans> <mask> ); <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap); initialValues = selectedValues.selectedFilterIds; selectedSources = selectedValues.selectedSources; break; } default: } const title = t(getTi...
<mask> ) : ( <mask> <Trans>new_blocklist</Trans> <mask> ); <mask> <mask> const editListTitle = whitelist ? ( <mask> <Trans>edit_allowlist</Trans> <mask> ) : ( <mask> <Trans>edit_blocklist</Trans> <mask> ); <mask> <mask> ret...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
{title && <h4 className="modal-title">{title}</h4>}
<mask> onRequestClose={this.closeModal} <mask> > <mask> <div className="modal-content"> <mask> <div className="modal-header"> <mask> <h4 className="modal-title"> <mask> {modalType === MODAL_TYPE.EDI...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
selectedSources={selectedSources} initialValues={initialValues} filtersCatalog={filtersCatalog} modalType={modalType}
<mask> <span className="sr-only">Close</span> <mask> </button> <mask> </div> <mask> <Form <mask> initialValues={{ ...currentFilterData }} <mask> onSubmit={handleSubmit} <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
toggleFilteringModal={toggleFilteringModal}
<mask> processingConfigFilter={processingConfigFilter} <mask> closeModal={this.closeModal} <mask> whitelist={whitelist} <mask> /> <mask> </div> <mask> </ReactModal> <mask> ); </s> + cl...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
toggleFilteringModal: PropTypes.func.isRequired,
<mask> } <mask> } <mask> <mask> Modal.propTypes = { <mask> toggleModal: PropTypes.func.isRequired, <mask> isOpen: PropTypes.bool.isRequired, <mask> addFilter: PropTypes.func.isRequired, <mask> isFilterAdded: PropTypes.bool.isRequired, <mask> processingAddFilter: PropTypes.bool.isRequir...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
filters: PropTypes.array.isRequired, filtersCatalog: PropTypes.object,
<mask> modalType: PropTypes.string.isRequired, <mask> currentFilterData: PropTypes.object.isRequired, <mask> t: PropTypes.func.isRequired, <mask> whitelist: PropTypes.bool, <mask> }; <mask> <mask> export default withTranslation()(Modal); </s> + client: Add choosing filter lists Fix #1325 Squas...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Modal.js
type: MODAL_TYPE.EDIT_FILTERS,
<mask> type="button" <mask> className="btn btn-icon btn-outline-primary btn-sm mr-2" <mask> title={t('edit_table_action')} <mask> onClick={() => toggleFilteringModal({ <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Filters/Table.js
.nav-icon--gray { color: #9aa0ac; }
<mask> .nav-icon { <mask> display: none; <mask> } <mask> <mask> .header-brand-img { <mask> height: 32px; <mask> } <mask> <mask> .header__logout { <mask> width: 35px; </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commit d8f...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Header/Header.css
if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) {
<mask> config.tags = []; <mask> } <mask> } <mask> <mask> if (this.props.modalType === MODAL_TYPE.EDIT) { <mask> this.handleFormUpdate(config, this.props.modalClientName); <mask> } else { <mask> this.handleFormAdd(config); <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Settings/Clients/ClientsTable.js
type: MODAL_TYPE.EDIT_FILTERS,
<mask> <button <mask> type="button" <mask> className="btn btn-icon btn-outline-primary btn-sm mr-2" <mask> onClick={() => toggleClientModal({ <mask> type: MODAL_TYPE.EDIT, <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Settings/Clients/ClientsTable.js
onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)}
<mask> /> <mask> <button <mask> type="button" <mask> className="btn btn-success btn-standard mt-3" <mask> onClick={() => toggleClientModal(MODAL_TYPE.ADD)} <mask> disabled={proce...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Settings/Clients/ClientsTable.js
{modalType === MODAL_TYPE.EDIT_FILTERS ? (
<mask> > <mask> <div className="modal-content"> <mask> <div className="modal-header"> <mask> <h4 className="modal-title"> <mask> {modalType === MODAL_TYPE.EDIT ? ( <mask> <Trans>client_edit</Trans> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/Settings/Clients/Modal.js
<symbol id="info" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"> <path d="M64 1C29.3 1 1 29.3 1 64s28.3 63 63 63 63-28.3 63-63S98....
<mask> <path d="M10 6l6 6-6 6" stroke="#888" strokeWidth="1.5" fill="none" <mask> fillRule="evenodd" strokeLinecap="round" /> <mask> </svg> <mask> </symbol> <mask> </svg> <mask> ); <mask> <mask> export default Icons; </s> + client: Add choosing fil...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/components/ui/Icons.js
export const MODAL_OPEN_TIMEOUT = 150;
<mask> export const SUCCESS_TOAST_TIMEOUT = 5000; <mask> export const FAILURE_TOAST_TIMEOUT = 30000; <mask> export const HIDE_TOOLTIP_DELAY = 300; <mask> <mask> export const UNSAFE_PORTS = [ <mask> 1, <mask> 7, </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following: commi...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/constants.js
SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE', ADD_FILTERS: 'ADD_FILTERS', EDIT_FILTERS: 'EDIT_FILTERS', CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
<mask> ERROR: 'error', <mask> }; <mask> <mask> export const MODAL_TYPE = { <mask> ADD: 'add', <mask> EDIT: 'edit', <mask> }; <mask> <mask> export const CLIENT_ID = { <mask> MAC: 'mac', <mask> IP: 'ip', </s> + client: Add choosing filter lists Fix #1325 Squashed commit of the following...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/constants.js
checked,
<mask> onClick, <mask> modifier = 'checkbox--form', <mask> meta: { touched, error }, <mask> }) => <> <mask> <label className={`checkbox ${modifier}`} onClick={onClick}> <mask> <span className="checkbox__marker" /> <mask> <input {...input} type="checkbox" className="checkbox__input...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
}) => <>
<mask> disabled, <mask> onClick, <mask> modifier = 'checkbox--form', <mask> meta: { touched, error }, <mask> }) => <Fragment> <mask> <label className={`checkbox ${modifier}`} onClick={onClick}> <mask> <span className="checkbox__marker" /> <mask> <input {...input} type="checkb...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/>
<mask> meta: { touched, error }, <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 classNa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
<span className="checkbox__label-text checkbox__label-text--long"> <span className="checkbox__label-title">{placeholder}</span> {subtitle && <span className="checkbox__label-subtit...
<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 classNa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
<mask> className="checkbox__label-subtitle" <mask> dangerouslySetInnerHTML={{ __html: subtitle }} <mask> />} <mask> </span> <mask> </span> <mask> </label> <mask> {!disabled <mask> && t...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
</>;
<mask> </label> <mask> {!disabled <mask> && touched <mask> && error && <span className="form__message form__message--error">{error}</span>} <mask> </Fragment>; <mask> <mask> renderSelectField.propTypes = { <mask> input: PropTypes.object.isRequired, <mask> placeholder: PropTypes.string,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
checked: PropTypes.bool,
<mask> subtitle: PropTypes.string, <mask> disabled: PropTypes.bool, <mask> onClick: PropTypes.func, <mask> modifier: PropTypes.string, <mask> meta: PropTypes.shape({ <mask> touched: PropTypes.bool, <mask> error: PropTypes.object, <mask> }).isRequired, <mask> }; <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/form.js
* @param {object} initialValues * @param {object} values
<mask> }; <mask> }; <mask> <mask> /** <mask> * @param initialValues {object} <mask> * @param values {object} <mask> * @returns {object} Returns different values of objects <mask> */ <mask> export const getObjDiff = (initialValues, values) => Object.entries(values) <mask> .reduce((acc, [key, value...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/helpers.js
/** * @param arr {array} * @param key {string} * @param value {string} * @returns {object} */ export const getMap = (arr, key, value) => arr.reduce((acc, curr) => { acc[curr[key]] = curr[value]; return acc; }, {});
<mask> return num.toLocaleString(currentLanguage); <mask> }; <mask> <mask> export const normalizeMultiline = (multiline) => `${normalizeTextarea(multiline) <mask> .map((line) => line.trim()) <mask> .join('\n')}\n`; <mask> <mask> /** </s> + client: Add choosing filter lists Fix #1325 Squashed com...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
client/src/helpers/helpers.js
{Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"}, {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"},
<mask> } <mask> <mask> func defaultFilters() []filter { <mask> return []filter{ <mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"}, <mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd
home/filter.go
"form_error_ip4_format": "Invalid IPv4 format", "form_error_ip6_format": "Invalid IPv6 format", "form_error_ip_format": "Invalid IP format",
<mask> "dhcp_static_leases": "DHCP static leases", <mask> "dhcp_leases_not_found": "No DHCP leases found", <mask> "dhcp_config_saved": "Saved DHCP server config", <mask> "form_error_required": "Required field", <mask> "form_error_ip_format": "Invalid IPv4 format", <mask> "form_error_mac_fo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/en.json
"of_table_footer_text": "of",
<mask> "next_btn": "Next", <mask> "loading_table_status": "Loading...", <mask> "page_table_footer_text": "Page", <mask> "rows_table_footer_text": "rows", <mask> "updated_custom_filtering_toast": "Updated the custom filtering rules", <mask> "rule_removed_from_custom_filtering_toast": "Rule ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/en.json
<mask> "dhcp_static_leases": "DHCP static leases", <mask> "dhcp_leases_not_found": "DHCP lease tidak ditemukan", <mask> "dhcp_config_saved": "Pengaturan server DHCP tersimpan", <mask> "form_error_required": "Kolom yang harus diisi", <mask> "form_error_ip_format": "Format IPv4 tidak valid", <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/id.json
<mask> "use_adguard_browsing_sec_hint": "AdGuard Home akan mengecek jika domain diblacklist oleh layanan web keamanan penjelajahan. Akan menggunakan lookup API yang ramah privasi untuk melakukan cek: hanya awalan singkat hash SHA256 dari nama domain yang dikirim ke server.", <mask> "use_adguard_parental": "Gu...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/id.json
<mask> "example_meaning_host_block": "AdGuard Home sekarang akan mengembalikan alamat 127.0.0.1 untuk domain example.org (namun tidak subdomainnya)", <mask> "example_comment": "! Komentar di sini", <mask> "example_comment_meaning": "hanya sebuah komentar", <mask> "example_comment_hash": "Juga sebua...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/id.json
<mask> "dhcp_static_leases": "Leases DHCP statici", <mask> "dhcp_leases_not_found": "Nessun lease DHCP trovato", <mask> "dhcp_config_saved": "Configurazione server DHCP salvata", <mask> "form_error_required": "Campo richiesto", <mask> "form_error_ip_format": "Formato IPv4 non valido", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/it.json
"example_regex_meaning": "blocca l'accesso ai domini che corrispondono alla specifica espressione regolare",
<mask> "example_comment_meaning": "un commento", <mask> "example_comment_hash": "# Un altro commento", <mask> "example_upstream_regular": "DNS regolari (via UDP)", <mask> "example_upstream_dot": "<a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a> criptato", <mask>...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/it.json
"encryption_certificate_path": "Percorso di certificato", "encryption_private_key_path": "Percorso della chiave privata", "encryption_certificates_source_path": "Definisci un percorso alle file dei certificati", "encryption_certificates_source_content": "Incolla i contenuti di certificato", "encrypt...
<mask> "blocked_service": "Servizio bloccato", <mask> "block_all": "Blocca tutto", <mask> "unblock_all": "Sblocca tutto", <mask> "stats_params": "Configurazione delle statistiche", <mask> "config_successfully_saved": "Configurazione salvata correttamente", <mask> "interval_24_hour": "24 or...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/it.json
<mask> "dhcp_leases": "DHCP lease overzicht", <mask> "dhcp_leases_not_found": "Geen DHCP lease gevonden", <mask> "dhcp_config_saved": "DHCP server configuratie opgeslagen", <mask> "form_error_required": "Vereist veld", <mask> "form_error_ip_format": "Ongeldig IPv4 formaat", <mask> "form_er...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3
client/src/__locales/nl.json