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 longName string
shortName string
description string
callback func(value string)
</s> add longName string
shortName string
description string
callbackWithValue func(value string)
callbackNoValue func() </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() | [
"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", func(value string) { configFilename = &value }},
<mask> {"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
<mask> {"port", "p", "port to serve HTTP pages on", func(value string) {
<mask> v, err := strconv.Atoi(value)
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() </s> remove printHelp := func() {
</s> add printHelp = func() { | [
"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 }},
<mask> {"port", "p", "port to serve HTTP pages on", func(value string) {
<mask> v, err := strconv.Atoi(value)
<mask> if err != nil {
<mask> panic("Got port that is not a number")
<mask> }
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove longName string
shortName string
description string
callback func(value string)
</s> add longName string
shortName string
description string
callbackWithValue func(value string)
callbackNoValue func() </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() </s> remove i++
opt.callback(os.Args[i])
</s> add | [
"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\n")
<mask> fmt.Printf("%s [options]\n\n", os.Args[0])
<mask> fmt.Printf("Options:\n")
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove printHelp := func() {
</s> add printHelp = func() { </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add | [
"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 := range opts {
<mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description)
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, | [
"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.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)
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() </s> remove i++
opt.callback(os.Args[i])
</s> add </s> remove printHelp := func() {
</s> add printHelp = func() { </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, | [
"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.callbackNoValue() | <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++
<mask> opt.callback(os.Args[i])
<mask> knownParam = true
<mask> break
<mask> }
<mask> if v == "-"+opt.shortName {
<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
</s> Flag parser -- support options without values, move code for help and verbose into table. </s> remove i++
opt.callback(os.Args[i])
</s> add </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove printHelp := func() {
</s> add printHelp = func() { </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, | [
"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 -- support options without values, move code for help and verbose into table. </s> remove if v == "--"+opt.longName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
}
i++
opt.callback(os.Args[i])
knownParam = true
break
}
if v == "-"+opt.shortName {
if i+1 > len(os.Args) {
log.Printf("ERROR: Got %s without argument\n", v)
os.Exit(64)
</s> add 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.callbackNoValue() </s> remove // short-circuit for help
if v == "--help" || v == "-h" {
printHelp()
os.Exit(64)
}
if v == "--verbose" || v == "-v" {
log.SetLevel(log.TraceLevel)
}
</s> add </s> remove }},
{"verbose", "v", "enable verbose output", nil},
{"help", "h", "print this help", nil},
</s> add }, nil},
{"verbose", "v", "enable verbose output", nil, func() { log.SetLevel(log.TraceLevel) }},
{"help", "h", "print this help", nil, func() { printHelp(); os.Exit(64) }}, </s> remove {"config", "c", "path to config file", func(value string) { configFilename = &value }},
{"host", "h", "host address to bind HTTP server on", func(value string) { bindHost = &value }},
</s> add {"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}, </s> remove printHelp := func() {
</s> add printHelp = func() { | [
"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/go-ipset/v2 v2.2.1
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/AdguardTeam/dnsproxy v0.42.4 h1:Rf45a3H6U/8XqWMYAMEsC1g/dVudyfgx4WY8N2syJMw=
github.com/AdguardTeam/dnsproxy v0.42.4/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
</s> add github.com/AdguardTeam/dnsproxy v0.43.0 h1:K082nx37DaNqSyT3kDtAfgBACNWc+ZDI1Yr/kGppu1k=
github.com/AdguardTeam/dnsproxy v0.43.0/go.mod h1:JUGTm5dmlll47JltztsT0N//pVJjdg6zu0SNeUeaA7g= </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add 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= </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add | [
"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-529eae5b6118
<mask> github.com/mdlayher/netlink v1.6.0
<mask> // TODO(a.garipov): This package is deprecated; find a new one or use
<mask> // our own code for that.
<mask> github.com/mdlayher/raw v0.0.0-20211126142749-4eae47f3d54b
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // 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 </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add 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= | [
"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-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.42.4 h1:Rf45a3H6U/8XqWMYAMEsC1g/dVudyfgx4WY8N2syJMw=
<mask> github.com/AdguardTeam/dnsproxy v0.42.4/go.mod h1:thHuk3599mgmucsv5J9HR9lBVQHnf4YleE08EbxNrN0=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.10.4/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
<mask> github.com/AdguardTeam/golibs v0.10.8 h1:diU9gP9qG1qeLbAkzIwfUerpHSqzR6zaBgzvRMR/m6Q=
<mask> github.com/AdguardTeam/golibs v0.10.8/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/AdguardTeam/dnsproxy v0.42.4
</s> add github.com/AdguardTeam/dnsproxy v0.43.0 </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add 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= </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add | [
"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:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
<mask> github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
<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:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<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=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> add </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, | [
"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:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<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=
<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=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add 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= </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, | [
"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=
<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=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
</s> add </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add 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= </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { | [
"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=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0-beta.1/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.0/go.mod h1:PUhIQk19LoFt2174H4+an8TYvWOGjb/hHwphBeaDHwI=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y=
<mask> github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 h1:2oDp6OOhLxQ9JBoUuysVz9UZ9uI6oLUbvAZu0x8o+vE=
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove github.com/lucas-clemente/quic-go v0.25.0/go.mod h1:YtzP8bxRVCBlO77yRanE264+fY/T2U9ZlW1AaHOsMOg=
github.com/lucas-clemente/quic-go v0.26.0 h1:ALBQXr9UJ8A1LyzvceX4jd9QFsHvlI0RR6BkV16o00A=
github.com/lucas-clemente/quic-go v0.26.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI=
</s> add 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= </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, | [
"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> // clientIDFromDNSContext extracts the client's ID from the server name of the
<mask> // client's DoT or DoQ request or the path of the client's DoH. If the protocol
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // 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 </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, | [
"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> pctx.QUICSession,
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, | [
"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: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ | [
"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, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove var qs quic.Session
</s> add var qconn quic.Connection | [
"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.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", | [
"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> serverName string
<mask> }
<mask>
<mask> // ConnectionState implements the quicSession interface for testQUICSession.
</s> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // ConnectionState implements the quicSession interface for testQUICSession.
func (c testQUICSession) ConnectionState() (cs quic.ConnectionState) {
</s> add // ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) { </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove github.com/lucas-clemente/quic-go v0.26.0
</s> add github.com/lucas-clemente/quic-go v0.27.1 </s> remove var qs quic.Session
</s> add var qconn quic.Connection </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ | [
"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 request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove // testQUICSession is a quicSession for tests.
type testQUICSession struct {
// Session is embedded here simply to make testQUICSession a quic.Session
// without actually implementing all methods.
quic.Session
</s> add // 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 </s> remove // quicSession is a narrow interface for quic.Session to simplify testing.
type quicSession interface {
</s> add // quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface { </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName | [
"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.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) | [
"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.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove var qs quic.Session
</s> add var qconn quic.Connection </s> remove Proto: tc.proto,
Conn: conn,
QUICSession: qs,
</s> add Proto: tc.proto,
Conn: conn,
QUICConnection: qconn, </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove pctx.QUICSession,
</s> add pctx.QUICConnection, </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName | [
"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> Pull request: all: upd dnsproxy, supp rfc 9250
Updates #4592.
Squashed commit of the following:
commit 1a80875d6aa7811d7d1d978f6fa8d558dec1ca87
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue May 24 19:28:27 2022 +0300
all: upd dnsproxy, supp rfc 9250 </s> remove qs = testQUICSession{
</s> add qconn = testQUICConnection{ </s> remove qs, ok := pctx.QUICSession.(quicSession)
</s> add conn, ok := pctx.QUICConnection.(quicConnection) </s> remove cliSrvName = qs.ConnectionState().TLS.ServerName
</s> add cliSrvName = conn.ConnectionState().TLS.ServerName </s> remove "proxy ctx quic session of proto %s is %T, want quic.Session",
</s> add "proxy ctx quic conn of proto %s is %T, want quic.Connection", </s> remove var qs quic.Session
</s> add var qconn quic.Connection | [
"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_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_leases_not_found": "No DHCP leases found",
<mask> "dhcp_config_saved": "Saved DHCP server config",
<mask> "form_error_required": "Required field",
<mask> "form_error_ip_format": "Invalid IPv4 format",
<mask> "form_error_mac_format": "Invalid MAC format",
</s> + client: add table to show static leases </s> remove ...payload,
</s> add staticLeases, </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> | [
"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 extends Component {
<mask> handleFormSubmit = (values) => {
</s> + client: add table to show static leases </s> remove ...payload,
</s> add staticLeases, </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> | [
"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} />
</div> | <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="row">
<mask> <div className="col">
<mask> <Leases leases={dhcp.leases} />
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> }
<mask> </Fragment>
</s> + client: add table to show static leases </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove ...payload,
</s> add staticLeases, | [
"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.staticLeases} />
</div>
</div>
</Card>
</Fragment> | <mask> <div className="row">
<mask> <div className="col">
<mask> <Leases leases={dhcp.leases} />
<mask> </div>
<mask> </div>
<mask> </Card>
<mask> }
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
</s> + client: add table to show static leases </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> </s> remove ...payload,
</s> add staticLeases, | [
"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> ...values,
</s> + client: add table to show static leases </s> remove ...payload,
</s> add staticLeases, </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> | [
"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> return newState;
<mask> },
<mask>
</s> + client: add table to show static leases </s> remove </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> | [
"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 </div>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> | [
"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>
</Card>
</s> add </Card>
<Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<StaticLeases staticLeases={dhcp.staticLeases} />
</div>
</div>
</Card>
</Fragment> </s> remove <Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</s> add <Fragment>
<Card title={ t('dhcp_leases') } bodyType="card-body box-body--settings">
<div className="row">
<div className="col">
<Leases leases={dhcp.leases} />
</div> | [
"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.EnableEDNSClientSubnet,
<mask> FindFastestAddr: s.conf.FastestAddr,
<mask> }
<mask>
<mask> if len(s.conf.BogusNXDomain) > 0 {
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} | [
"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(s.conf.BogusNXDomain) > 0 {
<mask> for _, s := range s.conf.BogusNXDomain {
<mask> ip := net.ParseIP(s)
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove AllServers: s.conf.AllServers,
</s> add </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} | [
"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 `json:"parallel_requests"`
<mask> }
<mask>
<mask> func (s *Server) handleGetConfig(w http.ResponseWriter, r *http.Request) {
<mask> resp := dnsConfigJSON{}
<mask> s.RLock()
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} | [
"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()
<mask>
<mask> js, err := json.Marshal(resp)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusInternalServerError, "json.Marshal: %s", err)
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove AllServers: s.conf.AllServers,
</s> add | [
"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
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove AllServers: s.conf.AllServers,
</s> add | [
"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> }
<mask>
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove AllServers: s.conf.AllServers,
</s> add | [
"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 "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true </s> remove FindFastestAddr: s.conf.FastestAddr,
</s> add }
proxyConfig.UpstreamMode = proxy.UModeLoadBalance
if s.conf.AllServers {
proxyConfig.UpstreamMode = proxy.UModeParallel
} else if s.conf.FastestAddr {
proxyConfig.UpstreamMode = proxy.UModeFastestAddr </s> remove resp.FastestAddr = s.conf.FastestAddr
resp.ParallelRequests = s.conf.AllServers
</s> add if s.conf.FastestAddr {
resp.UpstreamMode = "fastest_addr"
} else if s.conf.AllServers {
resp.UpstreamMode = "parallel"
} </s> remove AllServers: s.conf.AllServers,
</s> add | [
"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/packr v1.30.1
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU=
github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 h1:cHurldpiipPBAH+kgytcg9pkeYjG43KWiVYPbN3rAw4=
github.com/AdguardTeam/dnsproxy v0.29.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58= </s> remove fastest_addr:
type: boolean
parallel_requests:
type: boolean
description: If true, parallel queries to all configured upstream servers are
enabled
</s> add upstream_mode:
enum:
- ""
- parallel
- fastest_addr </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true | [
"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/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/gomitmproxy v0.2.0/go.mod h1:Qdv0Mktnzer5zpdpi5rAwixNJzW2FN91LjKJCkVbYGU=
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove github.com/AdguardTeam/dnsproxy v0.28.1
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 </s> remove fastest_addr:
type: boolean
parallel_requests:
type: boolean
description: If true, parallel queries to all configured upstream servers are
enabled
</s> add upstream_mode:
enum:
- ""
- parallel
- fastest_addr </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true | [
"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: boolean
<mask> description: If true, parallel queries to all configured upstream servers are
<mask> enabled
<mask> UpstreamsConfig:
<mask> type: object
<mask> description: Upstreams configuration
<mask> required:
<mask> - bootstrap_dns
</s> * DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0
Squashed commit of the following:
commit f18b7231f3f3f84446c0d837855af342f3c971b4
Merge: 501a4e06 dae275e6
Author: Simon Zolin <s.zolin@adguard.com>
Date: Wed Jun 10 15:24:15 2020 +0300
Merge remote-tracking branch 'origin/master' into update-dnsproxy
commit 501a4e06ab350e46ff78656141d925de9f2e4996
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:47:13 2020 +0300
openapi
commit 3930bd196572924f164ed011629356a0ac0ec631
Author: Simon Zolin <s.zolin@adguard.com>
Date: Fri Jun 5 12:21:32 2020 +0300
* DNS API: new setting "upstream_mode"; remove "fastest_addr", "parallel_requests"
* use dnsproxy v0.29.0 </s> remove github.com/AdguardTeam/dnsproxy v0.28.1 h1:WkLjrUcVf/njbTLyL7bNt6e18zQjF2ZYv/HWwL9cMmU=
github.com/AdguardTeam/dnsproxy v0.28.1/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58=
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 h1:cHurldpiipPBAH+kgytcg9pkeYjG43KWiVYPbN3rAw4=
github.com/AdguardTeam/dnsproxy v0.29.0/go.mod h1:hOYFV9TW+pd5XKYz7KZf2FFD8SvSPqjyGTxUae86s58= </s> remove github.com/AdguardTeam/dnsproxy v0.28.1
</s> add github.com/AdguardTeam/dnsproxy v0.29.0 </s> remove if js.Exists("parallel_requests") {
s.conf.AllServers = req.ParallelRequests
</s> add case "fastest_addr":
s.conf.FastestAddr = true
} </s> remove if js.Exists("fastest_addr") {
s.conf.FastestAddr = req.FastestAddr
}
</s> add if js.Exists("upstream_mode") {
s.conf.FastestAddr = false
s.conf.AllServers = false
switch req.UpstreamMode {
case "":
//
case "parallel":
s.conf.AllServers = true | [
"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> 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:// https:// and sdns:// hosts from slice
<mask> bootstraps := []string{}
</s> [change] control: Fix issues from review </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) | [
"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:// https:// and sdns:// hosts from slice
<mask> bootstraps := []string{}
<mask> if !upstreams && len(hosts) > 0 {
<mask> for _, host := range hosts {
<mask> err := checkBootstrapDNS(host)
</s> [change] control: Fix issues from review </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) | [
"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 {
<mask> for _, host := range hosts {
<mask> err := checkBootstrapDNS(host)
<mask> if err != nil {
<mask> log.Tracef("%s can not be used as bootstrap DNS cause: %s", host, err)
<mask> continue
<mask> }
</s> [change] control: Fix issues from review </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) | [
"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] control: Fix issues from review </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) | [
"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 count != 0 {
</s> [change] control: Fix issues from review </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove if upstreams {
config.DNS.UpstreamDNS = defaultDNS
if count != 0 {
config.DNS.UpstreamDNS = hosts
}
} else {
config.DNS.BootstrapDNS = defaultBootstrap
if count != 0 {
config.DNS.BootstrapDNS = bootstraps
}
}
</s> add config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { | [
"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 != 0 {
<mask> config.DNS.BootstrapDNS = bootstraps
<mask> }
<mask> }
<mask> }
<mask>
<mask> // checkBootstrapDNS checks if host is plain DNS
<mask> func checkBootstrapDNS(host string) error {
<mask> // Check if host is ip without port
</s> [change] control: Fix issues from review </s> remove // count of upstream or bootstrap servers
count := len(hosts)
if !upstreams {
count = len(bootstraps)
</s> add config.DNS.BootstrapDNS = defaultBootstrap
if len(bootstraps) > 0 {
config.DNS.BootstrapDNS = bootstraps </s> remove setDNSServers(newconfig.upstreams, true)
setDNSServers(newconfig.bootstrapDNS, false)
config.DNS.AllServers = newconfig.allServers
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> add config.DNS.UpstreamDNS = defaultDNS
if len(newconfig.upstreams) > 0 {
config.DNS.UpstreamDNS = newconfig.upstreams
} </s> remove hosts = append(bootstraps, host)
</s> add bootstraps = append(bootstraps, host) </s> remove // setDNSServers sets upstream and bootstrap DNS servers
func setDNSServers(hosts []string, upstreams bool) {
</s> add </s> remove if !upstreams && len(hosts) > 0 {
for _, host := range hosts {
</s> add if len(newconfig.bootstrapDNS) > 0 {
for _, host := range newconfig.bootstrapDNS { | [
"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 config.Filters array | [
"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 config.Filters array | [
"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>
<mask> err = writeAllConfigs()
</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.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)
<mask> parameters, err := parseParametersFromBody(r.Body)
</s> - control: use locks when operating on config.Filters array | [
"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 array | [
"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 config.Filters array | [
"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>lijst of gekende DNS providers</0> waarvan je kan kiezen.",
<mask> "update_now": "Update nu",
<mask> "update_failed": "Auto-update is mislukt. Volg <a href='https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#update'>de volgende stappen</a> om manueel te updaten.",
<mask> "processing_update": "Even geduld, AdGuard Home wordt bijgewerkt",
</s> Merge: * update translations
Close #1250
Squashed commit of the following:
commit e722a3e3b4b1049c5df22b3f11b5826992d3cc6c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr </s> remove github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg=
github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/AdguardTeam/dnsproxy v0.23.0
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 | [
"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 e722a3e3b4b1049c5df22b3f11b5826992d3cc6c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr </s> remove github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg=
github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/AdguardTeam/dnsproxy v0.23.0
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 | [
"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.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr </s> remove github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg=
github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/AdguardTeam/dnsproxy v0.23.0
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 | [
"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.0.4 // indirect
</s> Merge: * update translations
Close #1250
Squashed commit of the following:
commit e722a3e3b4b1049c5df22b3f11b5826992d3cc6c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr </s> remove github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg=
github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= | [
"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/AdguardTeam/golibs v0.2.4/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/golibs v0.3.0 h1:1zO8ulGEOdXDDM++Ap4sYfTsT/Z4tZBZtiWSA4ykcOU=
<mask> github.com/AdguardTeam/golibs v0.3.0/go.mod h1:R3M+mAg3nWG4X4Hsag5eef/TckHFH12ZYhK7AzJc8+U=
<mask> github.com/AdguardTeam/gomitmproxy v0.1.2/go.mod h1:Mrt/3EfiXIYY2aZ7KsLuCUJzUARD/fWJ119IfzOB13M=
</s> Merge: * update translations
Close #1250
Squashed commit of the following:
commit e722a3e3b4b1049c5df22b3f11b5826992d3cc6c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr </s> remove github.com/AdguardTeam/dnsproxy v0.23.0
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 | [
"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:
commit e722a3e3b4b1049c5df22b3f11b5826992d3cc6c
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:27:51 2019 +0300
update ru
commit 086e722a4dc1922ac7b8aff537050689900a8bd0
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:15:15 2019 +0300
fix cloudflare -> quad9, update es
commit 86c235936d2f86e536f45fc475f29b43eb695e3d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 18:01:20 2019 +0300
* update es, ru, sr-cs
commit 2b6b510b998b7e7b2f4c3fa5d7af57dc5413a611
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:43:05 2019 +0300
* update 'no'
commit 1de6215aa90374ee147bbd0a685643232e98e4c8
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:41:37 2019 +0300
* use dnsproxy v0.23.2
commit c545a1bf7e4e706b45b4670b804a50bf8d75bae3
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:36:37 2019 +0300
update ru
commit c22eec9bcfad67284e21cfc4e6b06fb63a64d25d
Author: Simon Zolin <s.zolin@adguard.com>
Date: Thu Dec 12 17:22:03 2019 +0300
* update translations; add sr-cs, fa, hr </s> remove github.com/AdguardTeam/dnsproxy v0.23.0 h1:GrOUapcWjf19MF8NznZUbcYujBbl7QXapBWTFKqkJQg=
github.com/AdguardTeam/dnsproxy v0.23.0/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0=
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 h1:HbBzoe9Pssj4UjvbeBUPHz7cpCt/7/LpVKu4olhPcKk=
github.com/AdguardTeam/dnsproxy v0.23.2/go.mod h1:2qy8rpdfBzKgMPxkHmPdaNK4XZJ322v4KtVGI8s8Bn0= </s> remove github.com/AdguardTeam/dnsproxy v0.23.0
</s> add github.com/AdguardTeam/dnsproxy v0.23.2 | [
"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> }
</s> Make some traces into a log, remove others </s> remove trace("Called")
</s> add log.Printf("%s(): called", _Func()) </s> remove trace("schemaVersionInterface = %v, ok = %v", schemaVersionInterface, ok)
</s> add log.Printf("%s(): got schema version %v", _Func(), schemaVersionInterface) | [
"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 log, remove others </s> remove trace("Called")
</s> add log.Printf("%s(): called", _Func()) </s> remove trace("File %s exists, won't ask for password", configfile)
</s> add </s> remove trace("schemaVersionInterface = %v, ok = %v", schemaVersionInterface, ok)
</s> add log.Printf("%s(): got schema version %v", _Func(), schemaVersionInterface) | [
"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> Make some traces into a log, remove others </s> remove trace("File %s exists, won't ask for password", configfile)
</s> add </s> remove trace("Called")
</s> add log.Printf("%s(): called", _Func()) | [
"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, "dnsfilter.txt")
<mask> _, err := os.Stat(dnsFilterPath)
</s> Make some traces into a log, remove others </s> remove trace("File %s exists, won't ask for password", configfile)
</s> add </s> remove trace("schemaVersionInterface = %v, ok = %v", schemaVersionInterface, ok)
</s> add log.Printf("%s(): got schema version %v", _Func(), schemaVersionInterface) | [
"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",
"warning": "^4.0.3"
}
}, | <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/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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> "requires": {
<mask> "is-arguments": "^1.0.4",
<mask> "is-date-object": "^1.0.1",
<mask> "is-regex": "^1.0.4",
<mask> "object-is": "^1.0.1",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
"dev": true
</s> add "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" | [
"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": true,
<mask> "requires": {
<mask> "object-keys": "^1.0.12"
<mask> }
<mask> },
<mask> "define-property": {
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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> "requires": {
<mask> "es-to-primitive": "^1.2.1",
<mask> "function-bind": "^1.1.1",
<mask> "has": "^1.0.3",
<mask> "has-symbols": "^1.0.1",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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,
<mask> "requires": {
<mask> "is-callable": "^1.1.4",
<mask> "is-date-object": "^1.0.1",
<mask> "is-symbol": "^1.0.2"
<mask> }
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
"dev": true
</s> add "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" </s> remove "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
"dev": true
</s> add "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" | [
"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": true
<mask> },
<mask> "functional-red-black-tree": {
<mask> "version": "1.0.1",
<mask> "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
<mask> "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
"dev": true
</s> add "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" </s> remove "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
</s> add "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
<mask> "dev": true
<mask> },
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
"dev": true
</s> add "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" </s> remove "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
"dev": true
</s> add "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" </s> remove "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
</s> add "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" </s> remove "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
"dev": true
</s> add "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" | [
"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> "function-bind": "^1.1.1"
<mask> }
<mask> },
<mask> "has-flag": {
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" | [
"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": true
<mask> },
<mask> "has-value": {
<mask> "version": "1.0.0",
<mask> "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
<mask> "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" </s> remove "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
"dev": true
</s> add "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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": true
<mask> },
<mask> "is-arrayish": {
<mask> "version": "0.2.1",
<mask> "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
<mask> "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
"dev": true
</s> add "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" </s> remove "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
"dev": true
</s> add "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" </s> remove "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
</s> add "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" | [
"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": true
<mask> },
<mask> "is-ci": {
<mask> "version": "2.0.0",
<mask> "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
<mask> "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" </s> remove "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
"dev": true
</s> add "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" </s> remove "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
</s> add "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" </s> remove "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
"dev": true
</s> add "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" | [
"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> "dev": true
<mask> },
<mask> "is-decimal": {
<mask> "version": "1.0.4",
<mask> "resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
<mask> "integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
"dev": true
</s> add "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" </s> remove "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
"dev": true
</s> add "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" </s> remove "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
</s> add "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" | [
"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> "requires": {
<mask> "has": "^1.0.3"
<mask> }
<mask> },
<mask> "is-regexp": {
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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> "requires": {
<mask> "has-symbols": "^1.0.1"
<mask> }
<mask> },
<mask> "is-typedarray": {
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
</s> add "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" | [
"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> "dev": true
<mask> },
<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==",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
"dev": true
</s> add "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==" </s> remove "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==",
"dev": true
</s> add "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==" </s> remove "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
"dev": true
</s> add "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==" | [
"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> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.17.5"
<mask> }
<mask> },
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
"dev": true
</s> add "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==" </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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": true
<mask> },
<mask> "object-visit": {
<mask> "version": "1.0.1",
<mask> "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
<mask> "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
"dev": true
</s> add "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" </s> remove "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
"dev": true
</s> add "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==" </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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> "requires": {
<mask> "define-properties": "^1.1.2",
<mask> "function-bind": "^1.1.1",
<mask> "has-symbols": "^1.0.0",
<mask> "object-keys": "^1.0.11"
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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 #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
<mask> "requires": {
<mask> "prop-types": "^15.7.2",
<mask> "uuid": "^7.0.3"
<mask> },
<mask> "dependencies": {
<mask> "uuid": {
<mask> "version": "7.0.3",
<mask> "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
<mask> "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
<mask> }
<mask> }
<mask> },
<mask> "react-transition-group": {
<mask> "version": "4.4.1",
<mask> "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
<mask> "integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
<mask> "requires": {
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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> "dev": true,
<mask> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.17.0-next.1"
<mask> }
<mask> },
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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==",
<mask> "dev": true,
<mask> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.17.5"
<mask> }
<mask> },
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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==",
<mask> "dev": true,
<mask> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.17.5",
<mask> "string.prototype.trimstart": "^1.0.0"
<mask> }
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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+9ZFg==",
<mask> "dev": true,
<mask> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.17.5",
<mask> "string.prototype.trimend": "^1.0.0"
<mask> }
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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/QA6bh1avmuPTfNjqVWRw==",
<mask> "dev": true,
<mask> "requires": {
<mask> "define-properties": "^1.1.3",
<mask> "es-abstract": "^1.17.5"
<mask> }
<mask> },
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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 query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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 bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": "^4.2.6",
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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> "redux-actions": "^2.6.5",
<mask> "redux-form": "^8.3.5",
<mask> "redux-thunk": "^2.3.0",
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove "dev": true,
</s> add </s> remove "dev": true,
</s> add | [
"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 following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove import CustomTooltip from '../Tooltip/CustomTooltip';
</s> add import TooltipTrigger from 'react-popper-tooltip';
import { Trans } from 'react-i18next';
import classNames from 'classnames';
import './Tooltip.css';
import 'react-popper-tooltip/dist/styles.css';
import { HIDE_TOOLTIP_DELAY } from '../../../helpers/constants'; </s> remove import React, { useState } from 'react';
</s> add import React from 'react'; </s> remove "react-tooltip": {
"version": "4.2.6",
"resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-4.2.6.tgz",
"integrity": "sha512-KX/zCsPFCI8RuulzBX86U+Ur7FvgGNRBdb7dUu0ndo8Urinn48nANq9wfq4ABlehweQjPzLl7XdNAtLKza+I3w==",
"requires": {
"prop-types": "^15.7.2",
"uuid": "^7.0.3"
},
"dependencies": {
"uuid": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
}
}
},
</s> add </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove
/*reset position to make absolute position of tooltip on tablets, may cause problems https://github.com/wwayne/react-tooltip/issues/204*/
@media (hover: none) {
.logs__action {
top: 1rem !important;
right: 1rem;
}
.logs__table .rt-td,
.clients__table .rt-td {
position: initial;
}
.logs__row {
position: initial;
}
}
</s> add | [
"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)}
<mask> </div>
<mask> {ipMatchListStatus !== IP_MATCH_LIST_STATUS.CIDR
<mask> && renderBlockingButton(ipMatchListStatus, value, toggleClientStatus, processing)}
</s> Fix #1810
- client: Fix query log bugs
Squashed commit of the following:
commit 188bbad32a2af8a1867fc3ef91d81cda6aa94853
Merge: 15db9e9c ec6e0bea
Author: Andrey Meshkov <am@adguard.com>
Date: Thu Jun 18 22:43:11 2020 +0300
Merge branch 'master' into fix/1810
commit 15db9e9c1daec31d5d6f1d6d77a59bc125fb00d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 19:01:10 2020 +0300
Open tooltip on hover, show scroll on overflow y
commit 19c013378ddac69126475147ca4f0dc9f9ba0428
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 17:17:46 2020 +0300
Replace tooltip component
commit 7e7103dc08cd7e062d6ec6ebd4aaec1ee044f3d2
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Thu Jun 18 14:21:54 2020 +0300
-client: Fix query log bugs </s> remove </Fragment>
</s> add </> </s> remove const { info, client } = row.original;
</s> add const { value, original: { info } } = row; </s> remove <div className="logs__text" title={client}>
</s> add <div className="logs__text" title={value}> </s> remove 'white-space--normal': response.length > 100,
</s> add 'overflow-break': response.length > 100, </s> remove 'word-break--break-all white-space--normal': preparedContent.length > 100,
</s> add 'overflow-break': preparedContent.length > 100, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/aa7b3c33d5f268298f8d2d0367b5ea6550dd2af7 | client/src/components/Dashboard/Clients.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.