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
var printHelp func()
<mask> // therefore, we must do it manually instead of using a lib <mask> { <mask> var configFilename *string <mask> var bindHost *string <mask> var bindPort *int <mask> var opts = []struct { </s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove l...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
longName string shortName string description string callbackWithValue func(value string) callbackNoValue func()
<mask> var configFilename *string <mask> var bindHost *string <mask> var bindPort *int <mask> var opts = []struct { <mask> longName string <mask> shortName string <mask> description string <mask> callback func(value string) <mask> }{ <mask> {"config", "c", "path to config file...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
{"config", "c", "path to config file", func(value string) { configFilename = &value }, nil}, {"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }, nil},
<mask> shortName string <mask> description string <mask> callback func(value string) <mask> }{ <mask> {"config", "c", "path to config file", func(value string) { configFilename = &value }}, <mask> {"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
}, nil}, {"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }}, {"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }},
<mask> if err != nil { <mask> panic("Got port that is not a number") <mask> } <mask> bindPort = &v <mask> }}, <mask> {"verbose", "v", "enable verbose output", nil}, <mask> {"help", "h", "print this help", nil}, <mask> } <mask> printHelp := func() { <mask> fmt.Printf("Usage:\n\...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
printHelp = func() {
<mask> }}, <mask> {"verbose", "v", "enable verbose output", nil}, <mask> {"help", "h", "print this help", nil}, <mask> } <mask> printHelp := func() { <mask> fmt.Printf("Usage:\n\n") <mask> fmt.Printf("%s [options]\n\n", os.Args[0]) <mask> fmt.Printf("Options:\n") <mask> for _, opt := r...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
<mask> } <mask> } <mask> for i := 1; i < len(os.Args); i++ { <mask> v := os.Args[i] <mask> // short-circuit for help <mask> if v == "--help" || v == "-h" { <mask> printHelp() <mask> os.Exit(64) <mask> } <mask> if v == "--verbose" || v == "-v" { <mask> log.SetLevel(log.TraceL...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
if v == "--"+opt.longName || v == "-"+opt.shortName { if opt.callbackWithValue != nil { if i+1 > len(os.Args) { log.Printf("ERROR: Got %s without argument\n", v) os.Exit(64) } i++ opt.callbackWithValue(os.Args[i]) } else if opt.callbackNoValue != nil { opt.callb...
<mask> log.SetLevel(log.TraceLevel) <mask> } <mask> knownParam := false <mask> for _, opt := range opts { <mask> if v == "--"+opt.longName { <mask> if i+1 > len(os.Args) { <mask> log.Printf("ERROR: Got %s without argument\n", v) <mask> os.Exit(64) <mask> } <mask> i+...
[ "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/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
<mask> if i+1 > len(os.Args) { <mask> log.Printf("ERROR: Got %s without argument\n", v) <mask> os.Exit(64) <mask> } <mask> i++ <mask> opt.callback(os.Args[i]) <mask> knownParam = true <mask> break <mask> } <mask> } <mask> if !knownParam { </s> Flag parser ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a7e0f664921f8ac7de59d770c26e390e389b009e
app.go
github.com/AdguardTeam/dnsproxy v0.43.0
<mask> <mask> go 1.17 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.42.4 <mask> github.com/AdguardTeam/golibs v0.10.8 <mask> github.com/AdguardTeam/urlfilter v0.16.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/ameshkov/dnscrypt/v2 v2.2.3 <mask> github.com/digineo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.mod
github.com/lucas-clemente/quic-go v0.27.1
<mask> github.com/google/gopacket v1.1.19 <mask> github.com/google/renameio v1.0.1 <mask> github.com/insomniacslk/dhcp v0.0.0-20220405050111-12fbdcb11b41 <mask> github.com/kardianos/service v1.2.1 <mask> github.com/lucas-clemente/quic-go v0.26.0 <mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529e...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.mod
github.com/AdguardTeam/dnsproxy v0.43.0 h1:K082nx37DaNqSyT3kDtAfgBACNWc+ZDI1Yr/kGppu1k= github.com/AdguardTeam/dnsproxy v0.43.0/go.mod h1:JUGTm5dmlll47JltztsT0N//pVJjdg6zu0SNeUeaA7g=
<mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= <mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4= <mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.sum
github.com/lucas-clemente/quic-go v0.27.1 h1:sOw+4kFSVrdWOYmUjufQ9GBVPqZ+tu+jMtXxXNmRJyk= github.com/lucas-clemente/quic-go v0.27.1/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
<mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= <mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= <mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= <mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkid...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.sum
<mask> github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= <mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= <mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.sum
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I= <mask> github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= <mask> github.com/marten-seemann/qtls-go1-16 v0.1.5 h1:o9JrYPPco/Nukd/HpOHMHZoBDXQqoNtUCmny98/1uqQ= <m...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.sum
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.5/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8= <mask> github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWChPSI4+hgW7jc= <m...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
go.sum
// quicConnection is a narrow interface for quic.Connection to simplify testing. type quicConnection interface {
<mask> type tlsConn interface { <mask> ConnectionState() (cs tls.ConnectionState) <mask> } <mask> <mask> // quicSession is a narrow interface for quic.Session to simplify testing. <mask> type quicSession interface { <mask> ConnectionState() (cs quic.ConnectionState) <mask> } <mask> <mask> // clientIDFromD...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid.go
conn, ok := pctx.QUICConnection.(quicConnection)
<mask> } <mask> <mask> cliSrvName = tc.ConnectionState().ServerName <mask> case proxy.ProtoQUIC: <mask> qs, ok := pctx.QUICSession.(quicSession) <mask> if !ok { <mask> return "", fmt.Errorf( <mask> "proxy ctx quic session of proto %s is %T, want quic.Session", <mask> proto, <mask> pct...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid.go
"proxy ctx quic conn of proto %s is %T, want quic.Connection",
<mask> case proxy.ProtoQUIC: <mask> qs, ok := pctx.QUICSession.(quicSession) <mask> if !ok { <mask> return "", fmt.Errorf( <mask> "proxy ctx quic session of proto %s is %T, want quic.Session", <mask> proto, <mask> pctx.QUICSession, <mask> ) <mask> } <mask> </s> Pull request: all: up...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid.go
pctx.QUICConnection,
<mask> if !ok { <mask> return "", fmt.Errorf( <mask> "proxy ctx quic session of proto %s is %T, want quic.Session", <mask> proto, <mask> pctx.QUICSession, <mask> ) <mask> } <mask> <mask> cliSrvName = qs.ConnectionState().TLS.ServerName <mask> } </s> Pull request: all: upd dnsproxy, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid.go
cliSrvName = conn.ConnectionState().TLS.ServerName
<mask> pctx.QUICSession, <mask> ) <mask> } <mask> <mask> cliSrvName = qs.ConnectionState().TLS.ServerName <mask> } <mask> <mask> clientID, err = clientIDFromClientServerName( <mask> hostSrvName, <mask> cliSrvName, </s> Pull request: all: upd dnsproxy, supp rfc 9250 Updates #4592. Squashe...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid.go
// testQUICConnection is a quicConnection for tests. type testQUICConnection struct { // Connection is embedded here simply to make testQUICConnection a // quic.Connection without actually implementing all methods. quic.Connection
<mask> <mask> return cs <mask> } <mask> <mask> // testQUICSession is a quicSession for tests. <mask> type testQUICSession struct { <mask> // Session is embedded here simply to make testQUICSession a quic.Session <mask> // without actually implementing all methods. <mask> quic.Session <mask> <mask> se...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid_test.go
// ConnectionState implements the quicConnection interface for // testQUICConnection. func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) {
<mask> <mask> serverName string <mask> } <mask> <mask> // ConnectionState implements the quicSession interface for testQUICSession. <mask> func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) { <mask> cs.TLS.ServerName = c.serverName <mask> <mask> return cs <mask> } <mask> </s> Pull r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid_test.go
var qconn quic.Connection
<mask> serverName: tc.cliSrvName, <mask> } <mask> } <mask> <mask> var qs quic.Session <mask> if tc.proto == proxy.ProtoQUIC { <mask> qs = testQUICSession{ <mask> serverName: tc.cliSrvName, <mask> } <mask> } </s> Pull request: all: upd dnsproxy, supp rfc 9250 Updates #4592....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid_test.go
qconn = testQUICConnection{
<mask> } <mask> <mask> var qs quic.Session <mask> if tc.proto == proxy.ProtoQUIC { <mask> qs = testQUICSession{ <mask> serverName: tc.cliSrvName, <mask> } <mask> } <mask> <mask> pctx := &proxy.DNSContext{ </s> Pull request: all: upd dnsproxy, supp rfc 9250 Updates #4592. Squas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid_test.go
Proto: tc.proto, Conn: conn, QUICConnection: qconn,
<mask> } <mask> } <mask> <mask> pctx := &proxy.DNSContext{ <mask> Proto: tc.proto, <mask> Conn: conn, <mask> QUICSession: qs, <mask> } <mask> <mask> clientID, err := srv.clientIDFromDNSContext(pctx) <mask> assert.Equal(t, tc.wantClientID, clientID) <mask> </s>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a82ec09afdfbc66a8f07614b77e825f527a3b35b
internal/dnsforward/clientid_test.go
"dhcp_static_leases": "DHCP static leases",
<mask> "dhcp_disable": "Disable DHCP server", <mask> "dhcp_not_found": "It is safe to enable the built-in DHCP server - we didn't find any active DHCP servers on the network. However, we encourage you to re-check it manually as our automatic test currently doesn't give 100% guarantee.", <mask> "dhcp_foun...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/__locales/en.json
import StaticLeases from './StaticLeases';
<mask> import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants'; <mask> import Form from './Form'; <mask> import Leases from './Leases'; <mask> import Interface from './Interface'; <mask> import Card from '../../ui/Card'; <mask> import Accordion from '../../ui/Accordion'; <mask> <mask> class Dhcp exte...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/components/Settings/Dhcp/index.js
<Fragment> <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings"> <div className="row"> <div className="col"> <Leases leases={dhcp.leases} /> ...
<mask> } <mask> </div> <mask> </Card> <mask> {!dhcp.processing && dhcp.config.enabled && <mask> <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings"> <mask> <div className="r...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/components/Settings/Dhcp/index.js
</Card> <Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings"> <div className="row"> <div className="col"> <StaticLeases staticLeases={dhcp.staticLeas...
<mask> <div className="row"> <mask> <div className="col"> <mask> <Leases leases={dhcp.leases} /> <mask> </div> <mask> </div> <mask> </Card> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/components/Settings/Dhcp/index.js
const { static_leases: staticLeases, ...values } = payload;
<mask> [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }), <mask> [actions.getDhcpStatusSuccess]: (state, { payload }) => { <mask> const newState = { <mask> ...state, <mask> staticLeases, <mask> processing: false, <mask> ...v...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/reducers/index.js
staticLeases,
<mask> [actions.getDhcpStatusFailure]: state => ({ ...state, processing: false }), <mask> [actions.getDhcpStatusSuccess]: (state, { payload }) => { <mask> const newState = { <mask> ...state, <mask> ...payload, <mask> processing: false, <mask> }; <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/reducers/index.js
...values,
<mask> ...state, <mask> staticLeases, <mask> processing: false, <mask> }; <mask> <mask> return newState; <mask> }, </s> + client: add table to show static leases </s> remove ...payload, </s> add staticLeases, </s> remove ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/reducers/index.js
staticLeases: [],
<mask> check: null, <mask> leases: [], <mask> }); <mask> <mask> export default combineReducers({ <mask> settings, </s> + client: add table to show static leases </s> remove ...payload, </s> add staticLeases, </s> remove </div> </Ca...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8384c004ef41dcfb97f01dbd9e4c7dfb5723bb6
client/src/reducers/index.js
<mask> CacheMaxTTL: s.conf.CacheMaxTTL, <mask> UpstreamConfig: s.conf.UpstreamConfig, <mask> BeforeRequestHandler: s.beforeRequestHandler, <mask> RequestHandler: s.handleDNSRequest, <mask> AllServers: s.conf.AllServers, <mask> EnableEDNSClientSubnet: s.conf.Ena...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/config.go
} proxyConfig.UpstreamMode = proxy.UModeLoadBalance if s.conf.AllServers { proxyConfig.UpstreamMode = proxy.UModeParallel } else if s.conf.FastestAddr { proxyConfig.UpstreamMode = proxy.UModeFastestAddr
<mask> BeforeRequestHandler: s.beforeRequestHandler, <mask> RequestHandler: s.handleDNSRequest, <mask> AllServers: s.conf.AllServers, <mask> EnableEDNSClientSubnet: s.conf.EnableEDNSClientSubnet, <mask> FindFastestAddr: s.conf.FastestAddr, <mask> } <mask> <mask> if len(...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/config.go
UpstreamMode string `json:"upstream_mode"`
<mask> BlockingIPv6 string `json:"blocking_ipv6"` <mask> EDNSCSEnabled bool `json:"edns_cs_enabled"` <mask> DNSSECEnabled bool `json:"dnssec_enabled"` <mask> DisableIPv6 bool `json:"disable_ipv6"` <mask> FastestAddr bool `json:"fastest_addr"` <mask> ParallelRequests bool ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/dnsforward_http.go
if s.conf.FastestAddr { resp.UpstreamMode = "fastest_addr" } else if s.conf.AllServers { resp.UpstreamMode = "parallel" }
<mask> resp.RateLimit = s.conf.Ratelimit <mask> resp.EDNSCSEnabled = s.conf.EnableEDNSClientSubnet <mask> resp.DNSSECEnabled = s.conf.EnableDNSSEC <mask> resp.DisableIPv6 = s.conf.AAAADisabled <mask> resp.FastestAddr = s.conf.FastestAddr <mask> resp.ParallelRequests = s.conf.AllServers <mask> s.RUnlock() ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/dnsforward_http.go
if js.Exists("upstream_mode") && !(req.UpstreamMode == "" || req.UpstreamMode == "fastest_addr" || req.UpstreamMode == "parallel") { httpError(r, w, http.StatusBadRequest, "upstream_mode: incorrect value") return }
<mask> return <mask> } <mask> <mask> restart := false <mask> s.Lock() <mask> <mask> if js.Exists("upstream_dns") { <mask> s.conf.UpstreamDNS = req.Upstreams <mask> restart = true </s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests" * use dnsproxy v0.29.0 Squash...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/dnsforward_http.go
if js.Exists("upstream_mode") { s.conf.FastestAddr = false s.conf.AllServers = false switch req.UpstreamMode { case "": // case "parallel": s.conf.AllServers = true
<mask> if js.Exists("disable_ipv6") { <mask> s.conf.AAAADisabled = req.DisableIPv6 <mask> } <mask> <mask> if js.Exists("fastest_addr") { <mask> s.conf.FastestAddr = req.FastestAddr <mask> } <mask> <mask> if js.Exists("parallel_requests") { <mask> s.conf.AllServers = req.ParallelRequests <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/dnsforward_http.go
case "fastest_addr": s.conf.FastestAddr = true }
<mask> if js.Exists("fastest_addr") { <mask> s.conf.FastestAddr = req.FastestAddr <mask> } <mask> <mask> if js.Exists("parallel_requests") { <mask> s.conf.AllServers = req.ParallelRequests <mask> } <mask> <mask> s.Unlock() <mask> s.conf.ConfigModified() <mask> </s> * DNS API: new setting "upstr...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
dnsforward/dnsforward_http.go
github.com/AdguardTeam/dnsproxy v0.29.0
<mask> <mask> go 1.14 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.28.1 <mask> github.com/AdguardTeam/golibs v0.4.2 <mask> github.com/AdguardTeam/urlfilter v0.10.1 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/fsnotify/fsnotify v1.4.7 <mask> github.com/gobuffalo/p...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
go.mod
github.com/AdguardTeam/dnsproxy v0.29.0 h1:cHurldpiipPBAH+kgytcg9pkeYjG43KWiVYPbN3rAw4= github.com/AdguardTeam/dnsproxy v0.29.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
<mask> github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU= <mask> github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58= <mask> github.com/AdguardTeam/golibs v0.4.0 h1:4VX6LoOqFe9p9Gf55BeD8BvJD6M6RDYmgEiHrENE9KU= <mask> github.com/AdguardTe...
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
go.sum
upstream_mode: enum: - "" - parallel - fastest_addr
<mask> edns_cs_enabled: <mask> type: boolean <mask> dnssec_enabled: <mask> type: boolean <mask> fastest_addr: <mask> type: boolean <mask> parallel_requests: <mask> type...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a869ec4cbb98301e799627a09c2e1902e57aab03
openapi/openapi.yaml
config.DNS.UpstreamDNS = defaultDNS if len(newconfig.upstreams) > 0 { config.DNS.UpstreamDNS = newconfig.upstreams }
<mask> httpError(w, http.StatusBadRequest, "Failed to parse new upstreams config json: %s", err) <mask> return <mask> } <mask> <mask> setDNSServers(newconfig.upstreams, true) <mask> setDNSServers(newconfig.bootstrapDNS, false) <mask> config.DNS.AllServers = newconfig.allServers <mask> httpUpdateConfig...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1
control.go
<mask> config.DNS.AllServers = newconfig.allServers <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> // setDNSServers sets upstream and bootstrap DNS servers <mask> func setDNSServers(hosts []string, upstreams bool) { <mask> // bootstrap servers are plain DNS only. We should remove tls:/...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1
control.go
if len(newconfig.bootstrapDNS) > 0 { for _, host := range newconfig.bootstrapDNS {
<mask> // setDNSServers sets upstream and bootstrap DNS servers <mask> func setDNSServers(hosts []string, upstreams bool) { <mask> // bootstrap servers are plain DNS only. We should remove tls:// https:// and sdns:// hosts from slice <mask> bootstraps := []string{} <mask> if !upstreams && len(hosts) > 0 { <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1
control.go
bootstraps = append(bootstraps, host)
<mask> if err != nil { <mask> log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err) <mask> continue <mask> } <mask> hosts = append(bootstraps, host) <mask> } <mask> } <mask> <mask> // count of upstream or bootstrap servers <mask> count := len(hosts) </s> [change] contr...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1
control.go
config.DNS.BootstrapDNS = defaultBootstrap if len(bootstraps) > 0 { config.DNS.BootstrapDNS = bootstraps
<mask> hosts = append(bootstraps, host) <mask> } <mask> } <mask> <mask> // count of upstream or bootstrap servers <mask> count := len(hosts) <mask> if !upstreams { <mask> count = len(bootstraps) <mask> } <mask> <mask> if upstreams { <mask> config.DNS.UpstreamDNS = defaultDNS <mask> if co...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1
control.go
config.DNS.AllServers = newconfig.allServers httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> if !upstreams { <mask> count = len(bootstraps) <mask> } <mask> <mask> if upstreams { <mask> config.DNS.UpstreamDNS = defaultDNS <mask> if count != 0 { <mask> config.DNS.UpstreamDNS = hosts <mask> } <mask> } else { <mask> config.DNS.BootstrapDNS = defaultBootstrap <mask> if count !...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a8812908c1062e4dcfe6e30e9cf9612e41967aa1
control.go
config.RLock()
<mask> } <mask> <mask> // Check for duplicates <mask> for i := range config.Filters { <mask> if config.Filters[i].URL == f.URL { <mask> config.RUnlock() <mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL) <mask> return </s> - control: use locks when operating on c...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.RUnlock()
<mask> config.RLock() <mask> for i := range config.Filters { <mask> if config.Filters[i].URL == f.URL { <mask> httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL) <mask> return <mask> } <mask> } <mask> config.RUnlock() <mask> </s> - control: use locks when operating on ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.RUnlock()
<mask> return <mask> } <mask> } <mask> <mask> // Set necessary properties <mask> f.ID = assignUniqueFilterID() <mask> f.Enabled = true </s> - control: use locks when operating on config.Filters array
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Lock() // Check for duplicates for i := range config.Filters { if config.Filters[i].URL == f.URL { config.Unlock() httpError(w, http.StatusBadRequest, "Filter URL already added -- %s", f.URL) return } }
<mask> <mask> // URL is deemed valid, append it to filters, update config, write new filter file and tell dns to reload it <mask> // TODO: since we directly feed filters in-memory, revisit if writing configs is always necessary <mask> config.Filters = append(config.Filters, f) <mask> config.Unlock() <mask> ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Unlock()
<mask> } <mask> <mask> config.Filters = append(config.Filters, f) <mask> err = writeAllConfigs() <mask> if err != nil { <mask> httpError(w, http.StatusInternalServerError, "Couldn't write config file: %s", err) <mask> return <mask> } </s> - control: use locks when operating on config.Filters array
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Lock()
<mask> <mask> // go through each element and delete if url matches <mask> newFilters := config.Filters[:0] <mask> for _, filter := range config.Filters { <mask> if filter.URL != url { <mask> newFilters = append(newFilters, filter) </s> - control: use locks when operating on config.Filters array
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Unlock()
<mask> } <mask> } <mask> // Update the configuration after removing filter files <mask> config.Filters = newFilters <mask> httpUpdateConfigReloadDNSReturnOK(w, r) <mask> } <mask> <mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) { <mask> log.Tracef("%s %v", r.Method, r.URL) ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Lock()
<mask> } <mask> <mask> found := false <mask> for i := range config.Filters { <mask> filter := &config.Filters[i] // otherwise we will be operating on a copy <mask> if filter.URL == url { <mask> filter.Enabled = true <mask> found = true </s> - control: use locks when operating on config.Filters ar...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Unlock()
<mask> } <mask> } <mask> <mask> if !found { <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest) <mask> return </s> - control: use locks when operating on config.Filters array
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Lock()
<mask> } <mask> <mask> found := false <mask> for i := range config.Filters { <mask> filter := &config.Filters[i] // otherwise we will be operating on a copy <mask> if filter.URL == url { <mask> filter.Enabled = false <mask> found = true <mask> } </s> - control: use locks when operating on conf...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
config.Unlock()
<mask> found = true <mask> } <mask> } <mask> <mask> if !found { <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest) <mask> return </s> - control: use locks when operating on config.Filters array
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/a9b329daf6503e6b46787e89783ceb256601b578
control.go
"dns_start": "DNS server aan het opstarten", "dns_status_error": "Fout bij het oproepen van de DNS server status",
<mask> "update_announcement": "AdGuard Home{{version}} is nu beschikbaar! <0>klik hier</0> voor meer info.", <mask> "setup_guide": "Installatie gids", <mask> "dns_addresses": "DNS adressen", <mask> "down": "Uitgeschakeld", <mask> "fix": "Los op", <mask> "dns_providers": "hier is een <0>lij...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa202277fb5420cf09b6b68c6cdd298a55c0c090
client/src/__locales/nl.json
import srCS from './__locales/sr-cs.json'; import hr from './__locales/hr.json'; import fa from './__locales/fa.json';
<mask> import sl from './__locales/sl.json'; <mask> import tr from './__locales/tr.json'; <mask> <mask> const resources = { <mask> en: { <mask> translation: en, <mask> }, <mask> vi: { </s> Merge: * update translations Close #1250 Squashed commit of the following: commit e722a3e3b4b1049c5...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa202277fb5420cf09b6b68c6cdd298a55c0c090
client/src/i18n.js
'sr-cs': { translation: srCS, }, hr: { translation: hr, }, fa: { translation: fa, },
<mask> tr: { <mask> translation: tr, <mask> }, <mask> }; <mask> <mask> const availableLanguages = Object.keys(resources); <mask> <mask> i18n </s> Merge: * update translations Close #1250 Squashed commit of the following: commit e722a3e3b4b1049c5df22b3f11b5826992d3cc6c Author: Simon Zolin <s...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa202277fb5420cf09b6b68c6cdd298a55c0c090
client/src/i18n.js
github.com/AdguardTeam/dnsproxy v0.23.2
<mask> <mask> go 1.13 <mask> <mask> require ( <mask> github.com/AdguardTeam/dnsproxy v0.23.0 <mask> github.com/AdguardTeam/golibs v0.3.0 <mask> github.com/AdguardTeam/urlfilter v0.7.0 <mask> github.com/NYTimes/gziphandler v1.1.1 <mask> github.com/etcd-io/bbolt v1.3.3 <mask> github.com/go-test/deep v1....
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa202277fb5420cf09b6b68c6cdd298a55c0c090
go.mod
github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk= github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
<mask> github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg= <mask> github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= <mask> github.com/AdguardTeam/golibs v0.2.4 h1:GUssokegKxKF13K67Pgl0ZGwqHjNN6X7sep5ik6ORdY= <mask> github.com/AdguardTe...
[ "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa202277fb5420cf09b6b68c6cdd298a55c0c090
go.sum
"sr-cs": true, "hr": true, "fa": true,
<mask> "sk": true, <mask> "sl": true, <mask> "tr": true, <mask> } <mask> <mask> func isLanguageAllowed(language string) bool { <mask> l := strings.ToLower(language) <mask> return allowedLanguages[l] <mask> } </s> Merge: * update translations Close #1250 Squashed commit of the following: commi...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa202277fb5420cf09b6b68c6cdd298a55c0c090
home/i18n.go
<mask> } <mask> _, err := os.Stat(configfile) <mask> if !os.IsNotExist(err) { <mask> // do nothing, file exists <mask> trace("File %s exists, won't ask for password", configfile) <mask> return nil <mask> } <mask> if !terminal.IsTerminal(int(os.Stdin.Fd())) { <mask> return nil // do nothing <mask>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa3f3e2c434b3efd4f359f63384cf0ce867e45ee
app.go
func _Func() string { pc := make([]uintptr, 10) // at least 1 entry needed runtime.Callers(2, pc) f := runtime.FuncForPC(pc[0]) return path.Base(f.Name()) }
<mask> // --------------------- <mask> // debug logging helpers <mask> // --------------------- <mask> func trace(format string, args ...interface{}) { <mask> pc := make([]uintptr, 10) // at least 1 entry needed <mask> runtime.Callers(2, pc) <mask> f := runtime.FuncForPC(pc[0]) </s> Make some traces into a l...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa3f3e2c434b3efd4f359f63384cf0ce867e45ee
helpers.go
log.Printf("%s(): got schema version %v", _Func(), schemaVersionInterface)
<mask> return err <mask> } <mask> <mask> schemaVersionInterface, ok := diskConfig["schema_version"] <mask> trace("schemaVersionInterface = %v, ok = %v", schemaVersionInterface, ok) <mask> if !ok { <mask> // no schema version, set it to 0 <mask> schemaVersionInterface = 0 <mask> } <mask> </s> Mak...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa3f3e2c434b3efd4f359f63384cf0ce867e45ee
upgrade.go
log.Printf("%s(): called", _Func())
<mask> return nil <mask> } <mask> <mask> func upgradeSchema0to1(diskConfig *map[string]interface{}) error { <mask> trace("Called") <mask> <mask> // The first schema upgrade: <mask> // No more "dnsfilter.txt", filters are now kept in data/filters/ <mask> dnsFilterPath := filepath.Join(config.ourBinaryDir...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa3f3e2c434b3efd4f359f63384cf0ce867e45ee
upgrade.go
"create-react-context": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/create-react-context/-/create-react-context-0.3.0.tgz", "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==", "requires": { "gud": "^1.0.0",...
<mask> "safe-buffer": "^5.0.1", <mask> "sha.js": "^2.4.8" <mask> } <mask> }, <mask> "cross-env": { <mask> "version": "7.0.2", <mask> "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.2.tgz", <mask> "integrity": "sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SU...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "deep-equal": { <mask> "version": "1.1.1", <mask> "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", <mask> "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", <mask> "dev": true, <mask> "...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "define-properties": { <mask> "version": "1.1.3", <mask> "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", <mask> "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", <mask> "dev": ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "es-abstract": { <mask> "version": "1.17.5", <mask> "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", <mask> "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", <mask> "dev": true, <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "es-to-primitive": { <mask> "version": "1.2.1", <mask> "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", <mask> "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", <mask> "dev": true, ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
<mask> }, <mask> "function-bind": { <mask> "version": "1.1.1", <mask> "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", <mask> "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", <mask> "dev...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"gud": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" },
<mask> "optional": true <mask> }, <mask> "handle-thing": { <mask> "version": "2.0.1", <mask> "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", <mask> "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "has": { <mask> "version": "1.0.3", <mask> "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", <mask> "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", <mask> "dev": true, <mask> "requires": { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
<mask> }, <mask> "has-symbols": { <mask> "version": "1.0.1", <mask> "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", <mask> "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", <mask> "dev": tru...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA=="
<mask> }, <mask> "is-arguments": { <mask> "version": "1.0.4", <mask> "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", <mask> "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", <mask> "dev": ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
<mask> }, <mask> "is-callable": { <mask> "version": "1.1.5", <mask> "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", <mask> "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", <mask> "dev": tru...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="
<mask> }, <mask> "is-date-object": { <mask> "version": "1.0.2", <mask> "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", <mask> "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", <mask> "...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "is-regex": { <mask> "version": "1.0.5", <mask> "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", <mask> "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", <mask> "dev": true, <mask> "requir...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "is-symbol": { <mask> "version": "1.0.3", <mask> "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", <mask> "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", <mask> "dev": true, <mask> "req...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
<mask> }, <mask> "object-inspect": { <mask> "version": "1.7.0", <mask> "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", <mask> "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", <mask> "...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "object-is": { <mask> "version": "1.1.2", <mask> "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz", <mask> "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==", <mask> "dev": true, <mask> "req...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
<mask> }, <mask> "object-keys": { <mask> "version": "1.1.1", <mask> "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", <mask> "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", <mask> "dev": tru...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "object.assign": { <mask> "version": "4.1.0", <mask> "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz", <mask> "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==", <mask> "dev": true, <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"popper.js": { "version": "1.16.1", "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" },
<mask> } <mask> }, <mask> "portfinder": { <mask> "version": "1.0.26", <mask> "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz", <mask> "integrity": "sha512-Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ==", </s> Fix...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "classnames": "^2.2.5", <mask> "react-is": "^16.8.1" <mask> } <mask> }, <mask> "react-tooltip": { <mask> "version": "4.2.6", <mask> "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz", <mask> "integrity": "sha512-KX/zCsPFCI8Ruul...
[ "keep", "keep", "keep", "keep", "replace", "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/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "regexp.prototype.flags": { <mask> "version": "1.3.0", <mask> "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", <mask> "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "string.prototype.trimend": { <mask> "version": "1.0.1", <mask> "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", <mask> "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "string.prototype.trimleft": { <mask> "version": "2.1.2", <mask> "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", <mask> "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "string.prototype.trimright": { <mask> "version": "2.1.2", <mask> "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", <mask> "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZF...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
<mask> "string.prototype.trimstart": { <mask> "version": "1.0.1", <mask> "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", <mask> "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWR...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"typed-styles": { "version": "0.0.7", "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz", "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==" },
<mask> "mime-types": "~2.1.24" <mask> } <mask> }, <mask> "typedarray": { <mask> "version": "0.0.6", <mask> "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", <mask> "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", </s> Fix #1810 - client: Fix que...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package-lock.json
"react-popper-tooltip": "^2.11.1",
<mask> "react-i18next": "^11.4.0", <mask> "react-modal": "^3.11.2", <mask> "react-redux": "^7.2.0", <mask> "react-redux-loading-bar": "^4.6.0", <mask> "react-router-dom": "^5.2.0", <mask> "react-router-hash-link": "^1.2.2", </s> Fix #1810 - client: Fix query log bu...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package.json
<mask> "react-router-dom": "^5.2.0", <mask> "react-router-hash-link": "^1.2.2", <mask> "react-select": "^3.1.0", <mask> "react-table": "^6.11.4", <mask> "react-tooltip": "^4.2.6", <mask> "react-transition-group": "^4.4.1", <mask> "redux": "^4.0.5", <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/package.json
import React from 'react';
<mask> import React, { Fragment } from 'react'; <mask> import ReactTable from 'react-table'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withTranslation } from 'react-i18next'; <mask> <mask> import Card from '../ui/Card'; </s> Fix #1810 - client: Fix query log bugs Squashed commit of the ...
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/src/components/Dashboard/Clients.js
<>
<mask> const { value } = row; <mask> const ipMatchListStatus = getIpMatchListStatus(value, disallowedClients); <mask> <mask> return ( <mask> <Fragment> <mask> <div className="logs__row logs__row--overflow logs__row--column"> <mask> {formatClientCell(row, t)} <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7
client/src/components/Dashboard/Clients.js