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
disabled={ setting.name !== 'use_global_settings' ? useGlobalSettings : false }
<mask> name={setting.name} <mask> type="checkbox" <mask> component={renderSelectField} <mask> placeholder={t(setting.placeholder)} <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
disabled={ submitting || invalid || pristine || processingAdding || processingUpdating }
<mask> </button> <mask> <button <mask> type="submit" <mask> className="btn btn-success btn-standard" <mask> disabled={submitting || pristine || processingAdding || processingUpdating} <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
<mask> reset: PropTypes.func.isRequired, <mask> change: PropTypes.func.isRequired, <mask> submitting: PropTypes.bool.isRequired, <mask> toggleClientModal: PropTypes.func.isRequired, <mask> clientIdentifier: PropTypes.string, <mask> useGlobalSettings: PropTypes.bool, <mask> useGlobalSe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
invalid: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired, <mask> processingAdding: PropTypes.bool.isRequired, <mask> processingUpdating: PropTypes.bool.isRequired, <mask> }; <mask> <mask> const selector = formValueSelector('clientForm'); <mask> <mask> Form = connect((state) => { </s> + client: add multiple fields cli...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
<mask> <mask> const selector = formValueSelector('clientForm'); <mask> <mask> Form = connect((state) => { <mask> const clientIdentifier = selector(state, 'identifier'); <mask> const useGlobalSettings = selector(state, 'use_global_settings'); <mask> const useGlobalServices = selector(state, 'use_glo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
<mask> const clientIdentifier = selector(state, 'identifier'); <mask> const useGlobalSettings = selector(state, 'use_global_settings'); <mask> const useGlobalServices = selector(state, 'use_global_blocked_services'); <mask> return { <mask> clientIdentifier, <mask> useGlobalSettings...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
validate,
<mask> reduxForm({ <mask> form: 'clientForm', <mask> enableReinitialize: true, <mask> }), <mask> ])(Form); </s> + client: add multiple fields client form </s> remove identifier: CLIENT_ID.IP, </s> add ids: [''], </s> remove identifier, </s> add </...
[ "keep", "keep", "add", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/Settings/Clients/Form.js
<symbol id="cross" viewBox="0 0 24 24" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> <line x1="18" y1="6" x2="6" y2="18"></line><line x1="6" y1="6" x2="18" y2="18"></line> </symbol> <symbol id="plus" viewBox="0 0 24 24" stroke="currentColor" str...
<mask> <symbol id="location" viewBox="0 0 24 24" fill="currentColor" strokeLinecap="round" strokeLinejoin="round"> <mask> <path d="M12,2C8.134,2,5,5.134,5,9c0,5,7,13,7,13s7-8,7-13C19,5.134,15.866,2,12,2z M12,11.5c-1.381,0-2.5-1.119-2.5-2.5 c0-1.381,1.119-2.5,2.5-2.5s2.5,1.119,2.5,2.5C14.5,10.381,1...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/components/ui/Icons.js
// Validation functions
<mask> </Fragment> <mask> ); <mask> <mask> export const required = (value) => { <mask> if (value || value === 0) { <mask> return false; <mask> } <mask> return <Trans>form_error_required</Trans>; <mask> }; </s> + client: add multiple fields client form </s> remove const clientInfo ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/helpers/form.js
import { getClientInfo, getAutoClientInfo, normalizeWhois } from './helpers';
<mask> import React, { Fragment } from 'react'; <mask> import { getClientInfo, normalizeWhois } from './helpers'; <mask> import { WHOIS_ICONS } from './constants'; <mask> <mask> const getFormattedWhois = (whois, t) => { <mask> const whoisInfo = normalizeWhois(whois); <mask> return ( </s> + client: add ...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/helpers/formatClientCell.js
const clientInfo = getClientInfo(clients, value) || getAutoClientInfo(autoClients, value);
<mask> ); <mask> }; <mask> <mask> export const formatClientCell = (value, clients, autoClients, t) => { <mask> const clientInfo = getClientInfo(clients, value) || getClientInfo(autoClients, value); <mask> const { name, whois } = clientInfo; <mask> let whoisContainer = ''; <mask> let nameCon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/helpers/formatClientCell.js
const client = clients .find(item => item.ip_addrs && item.ip_addrs.find(clientIp => clientIp === ip)); if (!client) { return ''; } const { name, whois_info } = client; const whois = Object.keys(whois_info).length > 0 ? whois_info : ''; return { name, whois }; }; export const...
<mask> <mask> export const normalizeTextarea = text => text && text.replace(/[;, ]/g, '\n').split('\n').filter(n => n); <mask> <mask> export const getClientInfo = (clients, ip) => { <mask> const client = clients.find(item => ip === item.ip); <mask> <mask> if (!client) { <mask> return ''; <ma...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d6e9ec9ef0f6c13e88f1785366ba8e5cf08156
client/src/helpers/helpers.js
<mask> ParentalEnabled bool <mask> ServicesRules []ServiceEntry <mask> } <mask> <mask> // RewriteEntry is a rewrite array element <mask> type RewriteEntry struct { <mask> Domain string `yaml:"domain"` <mask> Answer string `yaml:"answer"` // IP address or canonical name <mask> } <mask> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
<mask> } <mask> <mask> // Config allows you to configure DNS filtering with New() or just change variables directly. <mask> type Config struct { <mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17 <mask> ParentalEnabled bool `yaml:"parental_enabled"` <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
d.confLock.Lock()
<mask> <mask> // WriteDiskConfig - write configuration <mask> func (d *Dnsfilter) WriteDiskConfig(c *Config) { <mask> *c = d.Config <mask> c.Rewrites = rewriteArrayDup(d.Config.Rewrites) <mask> d.confLock.Unlock() <mask> } <mask> <mask> // SetFilters - set new filters (synchronously or asynchronously) </...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
c.Rewrites = rewriteArrayDup(d.Config.Rewrites) d.confLock.Unlock()
<mask> func (d *Dnsfilter) WriteDiskConfig(c *Config) { <mask> d.confLock.Lock() <mask> *c = d.Config <mask> } <mask> <mask> // SetFilters - set new filters (synchronously or asynchronously) <mask> // When filters are set asynchronously, the old filters continue working until the new filters are ready. </s> ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
<mask> <mask> return Result{}, nil <mask> } <mask> <mask> // Return TRUE of host name matches a wildcard pattern <mask> func matchDomainWildcard(host, wildcard string) bool { <mask> return len(wildcard) >= 2 && <mask> wildcard[0] == '*' && wildcard[1] == '.' && <mask> strings.HasSuffix(host, wildcard[1...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
// . Find CNAME for a domain name (exact match or by wildcard)
<mask> strings.HasSuffix(host, wildcard[1:]) <mask> } <mask> <mask> // Process rewrites table <mask> // . Find CNAME for a domain name <mask> // . if found, set domain name to canonical name <mask> // . Find A or AAAA record for a domain name <mask> // . if found, return IP addresses <mask> func (d *Dnsfi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
// . repeat for the new domain name (Note: we return only the last CNAME) // . Find A or AAAA record for a domain name (exact match or by wildcard)
<mask> <mask> // Process rewrites table <mask> // . Find CNAME for a domain name <mask> // . if found, set domain name to canonical name <mask> // . Find A or AAAA record for a domain name <mask> // . if found, return IP addresses <mask> func (d *Dnsfilter) processRewrites(host string, qtype uint16) Result { ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
rr := findRewrites(d.Rewrites, host) if len(rr) != 0 { res.Reason = ReasonRewrite
<mask> <mask> d.confLock.RLock() <mask> defer d.confLock.RUnlock() <mask> <mask> for _, r := range d.Rewrites { <mask> if r.Domain != host { <mask> if !matchDomainWildcard(host, r.Domain) { <mask> continue <mask> } <mask> } <mask> <mask> ip := net.ParseIP(r.Answer) <mask> if ip == n...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
cnames := map[string]bool{} origHost := host for len(rr) != 0 && rr[0].Type == dns.TypeCNAME { log.Debug("Rewrite: CNAME for %s is %s", host, rr[0].Answer) host = rr[0].Answer _, ok := cnames[host] if ok { log.Info("Rewrite: breaking CNAME redirection loop: %s. Question: %s", host, origHost) return re...
<mask> break <mask> } <mask> } <mask> <mask> for _, r := range d.Rewrites { <mask> if r.Domain != host { <mask> if !matchDomainWildcard(host, r.Domain) { <mask> continue <mask> } <mask> } <mask> <mask> ip := net.ParseIP(r.Answer) <mask> if ip == nil { <mask> continue <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", "keep", "keep"...
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
cnames[host] = false res.CanonName = rr[0].Answer rr = findRewrites(d.Rewrites, host)
<mask> return res <mask> } <mask> } <mask> <mask> for _, r := range rr { <mask> if r.Type != dns.TypeCNAME && r.Type == qtype { </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the following: commit 8ab742d84916a02043989fcfa5fc258e84046205 Merge: 2abde92f e398117d A...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
for _, r := range rr { if r.Type != dns.TypeCNAME && r.Type == qtype { res.IPList = append(res.IPList, r.IP) log.Debug("Rewrite: A/AAAA for %s is %s", host, r.IP) }
<mask> log.Debug("Rewrite: AAAA for %s is %s", host, ip) <mask> } <mask> } <mask> <mask> if len(res.IPList) != 0 { <mask> res.Reason = ReasonRewrite <mask> } <mask> <mask> return res <mask> } <mask> </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the follow...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
d.prepareRewrites()
<mask> <mask> if c != nil { <mask> d.Config = *c <mask> } <mask> <mask> if filters != nil { <mask> err := d.initFiltering(filters) <mask> if err != nil { <mask> log.Error("Can't initialize filtering subsystem: %s", err) </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed c...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter.go
<mask> <mask> func TestParentalControl(t *testing.T) { <mask> d := NewForTest(&Config{ParentalEnabled: true}, nil) <mask> defer d.Close() <mask> d.ParentalSensitivity = 3 <mask> d.checkMatch(t, "pornhub.com") <mask> d.checkMatch(t, "www.pornhub.com") <mask> d.checkMatchEmpty(t, "www.yandex.ru") <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
<mask> filters := make(map[int]string) <mask> filters[0] = "||example.org^\n" <mask> d := NewForTest(&Config{ParentalEnabled: true, SafeBrowsingEnabled: false}, filters) <mask> defer d.Close() <mask> d.ParentalSensitivity = 3 <mask> <mask> // no client settings: <mask> <mask> // blocked by filters <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
RewriteEntry{"somecname", "somehost.com", 0, nil}, RewriteEntry{"somehost.com", "0.0.0.0", 0, nil},
<mask> func TestRewrites(t *testing.T) { <mask> d := Dnsfilter{} <mask> // CNAME, A, AAAA <mask> d.Rewrites = []RewriteEntry{ <mask> RewriteEntry{"somecname", "somehost.com"}, <mask> RewriteEntry{"somehost.com", "0.0.0.0"}, <mask> <mask> RewriteEntry{"host.com", "1.2.3.4"}, <mask> RewriteEntry{"hos...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
RewriteEntry{"host.com", "1.2.3.4", 0, nil}, RewriteEntry{"host.com", "1.2.3.5", 0, nil}, RewriteEntry{"host.com", "1:2:3::4", 0, nil}, RewriteEntry{"www.host.com", "host.com", 0, nil},
<mask> d.Rewrites = []RewriteEntry{ <mask> RewriteEntry{"somecname", "somehost.com"}, <mask> RewriteEntry{"somehost.com", "0.0.0.0"}, <mask> <mask> RewriteEntry{"host.com", "1.2.3.4"}, <mask> RewriteEntry{"host.com", "1.2.3.5"}, <mask> RewriteEntry{"host.com", "1:2:3::4"}, <mask> RewriteEntry{"www...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
d.prepareRewrites()
<mask> RewriteEntry{"host.com", "1.2.3.5", 0, nil}, <mask> RewriteEntry{"host.com", "1:2:3::4", 0, nil}, <mask> RewriteEntry{"www.host.com", "host.com", 0, nil}, <mask> } <mask> r := d.processRewrites("host2.com", dns.TypeA) <mask> assert.Equal(t, NotFilteredNotFound, r.Reason) <mask> <mask> r = d.pr...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
RewriteEntry{"host.com", "1.2.3.4", 0, nil}, RewriteEntry{"*.host.com", "1.2.3.5", 0, nil},
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1:2:3::4"))) <mask> <mask> // wildcard <mask> d.Rewrites = []RewriteEntry{ <mask> RewriteEntry{"*.host.com", "1.2.3.5"}, <mask> RewriteEntry{"host.com", "1.2.3.4"}, <mask> } <mask> r = d.processRewrites("host.com", dns.TypeA) <mask> assert.Equal(t...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
d.prepareRewrites()
<mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil}, <mask> RewriteEntry{"*.host.com", "1.2.3.5", 0, nil}, <mask> } <mask> r = d.processRewrites("host.com", dns.TypeA) <mask> assert.Equal(t, ReasonRewrite, r.Reason) <mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4"))) <mask> <mask> r = d.pr...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
// override a wildcard d.Rewrites = []RewriteEntry{ RewriteEntry{"a.host.com", "1.2.3.4", 0, nil}, RewriteEntry{"*.host.com", "1.2.3.5", 0, nil}, } d.prepareRewrites() r = d.processRewrites("a.host.com", dns.TypeA) assert.Equal(t, ReasonRewrite, r.Reason) assert.True(t, len(r.IPList) == 1) assert.True(t, r....
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason) <mask> <mask> // wildcard + CNAME <mask> d.Rewrites = []RewriteEntry{ <mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil}, <mask> RewriteEntry{"*.host.com", "host.com", 0, nil}, </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
RewriteEntry{"host.com", "1.2.3.4", 0, nil}, RewriteEntry{"*.host.com", "host.com", 0, nil},
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason) <mask> <mask> // wildcard + CNAME <mask> d.Rewrites = []RewriteEntry{ <mask> RewriteEntry{"*.host.com", "host.com"}, <mask> RewriteEntry{"host.com", "1.2.3.4"}, <mask> } <mask> r = d.processRewrites("www.host.com", dns.TypeA) <mask> assert.Equal(...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
d.prepareRewrites()
<mask> d.Rewrites = []RewriteEntry{ <mask> RewriteEntry{"host.com", "1.2.3.4", 0, nil}, <mask> RewriteEntry{"*.host.com", "host.com", 0, nil}, <mask> } <mask> r = d.processRewrites("www.host.com", dns.TypeA) <mask> assert.Equal(t, ReasonRewrite, r.Reason) <mask> assert.Equal(t, "host.com", r.CanonName) ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/dnsfilter_test.go
"net"
<mask> package dnsfilter <mask> <mask> import ( <mask> "encoding/json" <mask> "net/http" <mask> "sort" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/golibs/log" </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the following: commit 8ab742d84916a02043989fcfa...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/rewrites.go
"sort" "strings"
<mask> "net" <mask> "net/http" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> "github.com/miekg/dns" <mask> ) </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the following: commit 8ab742d84916a02043989fcfa5fc258e84046205 Merge: 2abde92f e398117d Author: Simon ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/rewrites.go
"github.com/miekg/dns"
<mask> "sort" <mask> "strings" <mask> <mask> "github.com/AdguardTeam/golibs/log" <mask> ) <mask> <mask> // RewriteEntry is a rewrite array element <mask> type RewriteEntry struct { <mask> Domain string `yaml:"domain"` <mask> Answer string `yaml:"answer"` // IP address or canonical name </s> Merge: + d...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/rewrites.go
ent.prepare()
<mask> ent := RewriteEntry{ <mask> Domain: jsent.Domain, <mask> Answer: jsent.Answer, <mask> } <mask> d.confLock.Lock() <mask> d.Config.Rewrites = append(d.Config.Rewrites, ent) <mask> d.confLock.Unlock() <mask> log.Debug("Rewrites: added element: %s -> %s [%d]", <mask> ent.Domain, ent.Answer, len(...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/rewrites.go
if ent.equals(entDel) {
<mask> } <mask> arr := []RewriteEntry{} <mask> d.confLock.Lock() <mask> for _, ent := range d.Config.Rewrites { <mask> if ent == entDel { <mask> log.Debug("Rewrites: removed element: %s -> %s", ent.Domain, ent.Answer) <mask> continue <mask> } <mask> arr = append(arr, ent) <mask> } </s> Merge...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/rewrites.go
<mask> <mask> package dnsfilter <mask> <mask> import ( <mask> "bufio" <mask> "bytes" <mask> "crypto/sha256" <mask> "encoding/binary" <mask> "encoding/gob" <mask> "encoding/hex" </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the following: commit 8ab742d84916a020...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
<mask> "encoding/binary" <mask> "encoding/gob" <mask> "encoding/hex" <mask> "encoding/json" <mask> "errors" <mask> "fmt" <mask> "io" <mask> "net" <mask> "net/http" <mask> "strconv" </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the following: commit 8ab742d849...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
<mask> "encoding/hex" <mask> "encoding/json" <mask> "errors" <mask> "fmt" <mask> "io" <mask> "net" <mask> "net/http" <mask> "strconv" <mask> "strings" <mask> "time" </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the following: commit 8ab742d84916a02043989fcfa5...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
<mask> "fmt" <mask> "io" <mask> "net" <mask> "net/http" <mask> "strconv" <mask> "strings" <mask> "time" <mask> <mask> "github.com/AdguardTeam/dnsproxy/upstream" <mask> "github.com/AdguardTeam/golibs/cache" </s> Merge: + dns rewrites: support wildcard override Close #922 Squashed commit of the foll...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
<mask> return <mask> } <mask> } <mask> <mask> func parseParametersFromBody(r io.Reader) (map[string]string, error) { <mask> parameters := map[string]string{} <mask> <mask> scanner := bufio.NewScanner(r) <mask> for scanner.Scan() { <mask> line := scanner.Text() <mask> if len(line) == 0 { <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", "keep", "keep"...
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
<mask> return parameters, nil <mask> } <mask> <mask> func (d *Dnsfilter) handleParentalEnable(w http.ResponseWriter, r *http.Request) { <mask> parameters, err := parseParametersFromBody(r.Body) <mask> if err != nil { <mask> httpError(r, w, http.StatusBadRequest, "failed to parse parameters from body: %s", ...
[ "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/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
<mask> func (d *Dnsfilter) handleParentalStatus(w http.ResponseWriter, r *http.Request) { <mask> data := map[string]interface{}{ <mask> "enabled": d.Config.ParentalEnabled, <mask> } <mask> if d.Config.ParentalEnabled { <mask> data["sensitivity"] = d.Config.ParentalSensitivity <mask> } <mask> jsonVal, e...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6d75118061b35dc3293991e0b5fd2826eaf0d2f
dnsfilter/security.go
ifaceIPNet, err := ifaceIPAddrs(iface, ipVersion4)
<mask> if err != nil { <mask> return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) <mask> } <mask> <mask> ifaceIPNet, err := ifaceIPv4Addrs(iface) <mask> if err != nil { <mask> return false, fmt.Errorf("getting ipv4 addrs for iface %s: %w", ifaceName, err) <mask> } <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/check_other_dhcp.go
ifaceIPNet, err := ifaceIPAddrs(iface, ipVersion6)
<mask> if err != nil { <mask> return false, fmt.Errorf("dhcpv6: net.InterfaceByName: %s: %w", ifaceName, err) <mask> } <mask> <mask> ifaceIPNet, err := ifaceIPv6Addrs(iface) <mask> if err != nil { <mask> return false, fmt.Errorf("getting ipv6 addrs for iface %s: %w", ifaceName, err) <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/check_other_dhcp.go
// v4Server is a DHCPv4 server. // // TODO(a.garipov): Think about unifying this and v6Server.
<mask> "github.com/insomniacslk/dhcp/dhcpv4" <mask> "github.com/insomniacslk/dhcp/dhcpv4/server4" <mask> ) <mask> <mask> // v4Server - DHCPv4 server <mask> type v4Server struct { <mask> srv *server4.Server <mask> leasesLock sync.Mutex <mask> leases []*Lease <mask> ipAddrs [256]byte </s> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v4.go
<mask> return <mask> } <mask> } <mask> <mask> // ifaceIPv4Addrs returns the interface's IPv4 addresses. <mask> func ifaceIPv4Addrs(iface *net.Interface) (ips []net.IP, err error) { <mask> addrs, err := iface.Addrs() <mask> if err != nil { <mask> return nil, err <mask> } <mask> <mask> for _, a := ...
[ "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", "ke...
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v4.go
dnsIPAddrs, err := ifaceDNSIPAddrs(iface, ipVersion4, defaultMaxAttempts, defaultBackoff)
<mask> } <mask> <mask> log.Debug("dhcpv4: starting...") <mask> <mask> dnsIPAddrs, err := ifaceIPv4Addrs(iface) <mask> if err != nil { <mask> return fmt.Errorf("dhcpv4: getting ipv4 addrs for iface %s: %w", ifaceName, err) <mask> } <mask> <mask> switch len(dnsIPAddrs) { </s> Pull request: dhcpd: wa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v4.go
return fmt.Errorf("dhcpv4: interface %s: %w", ifaceName, err)
<mask> log.Debug("dhcpv4: starting...") <mask> <mask> dnsIPAddrs, err := ifaceIPv4Addrs(iface) <mask> if err != nil { <mask> return fmt.Errorf("dhcpv4: getting ipv4 addrs for iface %s: %w", ifaceName, err) <mask> } <mask> <mask> switch len(dnsIPAddrs) { <mask> case 0: <mask> log.Debug("dhcpv4: no ...
[ "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/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v4.go
// v6Server is a DHCPv6 server. // // TODO(a.garipov): Think about unifying this and v4Server.
<mask> ) <mask> <mask> const valueIAID = "ADGH" // value for IANA.ID <mask> <mask> // v6Server - DHCPv6 server <mask> type v6Server struct { <mask> srv *server6.Server <mask> leasesLock sync.Mutex <mask> leases []*Lease <mask> ipAddrs [256]byte </s> Pull request: dhcpd: wait for interface...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6.go
<mask> return <mask> } <mask> } <mask> <mask> type netIface interface { <mask> Addrs() ([]net.Addr, error) <mask> } <mask> <mask> // ifaceIPv6Addrs returns the interface's IPv6 addresses. <mask> func ifaceIPv6Addrs(iface netIface) (ips []net.IP, err error) { <mask> addrs, err := iface.Addrs() <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/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6.go
log.Debug("dhcpv6: starting...")
<mask> if err != nil { <mask> return fmt.Errorf("dhcpv6: finding interface %s by name: %w", ifaceName, err) <mask> } <mask> <mask> log.Debug("dhcpv4: starting...") <mask> <mask> dnsIPAddrs, err := ifaceIPv6Addrs(iface) <mask> if err != nil { <mask> return fmt.Errorf("dhcpv6: getting ipv6 addrs for i...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6.go
dnsIPAddrs, err := ifaceDNSIPAddrs(iface, ipVersion6, defaultMaxAttempts, defaultBackoff)
<mask> } <mask> <mask> log.Debug("dhcpv4: starting...") <mask> <mask> dnsIPAddrs, err := ifaceIPv6Addrs(iface) <mask> if err != nil { <mask> return fmt.Errorf("dhcpv6: getting ipv6 addrs for iface %s: %w", ifaceName, err) <mask> } <mask> <mask> switch len(dnsIPAddrs) { </s> Pull request: dhcpd: wa...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6.go
return fmt.Errorf("dhcpv6: interface %s: %w", ifaceName, err)
<mask> log.Debug("dhcpv4: starting...") <mask> <mask> dnsIPAddrs, err := ifaceIPv6Addrs(iface) <mask> if err != nil { <mask> return fmt.Errorf("dhcpv6: getting ipv6 addrs for iface %s: %w", ifaceName, err) <mask> } <mask> <mask> switch len(dnsIPAddrs) { <mask> case 0: <mask> log.Debug("dhcpv6: no ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6.go
log.Debug("dhcpv6: listening...")
<mask> log.Debug("DHCPv6: not starting DHCPv6 server due to ra_slaac_only=true") <mask> return nil <mask> } <mask> <mask> log.Debug("DHCPv6: starting...") <mask> <mask> if len(iface.HardwareAddr) != 6 { <mask> return fmt.Errorf("dhcpv6: invalid MAC %s", iface.HardwareAddr) <mask> } <mask> s.sid =...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6.go
<mask> import ( <mask> "net" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr" <mask> "github.com/insomniacslk/dhcp/dhcpv6" <mask> "github.com/insomniacslk/dhcp/iana" <mask> "github.com/stretchr/testify/assert" <mask> ) <mask> </s> Pull request: dhcpd: wait for inter...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6_test.go
<mask> assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2"))) <mask> assert.True(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::2"))) <mask> assert.True(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::3"))) <mask> } <mask> <mask> type fakeIface struct { <mask> addrs [...
[ "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/a6e18c47000425dc28a2375b2480a16c84d85438
internal/dhcpd/v6_test.go
"example_upstream_reserved": "You can specify a DNS upstream <0>for the specific domain(s)</0>", "example_upstream_comment": "You can specify a comment", "upstream_parallel": "Use parallel queries to speed up resolving by querying all upstream servers simultaneously.",
<mask> { <mask> "client_settings": "Client settings", <mask> "example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)</0>", <mask> "example_upstream_comment": "You can specify the comment", <mask> "upstream_parallel": "Use parallel requests to speed up resolving by s...
[ "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"load_balancing_desc": "Query one upstream server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server is used more often.",
<mask> "example_upstream_comment": "You can specify the comment", <mask> "upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers", <mask> "parallel_requests": "Parallel requests", <mask> "load_balancing": "Load-balancing", <mask> "load_b...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"save_config": "Save configuration",
<mask> "load_balancing_desc": "Query one server at a time. AdGuard Home will use the weighted random algorithm to pick the server so that the fastest server will be used more often.", <mask> "bootstrap_dns": "Bootstrap DNS servers", <mask> "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"dhcp_not_found": "It is safe to enable the built-in DHCP server because AdGuard Home didn't find any active DHCP servers on the network. However, you should re-check that manually as the automatic probing doesn't currently provide a 100% guarantee.",
<mask> "dhcp_title": "DHCP server (experimental!)", <mask> "dhcp_description": "If your router does not provide DHCP settings, you can use AdGuard's own built-in DHCP server.", <mask> "dhcp_enable": "Enable DHCP server", <mask> "dhcp_disable": "Disable DHCP server", <mask> "dhcp_not_found": "It...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"dhcp_config_saved": "DHCP configuration successfully saved",
<mask> "dhcp_found": "An active DHCP server is found on the network. It is not safe to enable the built-in DHCP server.", <mask> "dhcp_leases": "DHCP leases", <mask> "dhcp_static_leases": "DHCP static leases", <mask> "dhcp_leases_not_found": "No DHCP leases found", <mask> "dhcp_config_saved": "...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network, as this may break the Internet connectivity for devices on the network!", "dhcp_error": "AdGuard Home could not determine if there is another active DHCP server on the network.", "...
<mask> "dhcp_ip_addresses": "IP addresses", <mask> "ip": "IP", <mask> "dhcp_table_hostname": "Hostname", <mask> "dhcp_table_expires": "Expires", <mask> "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network. Otherwise, it c...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"dhcp_reset": "Are you sure you want to reset the DHCP configuration?",
<mask> "dhcp_lease_deleted": "Static lease \"{{key}}\" successfully deleted", <mask> "dhcp_new_static_lease": "New static lease", <mask> "dhcp_static_leases_not_found": "No DHCP static leases found", <mask> "dhcp_add_static_lease": "Add static lease", <mask> "dhcp_reset": "Are you sure you want...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"number_of_dns_query_days": "The number of DNS queries processed for the last {{count}} day", "number_of_dns_query_days_plural": "The number of DNS queries processed for the last {{count}} days", "number_of_dns_query_24_hours": "The number of DNS queries processed for the last 24 hours", "number_of_dns_...
<mask> "top_blocked_domains": "Top blocked domains", <mask> "top_clients": "Top clients", <mask> "no_clients_found": "No clients found", <mask> "general_statistics": "General statistics", <mask> "number_of_dns_query_days": "A number of DNS queries processed for the last {{count}} day", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"number_of_dns_query_to_safe_search": "The number of DNS requests to search engines for which Safe Search was enforced",
<mask> "number_of_dns_query_blocked_24_hours": "A number of DNS requests blocked by adblock filters and hosts blocklists", <mask> "number_of_dns_query_blocked_24_hours_by_sec": "A number of DNS requests blocked by the AdGuard browsing security module", <mask> "number_of_dns_query_blocked_24_hours_adult":...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"rate_limit_desc": "The number of requests per second allowed per client. Setting it to 0 means no limit.",
<mask> "form_enter_rate_limit": "Enter rate limit", <mask> "rate_limit": "Rate limit", <mask> "edns_enable": "Enable EDNS Client Subnet", <mask> "edns_cs_desc": "If enabled, AdGuard Home will be sending clients' subnets to the DNS servers.", <mask> "rate_limit_desc": "The number of requests per...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"form_error_port": "Enter valid port number",
<mask> "install_settings_title": "Admin Web Interface", <mask> "install_settings_listen": "Listen interface", <mask> "install_settings_port": "Port", <mask> "install_settings_interface_link": "Your AdGuard Home admin web interface will be available on the following addresses:", <mask> "form_err...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"install_devices_router_list_4": "On some router types, a custom DNS server cannot be set up. In that case, setting up AdGuard Home as a <0>DHCP server</0> may help. Otherwise, you should check the router manual on how to customize DNS servers on your specific router model.",
<mask> "install_devices_address": "AdGuard Home DNS server is listening on the following addresses", <mask> "install_devices_router_list_1": "Open the preferences for your router. Usually, you can access it from your browser via a URL (like http://192.168.0.1/ or http://192.168.1.1/). You may be asked to ente...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"encryption_config_saved": "Encryption configuration saved",
<mask> "open_dashboard": "Open Dashboard", <mask> "install_saved": "Saved successfully", <mask> "encryption_title": "Encryption", <mask> "encryption_desc": "Encryption (HTTPS/TLS) support for both DNS and admin web interface", <mask> "encryption_config_saved": "Encryption config saved", <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"form_error_port_range": "Enter port number in the range of 80-65535",
<mask> "encryption_hostnames": "Hostnames", <mask> "encryption_reset": "Are you sure you want to reset encryption settings?", <mask> "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.", <mask> "topline_expired_certificate": "Your SSL certific...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"form_error_equal": "Must not be equal",
<mask> "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.", <mask> "topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings</0>.", <mask> "form_error_port_range": "Enter port value in the range of 80-65535", ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"access_blocked_desc": "Don't confuse this with filters. AdGuard Home will drop DNS queries with these domains in queries' questions. Here you can specify the exact domain names, wildcards and URL filter rules, e.g. \"example.org\", \"*.example.org\" or \"||example.org^\".",
<mask> "access_allowed_desc": "A list of CIDR or IP addresses. If configured, AdGuard Home will accept requests from these IP addresses only.", <mask> "access_disallowed_title": "Disallowed clients", <mask> "access_disallowed_desc": "A list of CIDR or IP addresses. If configured, AdGuard Home will drop r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses. This slows down DNS queries as AdGuard Home has to wait for responses from all DNS servers, but improves the overall connectivity.",
<mask> "rewrite_AAAA": "<0>AAAA</0>: special value, keep <0>AAAA</0> records from the upstream", <mask> "disable_ipv6": "Disable IPv6", <mask> "disable_ipv6_desc": "If this feature is enabled, all DNS queries for IPv6 addresses (type AAAA) will be dropped.", <mask> "fastest_addr": "Fastest IP addres...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"setup_config_to_enable_dhcp_server": "Setup configuration to enable DHCP server",
<mask> "filter_category_general_desc": "Lists that block tracking and advertising on most of the devices", <mask> "filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains", <mask> "filter_category_regional_desc": "Lists that focus on regional ads and tracking ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
<mask> "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this.", <mask> "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.", <mask> "client_not_in_allowed...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
}
<mask> "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.", <mask> "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.", <mask> "experimental": "Experimental" <mask> } </s> Pull request: client: imp en...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a72ce1cfae8b726ffdc329ef004c02e64a5b4be1
client/src/__locales/en.json
"install_devices_router": "Router", "install_devices_router_desc": "This setup will automatically cover all the devices connected to your home router and you will not need to configure each of them manually.", "install_devices_router_list_1": "Open the preferences for your router. Usually, you can access it...
<mask> "install_devices_title": "Configure your devices", <mask> "install_devices_desc": "In order for AdGuard Home to start working, you need to configure your devices to use it.", <mask> "install_submit_title": "Congratulations!", <mask> "install_submit_desc": "The setup procedure is finished and ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/__locales/en.json
"install_saved": "All settings saved", "form_error_password": "Password mismatched"
<mask> "install_decices_router_list_3": "Enter your AdGuard Home server addresses there.", <mask> "get_started": "Get Started", <mask> "next": "Next", <mask> "open_dashboard": "Open Dashboard", <mask> "install_saved": "All settings saved" <mask> } </s> Fixed validation and added toasts </s> re...
[ "keep", "keep", "keep", "keep", "replace", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/__locales/en.json
export const removeToast = createAction('REMOVE_TOAST');
<mask> <mask> export const addErrorToast = createAction('ADD_ERROR_TOAST'); <mask> export const addSuccessToast = createAction('ADD_SUCCESS_TOAST'); <mask> export const nextStep = createAction('NEXT_STEP'); <mask> export const prevStep = createAction('PREV_STEP'); <mask> <mask> export const getDefaultAddresses...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/actions/install.js
import i18n from '../../i18n';
<mask> import flow from 'lodash/flow'; <mask> <mask> import Controls from './Controls'; <mask> import renderField from './renderField'; <mask> <mask> const required = (value) => { </s> Fixed validation and added toasts </s> remove import validate from './validate'; </s> add
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
<mask> import { withNamespaces, Trans } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import Controls from './Controls'; <mask> import validate from './validate'; <mask> import renderField from './renderField'; <mask> <mask> const required = (value) => { <mask> if (value || v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
const validate = (values) => { const errors = {}; if (values.confirm_password !== values.password) { errors.confirm_password = i18n.t('form_error_password'); } return errors; };
<mask> return <Trans>form_error_required</Trans>; <mask> }; <mask> <mask> const Auth = (props) => { <mask> const { <mask> handleSubmit, <mask> pristine, </s> Fixed validation and added toasts </s> remove submitting, </s> add </s> remove const { install } = state; const...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
<mask> <mask> const Auth = (props) => { <mask> const { <mask> handleSubmit, <mask> submitting, <mask> pristine, <mask> t, <mask> } = props; <mask> <mask> return ( </s> Fixed validation and added toasts </s> remove const { install } = state; const props = ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
invalid,
<mask> const { <mask> handleSubmit, <mask> pristine, <mask> t, <mask> } = props; <mask> <mask> return ( <mask> <form className="setup__step" onSubmit={handleSubmit}> </s> Fixed validation and added toasts </s> remove submitting, </s> add </s> remove co...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
<Controls pristine={pristine} invalid={invalid} />
<mask> autoComplete="new-password" <mask> /> <mask> </div> <mask> </div> <mask> <Controls submitting={submitting} pristine={pristine} /> <mask> </form> <mask> ); <mask> }; <mask> <mask> Auth.propTypes = { </s> Fi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
invalid: PropTypes.bool.isRequired,
<mask> <mask> Auth.propTypes = { <mask> handleSubmit: PropTypes.func.isRequired, <mask> pristine: PropTypes.bool.isRequired, <mask> submitting: PropTypes.bool.isRequired, <mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default flow([ <mask> withNamespaces(), </s> Fix...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Auth.js
disabled={this.props.invalid || this.props.pristine}
<mask> </button> <mask> <button <mask> type="submit" <mask> className="btn btn-success btn-standard btn-lg" <mask> disabled={this.props.submitting || this.props.pristine} <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Controls.js
<mask> <button <mask> type="button" <mask> className="btn btn-success btn-standard btn-lg" <mask> onClick={this.props.nextStep} <mask> disabled={this.props.submitting || this.prop...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Controls.js
invalid: PropTypes.bool,
<mask> pristine: PropTypes.bool, <mask> submitting: PropTypes.bool, <mask> }; <mask> <mask> const mapStateToProps = (state) => { <mask> const { step } = state.install; <mask> const props = { step }; <mask> return props; </s> Fixed validation and added toasts </s> remove const { install...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Controls.js
<Trans>install_devices_router</Trans>
<mask> <Icons /> <mask> <Tabs> <mask> <div label="Router"> <mask> <div className="tab__title"> <mask> <Trans>install_decices_router</Trans> <mask> </div> <mask> <div className="tab__text"> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Devices.js
<Trans>install_devices_router_desc</Trans>
<mask> <div className="tab__title"> <mask> <Trans>install_decices_router</Trans> <mask> </div> <mask> <div className="tab__text"> <mask> <Trans>install_decices_router_desc</Trans> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Devices.js
<Trans>install_devices_router_list_1</Trans>
<mask> <div className="tab__text"> <mask> <Trans>install_decices_router_desc</Trans> <mask> <ol> <mask> <li> <mask> <Trans>install_decices_router_list_1</Trans> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Devices.js
<Trans>install_devices_router_list_2</Trans>
<mask> <li> <mask> <Trans>install_decices_router_list_1</Trans> <mask> </li> <mask> <li> <mask> <Trans>install_decices_router_list_2</Trans> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Devices.js
<Trans>install_devices_router_list_3</Trans>
<mask> <li> <mask> <Trans>install_decices_router_list_2</Trans> <mask> </li> <mask> <li> <mask> <Trans>install_decices_router_list_3</Trans> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Devices.js
invalid,
<mask> interfaceIp, <mask> dnsIp, <mask> } = props; <mask> <mask> return ( <mask> <form className="setup__step" onSubmit={handleSubmit}> </s> Fixed validation and added toasts </s> remove submitting, </s> add </s> remove const { install } = state; const props = ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Settings.js
<Controls invalid={invalid} />
<mask> <p className="setup__desc"> <mask> <Trans>install_settings_dns_desc</Trans> <strong>{dnsIp}</strong> <mask> </p> <mask> </div> <mask> <Controls /> <mask> </form> <mask> ); <mask> }; <mask> <mask> Settings.propTypes...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7416f9c34c3fc1df3b3ececb2e9c77923059685
client/src/install/Setup/Settings.js