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
blockedFiltering={dashboard.stats.blocked_filtering} replacedSafebrowsing={dashboard.stats.replaced_safebrowsing} replacedParental={dashboard.stats.replaced_parental}
<mask> refreshButton={refreshButton} <mask> topBlockedDomains={dashboard.topStats.top_blocked_domains} <mask> /> <mask> </div> <mask> </Fra...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6ca881ee86f586486fa35205eec7617d27e41a72
client/src/components/Dashboard/index.js
<mask> .card-graph { <mask> display: flex; <mask> align-items: center; <mask> justify-content: center; <mask> height: 400px; <mask> } <mask> <mask> .card-body--status { <mask> padding: 2.5rem 1.5rem; <mask> text-align: center; </s> Add progress bar to the stats tables </s> remove con...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6ca881ee86f586486fa35205eec7617d27e41a72
client/src/components/ui/Card.css
export const getPercent = (amount, number) => { if (amount > 0 && number > 0) { return round(100 / (amount / number), 2); } return 0; };
<mask> const newUserRules = Array.isArray(userRules) ? userRules.join('\n') : ''; <mask> return { enabled, userRules: newUserRules, filters: newFilters }; <mask> }; <mask> <mask> export const getPercent = (amount, number) => round(100 / (amount / number)); </s> Add progress bar to the stats tables </s> r...
[ "keep", "keep", "keep", "keep", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6ca881ee86f586486fa35205eec7617d27e41a72
client/src/helpers/helpers.js
{"config", "c", "Path to the config file", func(value string) { o.configFilename = value }, nil}, {"work-dir", "w", "Path to the working directory", func(value string) { o.workDir = value }, nil}, {"host", "h", "Host address to bind HTTP server on", func(value string) { o.bindHost = value }, nil}, {"port", "p",...
<mask> description string <mask> callbackWithValue func(value string) <mask> callbackNoValue func() <mask> }{ <mask> {"config", "c", "path to the config file", func(value string) { o.configFilename = value }, nil}, <mask> {"work-dir", "w", "path to the working directory", func(value string) { o...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
{"service", "s", "Service control action: status, install, uninstall, start, stop, restart", func(value string) {
<mask> panic("Got port that is not a number") <mask> } <mask> o.bindPort = v <mask> }, nil}, <mask> {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) { <mask> o.serviceControlAction = value <mask> }, nil}, <mask> {"logfile", "l",...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
{"logfile", "l", "Path to log file. If empty: write to stdout; if 'syslog': write to system log", func(value string) {
<mask> }, nil}, <mask> {"service", "s", "service control action: status, install, uninstall, start, stop, restart", func(value string) { <mask> o.serviceControlAction = value <mask> }, nil}, <mask> {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
{"pidfile", "", "Path to a file where PID is stored", func(value string) { o.pidFile = value }, nil},
<mask> }, nil}, <mask> {"logfile", "l", "path to the log file. If empty, writes to stdout, if 'syslog' -- system log", func(value string) { <mask> o.logFile = value <mask> }, nil}, <mask> {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil}, <mask> {"check-config...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
{"verbose", "v", "Enable verbose output", nil, func() { o.verbose = true }}, {"help", "", "Print this help", nil, func() {
<mask> o.logFile = value <mask> }, nil}, <mask> {"pidfile", "", "File name to save PID to", func(value string) { o.pidFile = value }, nil}, <mask> {"check-config", "", "Check configuration and exit", nil, func() { o.checkConfig = true }}, <mask> {"verbose", "v", "enable verbose output", nil, func() { o....
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
val := "" if opt.callbackWithValue != nil { val = " VALUE" }
<mask> fmt.Printf("%s [options]\n\n", os.Args[0]) <mask> fmt.Printf("Options:\n") <mask> for _, opt := range opts { <mask> if opt.shortName != "" { <mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName+val, opt.description) <mask> } else { <mask> fmt.Printf(" %-34s %s\n", "...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName+val, opt.description)
<mask> fmt.Printf("%s [options]\n\n", os.Args[0]) <mask> fmt.Printf("Options:\n") <mask> for _, opt := range opts { <mask> if opt.shortName != "" { <mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description) <mask> } else { <mask> fmt.Printf(" %-34s %s\n", "--"+...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
fmt.Printf(" %-34s %s\n", "--"+opt.longName+val, opt.description)
<mask> for _, opt := range opts { <mask> if opt.shortName != "" { <mask> fmt.Printf(" -%s, %-30s %s\n", opt.shortName, "--"+opt.longName, opt.description) <mask> } else { <mask> fmt.Printf(" %-34s %s\n", "--"+opt.longName, opt.description) <mask> } <mask> } <mask> } <mask> for i := 1; ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d14ec18acec68d78572b2c6a3ba548698efde0a
app.go
// Error implements the [error] interface for domainSpecificTestError. func (err domainSpecificTestError) Error() (msg string) { return fmt.Sprintf("WARNING: %s", err.error) }
<mask> error <mask> } <mask> <mask> // checkDNS checks the upstream server defined by upstreamConfigStr using <mask> // healthCheck for actually exchange messages. It uses bootstrap to resolve the <mask> // upstream's address. <mask> func checkDNS( </s> Pull request: 5193-long-ups-check Merge in DNS/adguard...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
<mask> result := map[string]string{} <mask> bootstraps := req.BootstrapDNS <mask> <mask> timeout := s.conf.UpstreamTimeout <mask> for _, host := range req.Upstreams { <mask> err = checkDNS(host, bootstraps, timeout, checkDNSUpstreamExc) <mask> if err != nil { <mask> log.Info("%v", err) <mask> re...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
type upsCheckResult = struct { res string host string
<mask> if _, ok := err.(domainSpecificTestError); ok { <mask> result[host] = fmt.Sprintf("WARNING: %s", result[host]) <mask> } <mask> <mask> continue <mask> } <mask> <mask> result[host] = "OK" <mask> } <mask> <mask> for _, host := range req.PrivateUpstreams { <mask> err = checkDNS(ho...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
upsNum := len(req.Upstreams) + len(req.PrivateUpstreams) resCh := make(chan upsCheckResult, upsNum)
<mask> <mask> result[host] = "OK" <mask> } <mask> <mask> for _, host := range req.PrivateUpstreams { <mask> err = checkDNS(host, bootstraps, timeout, checkPrivateUpstreamExc) <mask> if err != nil { <mask> log.Info("%v", err) <mask> // TODO(e.burkov): If passed upstream have already written an e...
[ "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/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
checkUps := func(ups string, healthCheck healthCheckFunc) { res := upsCheckResult{ host: ups, } defer func() { resCh <- res }() checkErr := checkDNS(ups, bootstraps, timeout, healthCheck) if checkErr != nil { res.res = checkErr.Error() } else { res.res = "OK"
<mask> if _, ok := err.(domainSpecificTestError); ok { <mask> result[host] = fmt.Sprintf("WARNING: %s", result[host]) <mask> } <mask> <mask> continue <mask> } <mask> <mask> result[host] = "OK" <mask> } <mask> </s> Pull request: 5193-long-ups-check Merge in DNS/adguard-home from 5193-lon...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
} for _, ups := range req.Upstreams { go checkUps(ups, checkDNSUpstreamExc) } for _, ups := range req.PrivateUpstreams { go checkUps(ups, checkPrivateUpstreamExc) }
<mask> res.res = checkErr.Error() <mask> } else { <mask> res.res = "OK" <mask> } <mask> <mask> for i := 0; i < upsNum; i++ { <mask> pair := <-resCh <mask> // TODO(e.burkov): The upstreams used for both common and private <mask> // resolving should be reported separately. <mask> result[pai...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
for i := 0; i < upsNum; i++ { pair := <-resCh // TODO(e.burkov): The upstreams used for both common and private // resolving should be reported separately. result[pair.host] = pair.res
<mask> <mask> continue <mask> } <mask> <mask> result[host] = "OK" <mask> } <mask> <mask> _ = aghhttp.WriteJSONResponse(w, r, result) <mask> } <mask> </s> Pull request: 5193-long-ups-check Merge in DNS/adguard-home from 5193-long-ups-check to master Closes #5193. Squashed commit of the followi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
close(resCh)
<mask> result[pair.host] = pair.res <mask> } <mask> <mask> _ = aghhttp.WriteJSONResponse(w, r, result) <mask> } <mask> <mask> // handleCacheClear is the handler for the POST /control/cache_clear HTTP API. </s> Pull request: 5193-long-ups-check Merge in DNS/adguard-home from 5193-long-ups-check to master ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http.go
"net/netip" "net/url"
<mask> "net/http" <mask> "net/http/httptest" <mask> "os" <mask> "path/filepath" <mask> "strings" <mask> "testing" <mask> "time" <mask> </s> Pull request: 5193-long-ups-check Merge in DNS/adguard-home from 5193-long-ups-check to master Closes #5193. Squashed commit of the following: commit 787e6b995...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http_test.go
"time"
<mask> "os" <mask> "path/filepath" <mask> "strings" <mask> "testing" <mask> <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghhttp" <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" </s> Pull request: 5193-long-ups-check Mer...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http_test.go
"github.com/miekg/dns"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghnet" <mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/golibs/testutil" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/require" ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d1adf74b1fbb5f0a941d0b7b68c4469d189adf6
internal/dnsforward/http_test.go
// TODO(a.garipov): This package is deprecated; find a new one or use our // own code for that. Perhaps, use gopacket. github.com/mdlayher/raw v0.1.0
<mask> github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 <mask> github.com/mdlayher/netlink v1.7.1 <mask> github.com/mdlayher/packet v1.1.1 <mask> github.com/miekg/dns v1.1.53 <mask> github.com/quic-go/quic-go v0.33.0 <mask> github.com/stretchr/testify v1.8.2 <mask> github.com/ti-mo/netfilte...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
go.mod
<mask> github.com/davecgh/go-spew v1.1.1 // indirect <mask> github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect <mask> github.com/golang/mock v1.6.0 // indirect <mask> github.com/google/pprof v0.0.0-20230406165453-00490a63f317 // indirect <mask> github.com/mdlayher/raw v0.1.0 // indir...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
go.mod
//go:build freebsd || linux || openbsd
<mask> //go:build darwin || freebsd || linux || openbsd <mask> <mask> package dhcpd <mask> <mask> import ( <mask> "fmt" </s> Pull request 1830: 5712-rollback-dhcp Merge in DNS/adguard-home from 5712-rollback-dhcp to master Updates #5712. Squashed commit of the following: commit 3d53a6385ad08dfad0b7ac28bb0...
[ "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
internal/dhcpd/conn_unix.go
"github.com/AdguardTeam/golibs/log"
<mask> "time" <mask> <mask> "github.com/AdguardTeam/golibs/errors" <mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/google/gopacket" <mask> "github.com/google/gopacket/layers" <mask> "github.com/insomniacslk/dhcp/dhcpv4" <mask> "github.com/insomniacslk/dhcp/dhcpv4/server4" </s> Pull re...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
internal/dhcpd/conn_unix.go
<mask> "github.com/AdguardTeam/golibs/timeutil" <mask> "github.com/go-ping/ping" <mask> "github.com/insomniacslk/dhcp/dhcpv4" <mask> "github.com/insomniacslk/dhcp/dhcpv4/server4" <mask> "github.com/mdlayher/packet" <mask> "golang.org/x/exp/slices" <mask> ) <mask> <mask> // v4Server is a DHCPv4 server. ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
internal/dhcpd/v4_unix.go
<mask> <mask> s.send(peer, conn, req, resp) <mask> } <mask> <mask> // send writes resp for peer to conn considering the req's parameters according <mask> // to RFC-2131. <mask> // <mask> // See https://datatracker.ietf.org/doc/html/rfc2131#section-4.1. <mask> func (s *v4Server) send(peer net.Addr, conn net....
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
internal/dhcpd/v4_unix.go
<mask> "github.com/AdguardTeam/golibs/netutil" <mask> "github.com/AdguardTeam/golibs/stringutil" <mask> "github.com/AdguardTeam/golibs/testutil" <mask> "github.com/insomniacslk/dhcp/dhcpv4" <mask> "github.com/mdlayher/packet" <mask> "github.com/stretchr/testify/assert" <mask> "github.com/stretchr/testify/...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
internal/dhcpd/v4_unix_test.go
<mask> func (fc *fakePacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { <mask> return fc.writeTo(p, addr) <mask> } <mask> <mask> func TestV4Server_Send(t *testing.T) { <mask> s := &v4Server{} <mask> <mask> var ( <mask> defaultIP = net.IP{99, 99, 99, 99} <mask> knownIP = net.IP{4, 2, ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/6d402dc86c9b77c106993206cdb91721a0177c7e
internal/dhcpd/v4_unix_test.go
rm -rf /var/cache/apk/* && mkdir -p /opt/adguardhome
<mask> LABEL maintainer="AdGuard Team <devteam@adguard.com>" <mask> <mask> # Update CA certs <mask> RUN apk --no-cache --update add ca-certificates && \ <mask> rm -rf /var/cache/apk/* <mask> <mask> COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome <mask> <mask> EXPOSE 53 3000 <mask> </s> Fi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7
Dockerfile
COPY --from=build /src/AdGuardHome/AdGuardHome /opt/adguardhome/AdGuardHome
<mask> # Update CA certs <mask> RUN apk --no-cache --update add ca-certificates && \ <mask> rm -rf /var/cache/apk/* <mask> <mask> COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome <mask> <mask> EXPOSE 53 3000 <mask> <mask> VOLUME /data <mask> </s> Fix to go along with new concept </s> remov...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7
Dockerfile
VOLUME ["/opt/adguardhome/conf", "/opt/adguardhome/work"]
<mask> COPY --from=build /src/AdGuardHome/AdGuardHome /AdGuardHome <mask> <mask> EXPOSE 53 3000 <mask> <mask> VOLUME /data <mask> <mask> ENTRYPOINT ["/AdGuardHome"] <mask> CMD ["-h", "0.0.0.0"] </s> Fix to go along with new concept </s> remove ENTRYPOINT ["/AdGuardHome"] CMD ["-h", "0.0.0.0"] </s> add </s> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7
Dockerfile
<mask> EXPOSE 53 3000 <mask> <mask> VOLUME /data <mask> <mask> ENTRYPOINT ["/AdGuardHome"] <mask> CMD ["-h", "0.0.0.0"] </s> Fix to go along with new concept </s> remove rm -rf /var/cache/apk/* </s> add rm -rf /var/cache/apk/* && mkdir -p /opt/adguardhome </s> remove COPY --from=build /src/AdGuardHome/...
[ "keep", "keep", "keep", "keep", "replace", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6d7d10ec3870ea0d412f6b5e7c26cfdcce414dc7
Dockerfile
// 1. Run "sudo ipset create example_set hash:ip family ipv4".
<mask> ) <mask> <mask> // How to test on a real Linux machine: <mask> // <mask> // 1. Run: <mask> // <mask> // sudo ipset create example_set hash:ip family ipv4 <mask> // <mask> // 2. Run: <mask> // </s> Pull request: imp-scripts Merge in DNS/adguard-home from imp-scripts to master Squashed commit of ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/aghnet/ipset_linux.go
// 2. Run "sudo ipset list example_set". The Members field should be empty.
<mask> // How to test on a real Linux machine: <mask> // <mask> // 1. Run: <mask> // <mask> // sudo ipset create example_set hash:ip family ipv4 <mask> // <mask> // 2. Run: <mask> // <mask> // sudo ipset list example_set <mask> // </s> Pull request: imp-scripts Merge in DNS/adguard-home from imp-scrip...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/aghnet/ipset_linux.go
// 3. Add the line "example.com/example_set" to your AdGuardHome.yaml.
<mask> // 1. Run: <mask> // <mask> // sudo ipset create example_set hash:ip family ipv4 <mask> // <mask> // 2. Run: <mask> // <mask> // sudo ipset list example_set <mask> // <mask> // The Members field should be empty. <mask> // </s> Pull request: imp-scripts Merge in DNS/adguard-home from imp-scripts...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/aghnet/ipset_linux.go
// 4. Start AdGuardHome.
<mask> // sudo ipset create example_set hash:ip family ipv4 <mask> // <mask> // 2. Run: <mask> // <mask> // sudo ipset list example_set <mask> // <mask> // The Members field should be empty. <mask> // <mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. <mask> // </s> Pull requ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/aghnet/ipset_linux.go
// 5. Make requests to example.com and its subdomains.
<mask> // 2. Run: <mask> // <mask> // sudo ipset list example_set <mask> // <mask> // The Members field should be empty. <mask> // <mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. <mask> // <mask> // 4. Start AdGuardHome. <mask> // </s> Pull request: imp-scripts Merge in DN...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/aghnet/ipset_linux.go
// 6. Run "sudo ipset list example_set". The Members field should contain the // resolved IP addresses.
<mask> // sudo ipset list example_set <mask> // <mask> // The Members field should be empty. <mask> // <mask> // 3. Add the line "example.com/example_set" to your AdGuardHome.yaml. <mask> // <mask> // 4. Start AdGuardHome. <mask> // <mask> // 5. Make requests to example.com and its subdomains. <mask> // ...
[ "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/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/aghnet/ipset_linux.go
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84
<mask> github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 <mask> github.com/kisielk/errcheck v1.6.2 <mask> github.com/kyoh86/looppointer v0.1.7 <mask> github.com/securego/gosec/v2 v2.13.1 <mask> golang.org/x/tools v0.1.13-0.20220803210227-8b9a1fbdf5c3 <mask> golang.org/x/vuln v0.0.0-20220...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.mod
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e // indirect
<mask> github.com/gookit/color v1.5.2 // indirect <mask> github.com/kyoh86/nolint v0.0.1 // indirect <mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect <mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect <mask> golang.org/x/exp v0.0.0-20220909182711-5...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.mod
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 // indirect
<mask> github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect <mask> github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect <mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect <mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indire...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.mod
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect
<mask> golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect <mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect <mask> golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect <mask> golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect <mask> g...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.mod
golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e h1:Ctm9yurWsg7aWwIpH9Bnap/IdSVxixymIb3MhiMEQQA= golang.org/x/exp v0.0.0-20220921023135-46d9e7742f1e/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
<mask> golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= <mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= <mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNh...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.sum
golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35 h1:CZP0Rbk/s1EIiUMx5DS2MhK2ct52xpQxqddVD0FmF+o= golang.org/x/mod v0.6.0-dev.0.20220907135952-02c991387e35/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
<mask> golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= <mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= <mask> golang.org/x...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.sum
golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc= golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= <mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= <mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.sum
golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5 h1:o1LhIiY5L+hLK9DWqfFlilCrpZnw/s7WU4iCUkb/bao= golang.org/x/tools v0.1.13-0.20220921142454-16b974289fe5/go.mod h1:VsjNM1dMo+Ofkp5d7y7fOdQZD8MTXSQ4w3EPk65AvKU= golang.org/x/vuln v0.0.0-20220921153644-d9be10b6cc84 h1:L0qUjdplndgX880fozFRGC242wAtfsViyRXWGlpZQ54= go...
<mask> golang.org/x/tools v0.0.0-20200710042808-f1c4188a97a1/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= <mask> golang.org/x/tools v0.0.0-20201007032633-0806396f153e/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= <mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOk...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6e7964c9e7e8e1d999a2b402c0f60496d0cf7801
internal/tools/go.sum
"dhcp_lease_added": "Static lease \"{{key}}\" successfully added", "dhcp_lease_deleted": "Static lease \"{{key}}\" successfully deleted", "dhcp_new_static_lease": "New static lease", "dhcp_static_leases_not_found": "No DHCP static leases found", "dhcp_add_static_lease": "Add static lease", "dele...
<mask> "dhcp_warning": "If you want to enable DHCP server anyway, make sure that there is no other active DHCP server in your network. Otherwise, it can break the Internet for connected devices!", <mask> "dhcp_error": "We could not determine whether there is another DHCP server in the network.", <mask> "...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/__locales/en.json
<mask> export const setDhcpConfigRequest = createAction('SET_DHCP_CONFIG_REQUEST'); <mask> export const setDhcpConfigSuccess = createAction('SET_DHCP_CONFIG_SUCCESS'); <mask> export const setDhcpConfigFailure = createAction('SET_DHCP_CONFIG_FAILURE'); <mask> <mask> // TODO rewrite findActiveDhcp part <mask> expo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/actions/index.js
dispatch(findActiveDhcp(values.interface_name)); try { await apiClient.setDhcpConfig(updatedConfig); dispatch(setDhcpConfigSuccess(updatedConfig)); dispatch(addSuccessToast('dhcp_config_saved')); } catch (error) { dispatch(addErrorToast({ error })); dispatch(setDhcpCo...
<mask> export const setDhcpConfig = values => async (dispatch, getState) => { <mask> const { config } = getState().dhcp; <mask> const updatedConfig = { ...config, ...values }; <mask> dispatch(setDhcpConfigRequest()); <mask> if (values.interface_name) { <mask> dispatch(findActiveDhcpRequest...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/actions/index.js
export const toggleDhcp = values => async (dispatch) => {
<mask> export const toggleDhcpRequest = createAction('TOGGLE_DHCP_REQUEST'); <mask> export const toggleDhcpFailure = createAction('TOGGLE_DHCP_FAILURE'); <mask> export const toggleDhcpSuccess = createAction('TOGGLE_DHCP_SUCCESS'); <mask> <mask> // TODO rewrite findActiveDhcp part <mask> export const toggleDhcp =...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/actions/index.js
let config = { ...values, enabled: false }; let successMessage = 'disabled_dhcp';
<mask> export const toggleDhcp = values => async (dispatch) => { <mask> dispatch(toggleDhcpRequest()); <mask> <mask> if (!values.enabled) { <mask> config = { ...values, enabled: true }; <mask> successMessage = 'enabled_dhcp'; <mask> dispatch(findActiveDhcp(values.interface_name))...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/actions/index.js
if (!values.enabled) { config = { ...values, enabled: true }; successMessage = 'enabled_dhcp'; dispatch(findActiveDhcp(values.interface_name)); } try { await apiClient.setDhcpConfig(config); dispatch(toggleDhcpSuccess()); dispatch(addSuccessToast(successMessa...
<mask> // TODO rewrite findActiveDhcp part <mask> export const toggleDhcp = config => async (dispatch) => { <mask> dispatch(toggleDhcpRequest()); <mask> <mask> if (config.enabled) { <mask> try { <mask> await apiClient.setDhcpConfig({ ...config, enabled: false }); <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/actions/index.js
DHCP_ADD_STATIC_LEASE = { path: 'dhcp/add_static_lease', method: 'POST' }; DHCP_REMOVE_STATIC_LEASE = { path: 'dhcp/remove_static_lease', method: 'POST' };
<mask> DHCP_STATUS = { path: 'dhcp/status', method: 'GET' }; <mask> DHCP_SET_CONFIG = { path: 'dhcp/set_config', method: 'POST' }; <mask> DHCP_FIND_ACTIVE = { path: 'dhcp/find_active_dhcp', method: 'POST' }; <mask> DHCP_INTERFACES = { path: 'dhcp/interfaces', method: 'GET' }; <mask> <mask> ge...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/api/Api.js
import { connect } from 'react-redux';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm, formValueSelector } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderField, required, ipv4, isPositiv...
[ "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
import { Field, reduxForm, formValueSelector } from 'redux-form'; import { Trans, withNamespaces } from 'react-i18next';
<mask> import React from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderField, required, ipv4, isPositive, toNumber } from '../../...
[ "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
const renderInterfaces = (interfaces => ( Object.keys(interfaces).map((item) => { const option = interfaces[item]; const { name } = option; const onlyIPv6 = option.ip_addresses.every(ip => ip.includes(':')); let interfaceIP = option.ip_addresses[0]; if (!onlyIPv6) { ...
<mask> import flow from 'lodash/flow'; <mask> <mask> import { renderField, required, ipv4, isPositive, toNumber } from '../../../helpers/form'; <mask> <mask> const Form = (props) => { <mask> const { <mask> t, <mask> handleSubmit, <mask> submitting, <mask> invalid, </s> +...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
enabled, interfaces, interfaceValue,
<mask> submitting, <mask> invalid, <mask> processingConfig, <mask> processingInterfaces, <mask> } = props; <mask> <mask> return ( </s> + client: handle static leases form </s> remove const Form = (props) => { </s> add const renderInterfaces = (interfaces => ( Object...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
processingInterfaces,
<mask> interfaceValue, <mask> processingConfig, <mask> } = props; <mask> <mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> {!processingInterfaces && interfaces && <mask> <div className="row"> </s> + client: handle static leases form </s> r...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
interfaceValue: PropTypes.string,
<mask> handleSubmit: PropTypes.func, <mask> submitting: PropTypes.bool, <mask> invalid: PropTypes.bool, <mask> interfaces: PropTypes.object, <mask> initialValues: PropTypes.object, <mask> processingConfig: PropTypes.bool, <mask> processingInterfaces: PropTypes.bool, <mask> enable...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
processingInterfaces: PropTypes.bool, enabled: PropTypes.bool,
<mask> initialValues: PropTypes.object, <mask> processingConfig: PropTypes.bool, <mask> t: PropTypes.func, <mask> }; <mask> <mask> <mask> const selector = formValueSelector('dhcpForm'); <mask> </s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part </s> add
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
const selector = formValueSelector('dhcpForm'); Form = connect((state) => { const interfaceValue = selector(state, 'interface_name'); return { interfaceValue, }; })(Form);
<mask> }; <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ form: 'dhcpForm' }), <mask> ])(Form); </s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part </s> add </s> remove if (config.enabled) { try { await apiCli...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/Form.js
import StaticLeases from './StaticLeases/index';
<mask> <mask> import { DHCP_STATUS_RESPONSE } from '../../../helpers/constants'; <mask> import Form from './Form'; <mask> import Leases from './Leases'; <mask> import StaticLeases from './StaticLeases'; <mask> import Interface from './Interface'; <mask> import Card from '../../ui/Card'; <mask> import Accordion...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
if (values.interface_name) { this.props.setDhcpConfig(values); }
<mask> import Accordion from '../../ui/Accordion'; <mask> <mask> class Dhcp extends Component { <mask> handleFormSubmit = (values) => { <mask> this.props.setDhcpConfig(values); <mask> }; <mask> <mask> handleToggle = (config) => { <mask> this.props.toggleDhcp(config); <mask> }...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
<mask> <Card title={ t('dhcp_title') } subtitle={ t('dhcp_description') } bodyType="card-body box-body--settings"> <mask> <div className="dhcp"> <mask> {!dhcp.processing && <mask> <Fragment> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
initialValues={{ interface_name, ...values, }}
<mask> enabled={dhcp.config.enabled} <mask> /> <mask> <Form <mask> onSubmit={this.handleFormSubmit} <mask> initialValues={{ ...values }} <mask...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
processingInterfaces={dhcp.processingInterfaces} enabled={enabled}
<mask> ...values, <mask> }} <mask> interfaces={dhcp.interfaces} <mask> processingConfig={dhcp.processingConfig} <mask> /> <mask> ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
this.props.findActiveDhcp(interface_name)
<mask> <button <mask> type="button" <mask> className={statusButtonClass} <mask> onClick={() => <mask> this.props.fi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
enabled || !interface_name
<mask> onClick={() => <mask> this.props.findActiveDhcp(dhcp.config.interface_name) <mask> } <mask> disabled={ <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
<div className="col-12"> <StaticLeases staticLeases={dhcp.staticLeases} isModalOpen={dhcp.isModalOpen} addStaticLease={this.props.ad...
<mask> </div> <mask> </Card> <mask> <Card title={ t('dhcp_static_leases') } bodyType="card-body box-body--settings"> <mask> <div className="row"> <mask> <div className="col"> <ma...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
addStaticLease: PropTypes.func, removeStaticLease: PropTypes.func, toggleLeaseModal: PropTypes.func,
<mask> getDhcpStatus: PropTypes.func, <mask> setDhcpConfig: PropTypes.func, <mask> findActiveDhcp: PropTypes.func, <mask> handleSubmit: PropTypes.func, <mask> t: PropTypes.func, <mask> }; <mask> <mask> export default withNamespaces()(Dhcp); </s> + client: handle static leases form
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/Dhcp/index.js
addStaticLease={this.props.addStaticLease} removeStaticLease={this.props.removeStaticLease} toggleLeaseModal={this.props.toggleLeaseModal}
<mask> getDhcpStatus={this.props.getDhcpStatus} <mask> findActiveDhcp={this.props.findActiveDhcp} <mask> setDhcpConfig={this.props.setDhcpConfig} <mask> /> <mask> ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/components/Settings/index.js
addStaticLease, removeStaticLease, toggleLeaseModal,
<mask> getDhcpInterfaces, <mask> setDhcpConfig, <mask> findActiveDhcp, <mask> } from '../actions'; <mask> import { <mask> getTlsStatus, <mask> setTlsConfig, </s> + client: handle static leases form </s> remove import { Field, reduxForm } from 'redux-form'; import { withNamespaces } from 'rea...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/containers/Settings.js
addStaticLease, removeStaticLease, toggleLeaseModal,
<mask> updateClient, <mask> deleteClient, <mask> toggleClientModal, <mask> }; <mask> <mask> export default connect( <mask> mapStateToProps, <mask> mapDispatchToProps, </s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part </s> add </s> remove if (con...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/containers/Settings.js
processingAdding: false, processingDeleting: false,
<mask> processingInterfaces: false, <mask> processingDhcp: false, <mask> processingConfig: false, <mask> config: { <mask> enabled: false, <mask> }, <mask> check: null, <mask> leases: [], </s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/reducers/index.js
isModalOpen: false,
<mask> leases: [], <mask> staticLeases: [], <mask> }); <mask> <mask> export default combineReducers({ <mask> settings, <mask> dashboard, </s> + client: handle static leases form </s> remove // TODO rewrite findActiveDhcp part export const toggleDhcp = config => async (dispatch) => { </s> add e...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f2503a09f2c9b119175f81b05cd0e3ef942922a
client/src/reducers/index.js
"name": "dashboard", "version": "0.1.0", "private": true, "scripts": { "build-dev": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js", "watch": "cross-env BUILD_ENV=dev webpack --config webpack.dev.js --watch", "build-prod": "cross-env BUILD_ENV=prod webpack --config webp...
<mask> { <mask> "name": "dashboard", <mask> "version": "0.1.0", <mask> "private": true, <mask> "scripts": { <mask> "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js", <mask> "watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch", <mask> "...
[ "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replac...
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/package.json
import i18next from 'i18next';
<mask> import { createAction } from 'redux-actions'; <mask> import { t } from 'i18next'; <mask> <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addSuccessToast } from './index'; <mask> import { normalizeTextarea } from '../helpers/helpers'; <mask> import { ACTION } from '../helpers/con...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
<mask> import { createAction } from 'redux-actions'; <mask> import { t } from 'i18next'; <mask> <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addSuccessToast } from './index'; <mask> import { normalizeTextarea } from '../helpers/helpers'; <mask> import { ACTION } from '../helpers/con...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
import { addErrorToast, addSuccessToast } from './toasts';
<mask> import { normalizeTextarea } from '../helpers/helpers'; <mask> import { ACTION } from '../helpers/constants'; <mask> <mask> export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST'); <mask> export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE'); <mask> export const g...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
export const setAccessList = (config) => async (dispatch) => {
<mask> export const setAccessListRequest = createAction('SET_ACCESS_LIST_REQUEST'); <mask> export const setAccessListFailure = createAction('SET_ACCESS_LIST_FAILURE'); <mask> export const setAccessListSuccess = createAction('SET_ACCESS_LIST_SUCCESS'); <mask> <mask> export const setAccessList = config => async (di...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
updatedDisallowedClients = updatedDisallowedClients.filter((client) => client !== ip);
<mask> } = await apiClient.getAccessList(); <mask> let updatedDisallowedClients = disallowed_clients || []; <mask> <mask> if (type === ACTION.unblock && updatedDisallowedClients.includes(ip)) { <mask> updatedDisallowedClients = updatedDisallowedClients.filter(client => client !...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
dispatch(addSuccessToast(i18next.t('client_unblocked', { ip })));
<mask> await apiClient.setAccessList(values); <mask> dispatch(toggleClientBlockSuccess(values)); <mask> <mask> if (type === ACTION.unblock) { <mask> dispatch(addSuccessToast(t('client_unblocked', { ip }))); <mask> } else if (type === ACTION.block) { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
<mask> <mask> if (type === ACTION.unblock) { <mask> dispatch(addSuccessToast(t('client_unblocked', { ip }))); <mask> } else if (type === ACTION.block) { <mask> dispatch(addSuccessToast(t('client_blocked', { ip }))); <mask> } <mask> } catch (error) { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/access.js
import i18next from 'i18next';
<mask> import { createAction } from 'redux-actions'; <mask> import { t } from 'i18next'; <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addSuccessToast, getClients } from './index'; <mask> <mask> export const toggleClientModal = createAction('TOGGLE_CLIENT_MODAL'); <mask> </s> + cli...
[ "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
import { getClients } from './index'; import { addErrorToast, addSuccessToast } from './toasts';
<mask> import { createAction } from 'redux-actions'; <mask> import { t } from 'i18next'; <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addSuccessToast, getClients } from './index'; <mask> <mask> export const toggleClientModal = createAction('TOGGLE_CLIENT_MODAL'); <mask> <mask> exp...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
export const addClient = (config) => async (dispatch) => {
<mask> export const addClientRequest = createAction('ADD_CLIENT_REQUEST'); <mask> export const addClientFailure = createAction('ADD_CLIENT_FAILURE'); <mask> export const addClientSuccess = createAction('ADD_CLIENT_SUCCESS'); <mask> <mask> export const addClient = config => async (dispatch) => { <mask> dispat...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
dispatch(addSuccessToast(i18next.t('client_added', { key: config.name })));
<mask> try { <mask> await apiClient.addClient(config); <mask> dispatch(addClientSuccess()); <mask> dispatch(toggleClientModal()); <mask> dispatch(addSuccessToast(t('client_added', { key: config.name }))); <mask> dispatch(getClients()); <mask> } catch (error) { <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
export const deleteClient = (config) => async (dispatch) => {
<mask> export const deleteClientRequest = createAction('DELETE_CLIENT_REQUEST'); <mask> export const deleteClientFailure = createAction('DELETE_CLIENT_FAILURE'); <mask> export const deleteClientSuccess = createAction('DELETE_CLIENT_SUCCESS'); <mask> <mask> export const deleteClient = config => async (dispatch) =>...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
dispatch(addSuccessToast(i18next.t('client_deleted', { key: config.name })));
<mask> dispatch(deleteClientRequest()); <mask> try { <mask> await apiClient.deleteClient(config); <mask> dispatch(deleteClientSuccess()); <mask> dispatch(addSuccessToast(t('client_deleted', { key: config.name }))); <mask> dispatch(getClients()); <mask> } catch (error) ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
dispatch(addSuccessToast(i18next.t('client_updated', { key: name })));
<mask> <mask> await apiClient.updateClient(data); <mask> dispatch(updateClientSuccess()); <mask> dispatch(toggleClientModal()); <mask> dispatch(addSuccessToast(t('client_updated', { key: name }))); <mask> dispatch(getClients()); <mask> } catch (error) { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/clients.js
<mask> import { createAction } from 'redux-actions'; <mask> <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addSuccessToast } from './index'; <mask> import { normalizeTextarea } from '../helpers/helpers'; <mask> <mask> export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_RE...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/dnsConfig.js
import { addErrorToast, addSuccessToast } from './toasts';
<mask> import apiClient from '../api/Api'; <mask> import { normalizeTextarea } from '../helpers/helpers'; <mask> <mask> export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST'); <mask> export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE'); <mask> export const getDnsConfigSucc...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/dnsConfig.js
export const setDnsConfig = (config) => async (dispatch) => {
<mask> export const setDnsConfigRequest = createAction('SET_DNS_CONFIG_REQUEST'); <mask> export const setDnsConfigFailure = createAction('SET_DNS_CONFIG_FAILURE'); <mask> export const setDnsConfigSuccess = createAction('SET_DNS_CONFIG_SUCCESS'); <mask> <mask> export const setDnsConfig = config => async (dispatch)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/dnsConfig.js
<mask> import { createAction } from 'redux-actions'; <mask> import apiClient from '../api/Api'; <mask> import { addErrorToast, addSuccessToast } from './index'; <mask> import { redirectToCurrentProtocol } from '../helpers/helpers'; <mask> <mask> export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQ...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/encryption.js
import { addErrorToast, addSuccessToast } from './toasts';
<mask> import { createAction } from 'redux-actions'; <mask> import apiClient from '../api/Api'; <mask> import { redirectToCurrentProtocol } from '../helpers/helpers'; <mask> <mask> export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST'); <mask> export const getTlsStatusFailure = createAction('G...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/encryption.js
export const setTlsConfig = (config) => async (dispatch, getState) => {
<mask> export const setTlsConfigRequest = createAction('SET_TLS_CONFIG_REQUEST'); <mask> export const setTlsConfigFailure = createAction('SET_TLS_CONFIG_FAILURE'); <mask> export const setTlsConfigSuccess = createAction('SET_TLS_CONFIG_SUCCESS'); <mask> <mask> export const setTlsConfig = config => async (dispatch,...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/encryption.js
export const validateTlsConfig = (config) => async (dispatch) => {
<mask> export const validateTlsConfigRequest = createAction('VALIDATE_TLS_CONFIG_REQUEST'); <mask> export const validateTlsConfigFailure = createAction('VALIDATE_TLS_CONFIG_FAILURE'); <mask> export const validateTlsConfigSuccess = createAction('VALIDATE_TLS_CONFIG_SUCCESS'); <mask> <mask> export const validateTls...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/encryption.js
import i18next from 'i18next';
<mask> import { createAction } from 'redux-actions'; <mask> import { showLoading, hideLoading } from 'react-redux-loading-bar'; <mask> import { t } from 'i18next'; <mask> <mask> import { normalizeFilteringStatus, normalizeRulesTextarea } from '../helpers/helpers'; <mask> import { addErrorToast, addSuccessToast }...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/6f3cd4e7eb1f9c790208d8f42ead6af04f2138e4
client/src/actions/filtering.js