docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep add keep keep keep keep | <mask>
<mask> setupContext(args)
<mask>
<mask> // clients package uses filtering package's static data (filtering.BlockedSvcKnown()),
<mask> // so we have to initialize filtering's static data first,
<mask> // but also avoid relying on automatic Go init() function
<mask> filtering.InitModule()
</s> Pull request: all: support setgid, setuid on unix
Updates #2763.
Squashed commit of the following:
commit bd2077c6569b53ae341a58aa73de6063d7037e8e
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 4 16:25:17 2021 +0300
all: move rlimit_nofile, imp docs
commit ba95d4ab7c722bf83300d626a598aface37539ad
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 4 15:12:23 2021 +0300
all: support setgid, setuid on unix </s> add // osConfig contains OS-related configuration.
type osConfig struct {
// Group is the name of the group which AdGuard Home must switch to on
// startup. Empty string means no switching.
Group string `yaml:"group"`
// User is the name of the user which AdGuard Home must switch to on
// startup. Empty string means no switching.
User string `yaml:"user"`
// RlimitNoFile is the maximum number of opened fd's per process. Zero
// means use the default value.
RlimitNoFile uint64 `yaml:"rlimit_nofile"`
}
</s> remove log.Fatal("service actions are not supported on openbsd")
</s> add log.Fatal("service actions are not supported on openbsd, see issue 3226") </s> add OSConfig *osConfig `yaml:"os"`
</s> remove // ErrUnsupported is returned when the functionality is unsupported on the
// current operating system.
//
// TODO(a.garipov): Make a structured error and use it everywhere instead of
// a bunch of fmt.Errorf and all that.
const ErrUnsupported errors.Error = "unsupported"
</s> add // UnsupportedError is returned by functions and methods when a particular
// operation Op cannot be performed on the current OS.
type UnsupportedError struct {
Op string
OS string
}
// Error implements the error interface for *UnsupportedError.
func (err *UnsupportedError) Error() (msg string) {
return fmt.Sprintf("%s is unsupported on %s", err.Op, err.OS)
}
// Unsupported is a helper that returns an *UnsupportedError with the Op field
// set to op and the OS field set to the current OS.
func Unsupported(op string) (err error) {
return &UnsupportedError{
Op: op,
OS: runtime.GOOS,
}
} </s> remove
"github.com/AdguardTeam/golibs/errors"
</s> add </s> remove ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint64 `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | https://github.com/AdguardTeam/AdGuardHome/commit/48c44c29aba472839b25fe1132c6ee8b91a27bba | internal/home/home.go |
keep keep keep keep replace keep keep keep keep keep | <mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // currentSchemaVersion is the current schema version.
<mask> const currentSchemaVersion = 10
<mask>
<mask> // These aliases are provided for convenience.
<mask> type (
<mask> any = interface{}
<mask> yarr = []any
</s> Pull request: all: support setgid, setuid on unix
Updates #2763.
Squashed commit of the following:
commit bd2077c6569b53ae341a58aa73de6063d7037e8e
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 4 16:25:17 2021 +0300
all: move rlimit_nofile, imp docs
commit ba95d4ab7c722bf83300d626a598aface37539ad
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 4 15:12:23 2021 +0300
all: support setgid, setuid on unix </s> remove // ErrUnsupported is returned when the functionality is unsupported on the
// current operating system.
//
// TODO(a.garipov): Make a structured error and use it everywhere instead of
// a bunch of fmt.Errorf and all that.
const ErrUnsupported errors.Error = "unsupported"
</s> add // UnsupportedError is returned by functions and methods when a particular
// operation Op cannot be performed on the current OS.
type UnsupportedError struct {
Op string
OS string
}
// Error implements the error interface for *UnsupportedError.
func (err *UnsupportedError) Error() (msg string) {
return fmt.Sprintf("%s is unsupported on %s", err.Op, err.OS)
}
// Unsupported is a helper that returns an *UnsupportedError with the Op field
// set to op and the OS field set to the current OS.
func Unsupported(op string) (err error) {
return &UnsupportedError{
Op: op,
OS: runtime.GOOS,
}
} </s> remove
"github.com/AdguardTeam/golibs/errors"
</s> add </s> remove if config.RlimitNoFile != 0 {
err = aghos.SetRlimit(config.RlimitNoFile)
if err != nil && !errors.Is(err, aghos.ErrUnsupported) {
return fmt.Errorf("setting rlimit: %w", err)
}
}
</s> add </s> add err = configureOS(&config)
fatalOnError(err)
</s> add // osConfig contains OS-related configuration.
type osConfig struct {
// Group is the name of the group which AdGuard Home must switch to on
// startup. Empty string means no switching.
Group string `yaml:"group"`
// User is the name of the user which AdGuard Home must switch to on
// startup. Empty string means no switching.
User string `yaml:"user"`
// RlimitNoFile is the maximum number of opened fd's per process. Zero
// means use the default value.
RlimitNoFile uint64 `yaml:"rlimit_nofile"`
}
</s> remove log.Fatal("service actions are not supported on openbsd")
</s> add log.Fatal("service actions are not supported on openbsd, see issue 3226") | https://github.com/AdguardTeam/AdGuardHome/commit/48c44c29aba472839b25fe1132c6ee8b91a27bba | internal/home/upgrade.go |
keep keep add keep keep keep keep | <mask> upgradeSchema7to8,
<mask> upgradeSchema8to9,
<mask> upgradeSchema9to10,
<mask> }
<mask>
<mask> n := 0
<mask> for i, u := range upgrades {
</s> Pull request: all: support setgid, setuid on unix
Updates #2763.
Squashed commit of the following:
commit bd2077c6569b53ae341a58aa73de6063d7037e8e
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 4 16:25:17 2021 +0300
all: move rlimit_nofile, imp docs
commit ba95d4ab7c722bf83300d626a598aface37539ad
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 4 15:12:23 2021 +0300
all: support setgid, setuid on unix </s> remove return false, fmt.Errorf("can't find DHCP server: not supported on macOS")
</s> add return false, aghos.Unsupported("CheckIfOtherDHCPServersPresentV4") </s> remove return ErrUnsupported
</s> add return Unsupported("setrlimit") </s> remove if config.RlimitNoFile != 0 {
err = aghos.SetRlimit(config.RlimitNoFile)
if err != nil && !errors.Is(err, aghos.ErrUnsupported) {
return fmt.Errorf("setting rlimit: %w", err)
}
}
</s> add </s> add OSConfig: &osConfig{}, </s> remove func newBroadcastPacketConn(bindAddr net.IP, port int, ifname string) (*ipv4.PacketConn, error) {
return nil, errors.Error("newBroadcastPacketConn(): not supported on Windows")
</s> add func newBroadcastPacketConn(_ net.IP, _ int, _ string) (*ipv4.PacketConn, error) {
return nil, aghos.Unsupported("newBroadcastPacketConn") </s> remove return fmt.Errorf("not supported on Windows")
</s> add return Unsupported("kill") | https://github.com/AdguardTeam/AdGuardHome/commit/48c44c29aba472839b25fe1132c6ee8b91a27bba | internal/home/upgrade.go |
keep add keep keep keep keep keep keep | <mask> }
<mask>
<mask> // InSlice checks if string is in the slice of strings.
<mask> func InSlice(strs []string, str string) (ok bool) {
<mask> for _, s := range strs {
<mask> if s == str {
<mask> return true
<mask> }
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} </s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/aghstrings/strings.go |
keep keep keep add keep keep keep keep | <mask>
<mask> return false
<mask> }
<mask>
<mask> // SplitNext splits string by a byte and returns the first chunk skipping empty
<mask> // ones. Whitespaces are trimmed.
<mask> func SplitNext(s *string, sep rune) (chunk string) {
<mask> if s == nil {
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove // collectDNSIPAddrs returns the slice of IP addresses without port number which
// we are listening on. For internal use only.
</s> add // collectDNSIPAddrs returns IP addresses the server is listening on without
// port numbers as a map. For internal use only. | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/aghstrings/strings.go |
keep keep keep add keep keep keep keep keep | <mask> assert.Equal(t, CloneSlice(a), CloneSliceOrEmpty(a))
<mask> })
<mask> }
<mask>
<mask> func TestInSlice(t *testing.T) {
<mask> simpleStrs := []string{"1", "2", "3"}
<mask>
<mask> testCases := []struct {
<mask> name string
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/aghstrings/strings_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> } else {
<mask> upstreams = s.conf.UpstreamDNS
<mask> }
<mask>
<mask> upstreams = filterOutComments(upstreams)
<mask> upstreamConfig, err := proxy.ParseUpstreamsConfig(
<mask> upstreams,
<mask> upstream.Options{
<mask> Bootstrap: s.conf.BootstrapDNS,
<mask> Timeout: DefaultTimeout,
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove c.Upstreams,
</s> add upstreams, </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove localAddrs = stringSetSubtract(localAddrs, ourAddrs)
</s> add localAddrs = aghstrings.FilterOut(localAddrs, func(s string) (ok bool) {
_, ok = ourAddrsSet[s]
return ok
}) </s> remove name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
</s> add name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`, </s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/config.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> // locally-served networks. It is assumed that local resolvers should work much
<mask> // faster than ordinary upstreams.
<mask> const defaultLocalTimeout = 1 * time.Second
<mask>
<mask> // collectDNSIPAddrs returns the slice of IP addresses without port number which
<mask> // we are listening on. For internal use only.
<mask> func (s *Server) collectDNSIPAddrs() (addrs []string, err error) {
<mask> addrs = make([]string, len(s.conf.TCPListenAddrs)+len(s.conf.UDPListenAddrs))
<mask> var i int
<mask> var ip net.IP
<mask> for _, addr := range s.conf.TCPListenAddrs {
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove localAddrs = stringSetSubtract(localAddrs, ourAddrs)
</s> add localAddrs = aghstrings.FilterOut(localAddrs, func(s string) (ok bool) {
_, ok = ourAddrsSet[s]
return ok
}) </s> add ourAddrsSet := sliceToSet(ourAddrs)
</s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/dnsforward.go |
keep keep keep replace replace replace replace keep replace replace replace keep | <mask> return addrs[:i], nil
<mask> }
<mask>
<mask> // stringSetSubtract subtracts b from a interpreted as sets.
<mask> func stringSetSubtract(a, b []string) (c []string) {
<mask> // unit is an object to be used as value in set.
<mask> type unit = struct{}
<mask>
<mask> cSet := make(map[string]unit)
<mask> for _, k := range a {
<mask> cSet[k] = unit{}
<mask> }
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> for _, k := range a {
<mask> cSet[k] = unit{}
<mask> }
<mask>
<mask> for _, k := range b {
<mask> delete(cSet, k)
<mask> }
<mask>
<mask> c = make([]string, len(cSet))
<mask> i := 0
<mask> for k := range cSet {
<mask> c[i] = k
<mask> i++
<mask> }
<mask>
<mask> return c
<mask> }
<mask>
<mask> // setupResolvers initializes the resolvers for local addresses. For internal
<mask> // use only.
<mask> func (s *Server) setupResolvers(localAddrs []string) (err error) {
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} </s> remove // collectDNSIPAddrs returns the slice of IP addresses without port number which
// we are listening on. For internal use only.
</s> add // collectDNSIPAddrs returns IP addresses the server is listening on without
// port numbers as a map. For internal use only. </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/dnsforward.go |
keep add keep keep keep keep keep keep | <mask> }
<mask>
<mask> // TODO(e.burkov): The approach of subtracting sets of strings is not
<mask> // really applicable here since in case of listening on all network
<mask> // interfaces we should check the whole interface's network to cut off
<mask> // all the loopback addresses as well.
<mask> localAddrs = aghstrings.FilterOut(localAddrs, func(s string) (ok bool) {
<mask> _, ok = ourAddrsSet[s]
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove localAddrs = stringSetSubtract(localAddrs, ourAddrs)
</s> add localAddrs = aghstrings.FilterOut(localAddrs, func(s string) (ok bool) {
_, ok = ourAddrsSet[s]
return ok
}) </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove // collectDNSIPAddrs returns the slice of IP addresses without port number which
// we are listening on. For internal use only.
</s> add // collectDNSIPAddrs returns IP addresses the server is listening on without
// port numbers as a map. For internal use only. </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} </s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // TODO(e.burkov): The approach of subtracting sets of strings is not
<mask> // really applicable here since in case of listening on all network
<mask> // interfaces we should check the whole interface's network to cut off
<mask> // all the loopback addresses as well.
<mask> localAddrs = stringSetSubtract(localAddrs, ourAddrs)
<mask>
<mask> var upsConfig proxy.UpstreamConfig
<mask> upsConfig, err = proxy.ParseUpstreamsConfig(localAddrs, upstream.Options{
<mask> Bootstrap: bootstraps,
<mask> Timeout: defaultLocalTimeout,
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add ourAddrsSet := sliceToSet(ourAddrs)
</s> remove // collectDNSIPAddrs returns the slice of IP addresses without port number which
// we are listening on. For internal use only.
</s> add // collectDNSIPAddrs returns IP addresses the server is listening on without
// port numbers as a map. For internal use only. </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} </s> remove c.Upstreams,
</s> add upstreams, | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> //
<mask> // TODO(e.burkov): Move into aghnet or even into dnsproxy.
<mask> func ValidateUpstreams(upstreams []string) (err error) {
<mask> // No need to validate comments
<mask> upstreams = filterOutComments(upstreams)
<mask>
<mask> // Consider this case valid because defaultDNS will be used
<mask> if len(upstreams) == 0 {
<mask> return nil
<mask> }
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> func checkDNS(input string, bootstrap []string, ef excFunc) (err error) {
<mask> if !isUpstream(input) {
<mask> return nil
<mask> }
<mask>
<mask> // Separate upstream from domains list.
<mask> var useDefault bool
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http.go |
keep add keep keep keep keep keep | <mask> "os"
<mask> "path/filepath"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> add func TestFilterOut(t *testing.T) {
strs := []string{
"1.2.3.4",
"",
"# 5.6.7.8",
}
want := []string{
"1.2.3.4",
}
got := FilterOut(strs, IsCommentOrEmpty)
assert.Equal(t, want, got)
}
</s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove // collectDNSIPAddrs returns the slice of IP addresses without port number which
// we are listening on. For internal use only.
</s> add // collectDNSIPAddrs returns IP addresses the server is listening on without
// port numbers as a map. For internal use only. </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> name: "blocking_mode_good",
<mask> wantSet: "",
<mask> }, {
<mask> name: "blocking_mode_bad",
<mask> wantSet: "blocking_mode: incorrect value\n",
<mask> }, {
<mask> name: "ratelimit",
<mask> wantSet: "",
<mask> }, {
<mask> name: "edns_cs_enabled",
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove wantSet: "upstream_mode: incorrect value\n",
</s> add wantSet: `upstream_mode: incorrect value`, </s> remove name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
</s> add name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`, </s> remove wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
</s> add wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`, </s> remove name: "bootstraps_bad",
wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n",
</s> add name: "bootstraps_bad",
wantSet: `a can not be used as bootstrap dns cause: ` +
`invalid bootstrap server address: ` +
`Resolver a is not eligible to be a bootstrap DNS server`, </s> remove ""
</s> add "!!!" </s> add func TestFilterOut(t *testing.T) {
strs := []string{
"1.2.3.4",
"",
"# 5.6.7.8",
}
want := []string{
"1.2.3.4",
}
got := FilterOut(strs, IsCommentOrEmpty)
assert.Equal(t, want, got)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }, {
<mask> name: "upstream_mode_fastest_addr",
<mask> wantSet: "",
<mask> }, {
<mask> name: "upstream_dns_bad",
<mask> wantSet: "wrong upstreams specification: missing port in address\n",
<mask> }, {
<mask> name: "bootstraps_bad",
<mask> wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n",
<mask> }, {
<mask> name: "cache_bad_ttl",
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove name: "bootstraps_bad",
wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n",
</s> add name: "bootstraps_bad",
wantSet: `a can not be used as bootstrap dns cause: ` +
`invalid bootstrap server address: ` +
`Resolver a is not eligible to be a bootstrap DNS server`, </s> remove wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
</s> add wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`, </s> remove wantSet: "upstream_mode: incorrect value\n",
</s> add wantSet: `upstream_mode: incorrect value`, </s> remove wantSet: "blocking_mode: incorrect value\n",
</s> add wantSet: "blocking_mode: incorrect value", </s> remove ""
</s> add "!!!" </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
keep replace replace keep keep replace keep keep | <mask> }, {
<mask> name: "bootstraps_bad",
<mask> wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n",
<mask> }, {
<mask> name: "cache_bad_ttl",
<mask> wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
<mask> }, {
<mask> name: "upstream_mode_bad",
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
</s> add name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`, </s> remove wantSet: "upstream_mode: incorrect value\n",
</s> add wantSet: `upstream_mode: incorrect value`, </s> remove wantSet: "blocking_mode: incorrect value\n",
</s> add wantSet: "blocking_mode: incorrect value", </s> remove // stringSetSubtract subtracts b from a interpreted as sets.
func stringSetSubtract(a, b []string) (c []string) {
// unit is an object to be used as value in set.
type unit = struct{}
</s> add // unit is used to show the presence of a value in a set.
type unit = struct{} </s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> name: "cache_bad_ttl",
<mask> wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
<mask> }, {
<mask> name: "upstream_mode_bad",
<mask> wantSet: "upstream_mode: incorrect value\n",
<mask> }, {
<mask> name: "local_ptr_upstreams_good",
<mask> wantSet: "",
<mask> }, {
<mask> name: "local_ptr_upstreams_null",
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
</s> add wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`, </s> remove wantSet: "blocking_mode: incorrect value\n",
</s> add wantSet: "blocking_mode: incorrect value", </s> remove name: "bootstraps_bad",
wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n",
</s> add name: "bootstraps_bad",
wantSet: `a can not be used as bootstrap dns cause: ` +
`invalid bootstrap server address: ` +
`Resolver a is not eligible to be a bootstrap DNS server`, </s> remove name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
</s> add name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`, </s> remove ""
</s> add "!!!" </s> remove c.Upstreams,
</s> add upstreams, | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody)
<mask> require.Nil(t, err)
<mask>
<mask> s.handleSetConfig(w, r)
<mask> assert.Equal(t, tc.wantSet, w.Body.String())
<mask> w.Body.Reset()
<mask>
<mask> s.handleGetConfig(w, nil)
<mask> assert.JSONEq(t, string(caseData.Want), w.Body.String())
<mask> w.Body.Reset()
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add func TestFilterOut(t *testing.T) {
strs := []string{
"1.2.3.4",
"",
"# 5.6.7.8",
}
want := []string{
"1.2.3.4",
}
got := FilterOut(strs, IsCommentOrEmpty)
assert.Equal(t, want, got)
}
</s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove c.Upstreams,
</s> add upstreams, </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove localAddrs = stringSetSubtract(localAddrs, ourAddrs)
</s> add localAddrs = aghstrings.FilterOut(localAddrs, func(s string) (ok bool) {
_, ok = ourAddrsSet[s]
return ok
}) </s> remove // collectDNSIPAddrs returns the slice of IP addresses without port number which
// we are listening on. For internal use only.
</s> add // collectDNSIPAddrs returns IP addresses the server is listening on without
// port numbers as a map. For internal use only. | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> },
<mask> "upstream_dns_bad": {
<mask> "req": {
<mask> "upstream_dns": [
<mask> ""
<mask> ]
<mask> },
<mask> "want": {
<mask> "upstream_dns": [
<mask> "8.8.8.8:53",
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove wantSet: "blocking_mode: incorrect value\n",
</s> add wantSet: "blocking_mode: incorrect value", </s> remove wantSet: "upstream_mode: incorrect value\n",
</s> add wantSet: `upstream_mode: incorrect value`, </s> remove name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
</s> add name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`, </s> remove wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
</s> add wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`, </s> remove name: "bootstraps_bad",
wantSet: "a can not be used as bootstrap dns cause: invalid bootstrap server address: Resolver a is not eligible to be a bootstrap DNS server\n",
</s> add name: "bootstraps_bad",
wantSet: `a can not be used as bootstrap dns cause: ` +
`invalid bootstrap server address: ` +
`Resolver a is not eligible to be a bootstrap DNS server`, </s> remove c.Upstreams,
</s> add upstreams, | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json |
keep keep keep keep replace | <mask> "resolve_clients": false,
<mask> "local_ptr_upstreams": []
<mask> }
<mask> }
<mask> } </s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add } </s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> add func TestFilterOut(t *testing.T) {
strs := []string{
"1.2.3.4",
"",
"# 5.6.7.8",
}
want := []string{
"1.2.3.4",
}
got := FilterOut(strs, IsCommentOrEmpty)
assert.Equal(t, want, got)
}
</s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json |
keep keep keep add | <mask> "local_ptr_upstreams": []
<mask> }
<mask> }
<mask> }
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove } </s> add </s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add </s> add func TestFilterOut(t *testing.T) {
strs := []string{
"1.2.3.4",
"",
"# 5.6.7.8",
}
want := []string{
"1.2.3.4",
}
got := FilterOut(strs, IsCommentOrEmpty)
assert.Equal(t, want, got)
}
</s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> }
<mask> }
<mask> return false
<mask> }
<mask>
<mask> // Is not comment
<mask> func isUpstream(line string) bool {
<mask> return !strings.HasPrefix(line, "#")
<mask> }
<mask>
<mask> func filterOutComments(lines []string) []string {
<mask> var filtered []string
<mask> for _, l := range lines {
<mask> if isUpstream(l) {
<mask> filtered = append(filtered, l)
<mask> }
<mask> }
<mask> return filtered
<mask> }
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> remove for _, k := range b {
delete(cSet, k)
}
c = make([]string, len(cSet))
i := 0
for k := range cSet {
c[i] = k
i++
}
return c
</s> add return set </s> remove cSet := make(map[string]unit)
for _, k := range a {
cSet[k] = unit{}
</s> add // sliceToSet converts a slice of strings into a string set.
func sliceToSet(strs []string) (set map[string]unit) {
set = make(map[string]unit, len(strs))
for _, s := range strs {
set[s] = unit{} </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/util.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if !ok {
<mask> return nil
<mask> }
<mask>
<mask> if len(c.Upstreams) == 0 {
<mask> return nil
<mask> }
<mask>
<mask> if c.upstreamConfig == nil {
<mask> conf, err := proxy.ParseUpstreamsConfig(
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove c.Upstreams,
</s> add upstreams, </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> add // FilterOut returns a copy of strs with all strings for which f returned true
// removed.
func FilterOut(strs []string, f func(s string) (ok bool)) (filtered []string) {
for _, s := range strs {
if !f(s) {
filtered = append(filtered, s)
}
}
return filtered
}
</s> remove
// Is not comment
func isUpstream(line string) bool {
return !strings.HasPrefix(line, "#")
}
func filterOutComments(lines []string) []string {
var filtered []string
for _, l := range lines {
if isUpstream(l) {
filtered = append(filtered, l)
}
}
return filtered
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if c.upstreamConfig == nil {
<mask> conf, err := proxy.ParseUpstreamsConfig(
<mask> c.Upstreams,
<mask> upstream.Options{
<mask> Bootstrap: config.DNS.BootstrapDNS,
<mask> Timeout: dnsforward.DefaultTimeout,
<mask> },
<mask> )
</s> Pull request: all: fix client custom upstream comments
Updates #2947.
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <[email protected]>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <[email protected]>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments </s> remove if len(c.Upstreams) == 0 {
</s> add upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) </s> remove localAddrs = stringSetSubtract(localAddrs, ourAddrs)
</s> add localAddrs = aghstrings.FilterOut(localAddrs, func(s string) (ok bool) {
_, ok = ourAddrsSet[s]
return ok
}) </s> add // IsCommentOrEmpty returns true of the string starts with a "#" character or is
// an empty string.
func IsCommentOrEmpty(s string) (ok bool) {
return len(s) == 0 || s[0] == '#'
}
</s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/home/clients.go |
keep keep keep keep replace | <mask> "rewritten": "Umgeschrieben",
<mask> "safe_search": "Sichere Suche",
<mask> "blocklist": "Sperrliste",
<mask> "milliseconds_abbreviation": "ms"
<mask> } </s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add } </s> remove } </s> add </s> add } </s> remove } </s> add </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/de.json |
keep keep keep add | <mask> "safe_search": "Sichere Suche",
<mask> "blocklist": "Sperrliste",
<mask> "milliseconds_abbreviation": "ms"
<mask> }
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove } </s> add </s> add } </s> remove } </s> add </s> remove } </s> add </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/de.json |
keep add keep keep keep keep | <mask> "edit_blocklist": "Edit blocklist",
<mask> "edit_allowlist": "Edit allowlist",
<mask> "enter_valid_blocklist": "Enter a valid URL to the blocklist.",
<mask> "enter_valid_allowlist": "Enter a valid URL to the allowlist.",
<mask> "form_error_url_format": "Invalid URL format",
<mask> "form_error_url_or_path_format": "Invalid URL or absolute path of the list",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", </s> add "filter_removed_successfully": "The list has been successfully removed", </s> remove "value_not_larger_than": "Value can't be larger than {{maximum}}"
</s> add "value_not_larger_than": "Value can't be larger than {{maximum}}",
"filter_category_general": "General",
"filter_category_security": "Security",
"filter_category_regional": "Regional",
"filter_category_other": "Other",
"filter_category_general_desc": "Lists that block tracking and advertising on most of the devices",
"filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains",
"filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
"filter_category_other_desc": "Other blocklists" </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> remove * @param initialValues {object}
* @param values {object}
</s> add * @param {object} initialValues
* @param {object} values </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/en.json |
keep keep add keep keep keep keep keep keep | <mask> "domain": "Domain",
<mask> "answer": "Answer",
<mask> "filter_added_successfully": "The list has been successfully added",
<mask> "filter_updated": "The list has been successfully updated",
<mask> "statistics_configuration": "Statistics configuration",
<mask> "statistics_retention": "Statistics retention",
<mask> "statistics_retention_desc": "If you decrease the interval value, some data will be lost",
<mask> "statistics_clear": " Clear statistics",
<mask> "statistics_clear_confirm": "Are you sure you want to clear statistics?",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", </s> add "choose_blocklist": "Choose blocklists",
"choose_allowlist": "Choose allowlists", </s> remove "value_not_larger_than": "Value can't be larger than {{maximum}}"
</s> add "value_not_larger_than": "Value can't be larger than {{maximum}}",
"filter_category_general": "General",
"filter_category_security": "Security",
"filter_category_regional": "Regional",
"filter_category_other": "Other",
"filter_category_general_desc": "Lists that block tracking and advertising on most of the devices",
"filter_category_security_desc": "Lists that specialize on blocking malware, phishing or scam domains",
"filter_category_regional_desc": "Lists that focus on regional ads and tracking servers",
"filter_category_other_desc": "Other blocklists" </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> remove {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"}, </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/en.json |
keep keep keep add keep keep keep keep | <mask> "check_desc": "Check if the host name is filtered",
<mask> "check": "Check",
<mask> "form_enter_host": "Enter a host name",
<mask> "filtered_custom_rules": "Filtered by Custom filtering rules",
<mask> "host_whitelisted": "The host is whitelisted",
<mask> "check_ip": "IP addresses: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reason: {{reason}}",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "filtered_custom_rules": "Gefilterd door aangepaste filterregels", </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", </s> add "choose_blocklist": "Choose blocklists",
"choose_allowlist": "Choose allowlists", </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> add "filter_removed_successfully": "The list has been successfully removed", </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/en.json |
keep keep keep keep replace keep | <mask> "enter_cache_ttl_max_override": "Enter maximum TTL",
<mask> "cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server. This value can't larger than 3600 (1 hour)",
<mask> "cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server",
<mask> "min_exceeds_max_value": "Minimum value exceeds maximum value",
<mask> "value_not_larger_than": "Value can't be larger than {{maximum}}"
<mask> }
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add /**
* @param arr {array}
* @param key {string}
* @param value {string}
* @returns {object}
*/
export const getMap = (arr, key, value) => arr.reduce((acc, curr) => {
acc[curr[key]] = curr[value];
return acc;
}, {});
</s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import Table from './Table';
</s> add </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/en.json |
keep add keep keep keep keep keep | <mask> "blocking_mode": "Blocking modus",
<mask> "default": "Standaard",
<mask> "custom_ip": "Aangepast IP",
<mask> "blocking_ipv4": "Blokkeren IP4",
<mask> "blocking_ipv6": "Blokkeren IP6",
<mask> "dns_over_https": "DNS-via-HTTPS",
<mask> "dns_over_tls": "DNS-via-TLS",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6", </s> add "form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
"edns_enable": "Zet EDNS client subnet aan",
"edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
"rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
"blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
"blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
"blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
"blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
"upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.", </s> remove {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"}, </s> remove import Table from './Table';
</s> add </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep keep add keep keep keep keep keep | <mask> "nxdomain": "NXDOMAIN",
<mask> "null_ip": "Nul IP",
<mask> "custom_ip": "Aangepast IP",
<mask> "dns_over_https": "DNS-via-HTTPS",
<mask> "dns_over_tls": "DNS-via-TLS",
<mask> "plain_dns": "Gewone DNS",
<mask> "form_enter_rate_limit": "Voer ratio limiet in",
<mask> "rate_limit": "Ratio limiet",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "nxdomain": "NXDOMAIN",
"null_ip": "Nul IP", </s> add "form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
"edns_enable": "Zet EDNS client subnet aan",
"edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
"rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
"blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
"blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
"blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
"blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
"upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.", </s> add "filtered_custom_rules": "Gefilterd door aangepaste filterregels", </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", </s> add "disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", </s> remove {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"}, | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep keep add keep keep keep keep | <mask> "dns_over_https": "DNS-via-HTTPS",
<mask> "dns_over_tls": "DNS-via-TLS",
<mask> "plain_dns": "Gewone DNS",
<mask> "tracker_source": "Bron volger",
<mask> "source_label": "Bron",
<mask> "found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
<mask> "category_label": "Categorie",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6", </s> add "nxdomain": "NXDOMAIN",
"null_ip": "Nul IP", </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", </s> add "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
"autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
"autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.", </s> add "disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", </s> add "filtered_custom_rules": "Gefilterd door aangepaste filterregels", | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep keep keep add keep keep keep keep | <mask> "try_again": "Probeer opnieuw",
<mask> "domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.",
<mask> "example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.",
<mask> "example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <0>example.org</0>.",
<mask> "fastest_addr": "Snelste IP adres",
<mask> "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
<mask> "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
<mask> "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
"autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
"autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.", </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", </s> add "form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
"edns_enable": "Zet EDNS client subnet aan",
"edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
"rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
"blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
"blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
"blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
"blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
"upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.", </s> add "filtered_custom_rules": "Gefilterd door aangepaste filterregels", </s> remove {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"}, </s> add "blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6", | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep keep add keep keep keep keep keep keep | <mask> "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
<mask> "fastest_addr": "Snelste IP adres",
<mask> "fastest_addr_desc": "Alle DNS servers bevragen en het snelste IP adres terugkoppelen. Dit zal de DNS verzoeken vertragen omdat we moeten wachten op de antwoorden van alles DNS servers, maar verbetert wel de connectiviteit.",
<mask> "tags_title": "Labels",
<mask> "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
<mask> "form_select_tags": "Kies client tags",
<mask> "check_title": "Controleer de filtering",
<mask> "check_desc": "Controleer of de hostnaam wordt gefilterd",
<mask> "check": "Controleren",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", </s> add "form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
"edns_enable": "Zet EDNS client subnet aan",
"edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
"rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
"blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
"blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
"blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
"blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
"upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.", </s> add "filtered_custom_rules": "Gefilterd door aangepaste filterregels", </s> add "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", </s> remove {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
</s> add {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard DNS filter"},
{Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://github.com/AdAway/adaway.github.io/blob/master/hosts.txt", Name: "AdAway"}, | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep keep keep add keep keep keep keep keep | <mask> "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
<mask> "autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
<mask> "autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.",
<mask> "tags_title": "Labels",
<mask> "check": "Controleren",
<mask> "form_enter_host": "Voer een hostnaam in",
<mask> "filtered_custom_rules": "Gefilterd door aangepaste filterregels",
<mask> "host_whitelisted": "De host staat op de toestemmingslijst",
<mask> "check_ip": "IP-adressen: {{ip}}",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
"autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
"autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.", </s> add "disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", </s> add "filtered_custom_rules": "Gefilterd door aangepaste filterregels", </s> add "form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
"edns_enable": "Zet EDNS client subnet aan",
"edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
"rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
"blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
"blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
"blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
"blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
"upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.", </s> add "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", </s> add "blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6", | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep add keep keep keep keep keep | <mask> "check": "Controleren",
<mask> "form_enter_host": "Voer een hostnaam in",
<mask> "host_whitelisted": "De host staat op de toestemmingslijst",
<mask> "check_ip": "IP-adressen: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_reason": "Reden: {{reason}}",
<mask> "check_rule": "Regel: {{rule}}",
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", </s> add "tags_desc": "Je kunt tags selecteren die overeenkomen met de client. Tags kunnen worden opgenomen in de filterregels en je kunt ze dan nauwkeuriger toepassen. <0> Meer informatie </0>",
"form_select_tags": "Kies client tags",
"check_title": "Controleer de filtering",
"check_desc": "Controleer of de hostnaam wordt gefilterd", </s> add "autofix_warning_text": "Als je op \"Repareren\" klikt, configureert AdGuard Home uw systeem om de AdGuard Home DNS-server te gebruiken.",
"autofix_warning_list": "De volgende taken worden uitgevoerd: <0> Deactiveren van Systeem DNSStubListener</0> <0> DNS-serveradres instellen op 127.0.0.1 </0> <0> Symbolisch koppelingsdoel van /etc/resolv.conf vervangen door /run/systemd/resolve/resolv.conf </0> <0> Stop DNSStubListener (herlaad systemd-resolved service) </0>",
"autofix_warning_result": "Als gevolg hiervan worden alle DNS-verzoeken van je systeem standaard door AdGuard Home verwerkt.", </s> add "form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
"edns_enable": "Zet EDNS client subnet aan",
"edns_cs_desc": "Indien ingeschakeld stuurt AdGuard Home het subnet van de client naar de DNS-servers.",
"rate_limit_desc": "Het aantal verzoeken per seconde die een enkele client mag doen (0: onbeperkt)",
"blocking_ipv4_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_ipv6_desc": "IP-adres dat moet worden teruggegeven voor een geblokkeerd A-verzoek",
"blocking_mode_default": "Standaard: Reageer met NXDOMAIN wanneer geblokkeerd door een Adblock-type regel; reageer met het IP-adres dat is opgegeven in de regel wanneer het wordt geblokkeerd door een /etc/hosts type regel",
"blocking_mode_nxdomain": "NXDOMAIN: Reageer met NXDOMAIN code",
"blocking_mode_null_ip": "Nul IP: Reageer met een nul IP address (0.0.0.0 voor A; :: voor AAAA)",
"blocking_mode_custom_ip": "Aangepast IP: Reageer met een handmatige ingesteld IP adres",
"upstream_dns_client_desc": "Indien je dit veld leeglaat zal AdGuard Home de servers welke zijn ingesteld in de <0>DNS instellingen</0> gebruiken.", </s> add "disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", </s> add "blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6", | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/nl.json |
keep keep keep keep replace | <mask> "blocked_adult_websites": "Blokkerte voksennettsteder",
<mask> "blocked_threats": "Blokkerte trusler",
<mask> "allowed": "Unntak",
<mask> "blocklist": "Blokkeringsliste"
<mask> } </s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add } </s> add } </s> remove } </s> add </s> remove } </s> add </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/no.json |
keep keep keep keep replace | <mask> "rewritten": "Przepisane",
<mask> "safe_search": "Bezpieczne wyszukiwanie",
<mask> "blocklist": "Lista zablokowanych",
<mask> "milliseconds_abbreviation": "ms"
<mask> } </s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add } </s> remove } </s> add </s> add } </s> remove } </s> add </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/pl.json |
keep keep keep add | <mask> "safe_search": "Bezpieczne wyszukiwanie",
<mask> "blocklist": "Lista zablokowanych",
<mask> "milliseconds_abbreviation": "ms"
<mask> }
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove } </s> add </s> add } </s> remove } </s> add </s> remove } </s> add </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/__locales/pl.json |
keep keep keep keep replace keep keep keep keep replace | <mask> export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
<mask> export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
<mask> export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
<mask>
<mask> export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
<mask> dispatch(addFilterRequest());
<mask> try {
<mask> await apiClient.addFilter({ url, name, whitelist });
<mask> dispatch(addFilterSuccess(url));
<mask> dispatch(toggleFilteringModal());
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> add export const MODAL_OPEN_TIMEOUT = 150; </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> add /**
* @param arr {array}
* @param key {string}
* @param value {string}
* @returns {object}
*/
export const getMap = (arr, key, value) => arr.reduce((acc, curr) => {
acc[curr[key]] = curr[value];
return acc;
}, {});
| https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/actions/filtering.js |
keep keep keep keep replace keep keep keep keep keep | <mask> export const removeFilterRequest = createAction('REMOVE_FILTER_REQUEST');
<mask> export const removeFilterFailure = createAction('REMOVE_FILTER_FAILURE');
<mask> export const removeFilterSuccess = createAction('REMOVE_FILTER_SUCCESS');
<mask>
<mask> export const removeFilter = (url, whitelist = false) => async (dispatch) => {
<mask> dispatch(removeFilterRequest());
<mask> try {
<mask> await apiClient.removeFilter({ url, whitelist });
<mask> dispatch(removeFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> add export const MODAL_OPEN_TIMEOUT = 150; </s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
}
dispatch(addSuccessToast('filter_removed_successfully')); </s> add /**
* @param arr {array}
* @param key {string}
* @param value {string}
* @returns {object}
*/
export const getMap = (arr, key, value) => arr.reduce((acc, curr) => {
acc[curr[key]] = curr[value];
return acc;
}, {});
</s> remove ADD: 'add',
EDIT: 'edit',
</s> add SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST', | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/actions/filtering.js |
keep keep add keep keep keep keep keep | <mask> try {
<mask> await apiClient.removeFilter({ url, whitelist });
<mask> dispatch(removeFilterSuccess(url));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(removeFilterFailure());
<mask> }
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/actions/filtering.js |
keep keep keep keep replace keep keep keep keep replace keep keep keep | <mask> export const editFilterRequest = createAction('EDIT_FILTER_REQUEST');
<mask> export const editFilterFailure = createAction('EDIT_FILTER_FAILURE');
<mask> export const editFilterSuccess = createAction('EDIT_FILTER_SUCCESS');
<mask>
<mask> export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
<mask> dispatch(editFilterRequest());
<mask> try {
<mask> await apiClient.setFilterUrl({ url, data, whitelist });
<mask> dispatch(editFilterSuccess(url));
<mask> dispatch(toggleFilteringModal());
<mask> dispatch(addSuccessToast('filter_updated'));
<mask> dispatch(getFilteringStatus());
<mask> } catch (error) {
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} </s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
}
dispatch(addSuccessToast('filter_removed_successfully')); </s> add export const MODAL_OPEN_TIMEOUT = 150; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/actions/filtering.js |
keep keep add keep keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> .font-monospace {
<mask> font-family: var(--font-family-monospace);
<mask> }
<mask>
<mask> .mw-75 {
<mask> max-width: 75% !important;
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> add .nav-icon--gray {
color: #9aa0ac;
}
</s> remove handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
</s> add handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; </s> add } </s> add } | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/App/index.css |
keep keep keep keep replace keep keep keep keep keep | <mask> const { name, url } = values;
<mask> const { filtering } = this.props;
<mask> const whitelist = true;
<mask>
<mask> if (filtering.modalType === MODAL_TYPE.EDIT) {
<mask> this.props.editFilter(filtering.modalFilterUrl, values, whitelist);
<mask> } else {
<mask> this.props.addFilter(url, name, whitelist);
<mask> }
<mask> };
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
</s> add handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsAllowlist.js |
keep keep keep add keep keep keep keep keep keep | <mask> handleRefresh = () => {
<mask> this.props.refreshFilters({ whitelist: true });
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> toggleFilteringModal,
<mask> addFilter,
<mask> toggleFilterStatus,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
</s> remove this.props.toggleModal();
</s> add this.props.toggleFilteringModal(); </s> add toggleFilteringModal,
filters,
t,
filtersCatalog, </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> add modalType,
toggleFilteringModal,
selectedSources,
filtersCatalog, </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsAllowlist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> toggleFilter={this.toggleFilter}
<mask> whitelist={whitelist}
<mask> />
<mask> <Actions
<mask> handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
<mask> handleRefresh={this.handleRefresh}
<mask> processingRefreshFilters={processingRefreshFilters}
<mask> whitelist={whitelist}
<mask> />
<mask> </Card>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openSelectTypeModal} </s> add toggleFilteringModal={toggleFilteringModal} </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} </s> remove }) => <Fragment>
</s> add }) => <> </s> remove onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
</s> add onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsAllowlist.js |
keep keep keep add keep keep keep keep keep keep | <mask> </div>
<mask> </div>
<mask> </div>
<mask> <Modal
<mask> isOpen={isModalOpen}
<mask> toggleFilteringModal={toggleFilteringModal}
<mask> addFilter={addFilter}
<mask> isFilterAdded={isFilterAdded}
<mask> processingAddFilter={processingAddFilter}
<mask> processingConfigFilter={processingConfigFilter}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> add filtersCatalog={filtersCatalog}
filters={filters} </s> add toggleFilteringModal={toggleFilteringModal} </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsAllowlist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> </div>
<mask> </div>
<mask> <Modal
<mask> isOpen={isModalOpen}
<mask> toggleModal={toggleFilteringModal}
<mask> addFilter={addFilter}
<mask> isFilterAdded={isFilterAdded}
<mask> processingAddFilter={processingAddFilter}
<mask> processingConfigFilter={processingConfigFilter}
<mask> handleSubmit={this.handleSubmit}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> add filters={whitelistFilters} </s> add filtersCatalog={filtersCatalog}
filters={filters} </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} </s> add toggleFilteringModal={toggleFilteringModal} </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsAllowlist.js |
replace keep keep keep keep keep | <mask> import React, { Component, Fragment } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { withTranslation } from 'react-i18next';
<mask>
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import Table from './Table';
</s> add </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; </s> add import Table from './Table'; </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Modal from './Modal';
<mask> import Actions from './Actions';
<mask> import Table from './Table';
<mask>
<mask> import { MODAL_TYPE } from '../../helpers/constants';
<mask> import { getCurrentFilter } from '../../helpers/helpers';
<mask>
<mask> class DnsBlocklist extends Component {
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); </s> add import Table from './Table'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep add keep keep keep keep keep | <mask> import Modal from './Modal';
<mask> import Actions from './Actions';
<mask>
<mask> import { MODAL_TYPE } from '../../helpers/constants';
<mask>
<mask> import {
<mask> getCurrentFilter,
<mask> getObjDiff,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import Table from './Table';
</s> add </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import Actions from './Actions';
<mask> import Table from './Table';
<mask>
<mask> import { MODAL_TYPE } from '../../helpers/constants';
<mask> import { getCurrentFilter } from '../../helpers/helpers';
<mask>
<mask> class DnsBlocklist extends Component {
<mask> componentDidMount() {
<mask> this.props.getFilteringStatus();
<mask> }
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import Table from './Table';
</s> add </s> add import Table from './Table'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep replace replace replace keep replace replace replace replace | <mask> }
<mask>
<mask> handleSubmit = (values) => {
<mask> const { name, url } = values;
<mask> const { filtering } = this.props;
<mask>
<mask> if (filtering.modalType === MODAL_TYPE.EDIT) {
<mask> this.props.editFilter(filtering.modalFilterUrl, values);
<mask> } else {
<mask> this.props.addFilter(url, name);
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> remove import { FORM_NAME } from '../../helpers/constants';
</s> add import { renderInputField, renderSelectField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const getIconsData = (homepage, source) => ([
{
iconName: 'dashboard',
href: homepage,
className: 'ml-1',
},
{
iconName: 'info',
href: source,
},
]);
const renderIcons = (iconsData) => iconsData.map(({
iconName,
href,
className = '',
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
.sort()
.forEach((key) => {
const filter = filters[key];
filter.id = key;
if (filter.categoryId === categoryId) {
categoryFilters.push(filter);
}
});
return <div key={category.name} className="modal-body__item">
<h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
<p className="mb-3">{t(category.description)}</p>
{categoryFilters.map((filter) => {
const { homepage, source, name } = filter;
const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderSelectField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
}); </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep add keep keep keep keep keep | <mask> handleRefresh = () => {
<mask> this.props.refreshFilters({ whitelist: false });
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> toggleFilteringModal,
<mask> addFilter,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
</s> remove this.props.toggleModal();
</s> add this.props.toggleFilteringModal(); </s> add toggleFilteringModal,
filters,
t,
filtersCatalog, </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> add modalType,
toggleFilteringModal,
selectedSources,
filtersCatalog, </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> || processingRemoveFilter
<mask> || processingRefreshFilters;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle
<mask> title={t('dns_blocklists')}
<mask> subtitle={t('dns_blocklists_desc')}
<mask> />
<mask> <div className="content">
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> add checked, </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> handleDelete={this.handleDelete}
<mask> toggleFilter={this.toggleFilter}
<mask> />
<mask> <Actions
<mask> handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
<mask> handleRefresh={this.handleRefresh}
<mask> processingRefreshFilters={processingRefreshFilters}
<mask> />
<mask> </Card>
<mask> </div>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openAddFiltersModal} </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> add toggleFilteringModal={toggleFilteringModal} </s> remove }) => <Fragment>
</s> add }) => <> </s> remove onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
</s> add onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep add keep keep keep keep keep keep | <mask> </div>
<mask> <Modal
<mask> isOpen={isModalOpen}
<mask> toggleFilteringModal={toggleFilteringModal}
<mask> addFilter={addFilter}
<mask> isFilterAdded={isFilterAdded}
<mask> processingAddFilter={processingAddFilter}
<mask> processingConfigFilter={processingConfigFilter}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add filters={whitelistFilters} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> add toggleFilteringModal={toggleFilteringModal} </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> </div>
<mask> </div>
<mask> <Modal
<mask> isOpen={isModalOpen}
<mask> toggleModal={toggleFilteringModal}
<mask> addFilter={addFilter}
<mask> isFilterAdded={isFilterAdded}
<mask> processingAddFilter={processingAddFilter}
<mask> processingConfigFilter={processingConfigFilter}
<mask> handleSubmit={this.handleSubmit}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep keep keep keep replace keep keep keep keep keep | <mask> handleSubmit={this.handleSubmit}
<mask> modalType={modalType}
<mask> currentFilterData={currentFilterData}
<mask> />
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
<mask> DnsBlocklist.propTypes = {
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add toggleFilteringModal={toggleFilteringModal} </s> remove const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
);
</s> add const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist)); </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> add <symbol id="info" viewBox="0 0 24 24" fill="currentColor"
strokeLinecap="round" strokeLinejoin="round" strokeWidth="2">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
<path
d="M64 1C29.3 1 1 29.3 1 64s28.3 63 63 63 63-28.3 63-63S98.7 1 64 1zm0 118C33.7 119 9 94.3 9 64S33.7 9 64 9s55 24.7 55 55-24.7 55-55 55z" />
<path d="M60 54.5h8v40h-8zM60 35.5h8v8h-8z" />
</svg>
</symbol> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/DnsBlocklist.js |
keep replace keep replace keep keep | <mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import { renderInputField } from '../../helpers/form';
<mask> import { validatePath, validateRequiredValue } from '../../helpers/validators';
<mask> import { FORM_NAME } from '../../helpers/constants';
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import Table from './Table';
</s> add </s> add import Table from './Table'; </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import { renderInputField } from '../../helpers/form';
<mask> import { validatePath, validateRequiredValue } from '../../helpers/validators';
<mask> import { FORM_NAME } from '../../helpers/constants';
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> t,
<mask> closeModal,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import Table from './Table';
</s> add </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Form.js |
keep keep add keep keep keep keep | <mask> processingAddFilter,
<mask> processingConfigFilter,
<mask> whitelist,
<mask> } = props;
<mask>
<mask> const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
<mask> toggleFilteringModal();
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> add toggleFilteringModal,
filters,
t,
filtersCatalog, </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Form.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> processingConfigFilter,
<mask> whitelist,
<mask> } = props;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="modal-body">
<mask> <div className="form__group">
<mask> <Field
<mask> id="name"
<mask> name="name"
<mask> type="text"
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add modalType,
toggleFilteringModal,
selectedSources,
filtersCatalog, </s> remove <Fragment>
</s> add <> </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
);
</s> add const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist)); </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Form.js |
keep keep keep replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> />
<mask> </div>
<mask> <div className="form__description">
<mask> {whitelist ? <Trans>enter_valid_allowlist</Trans>
<mask> : <Trans>enter_valid_blocklist</Trans>}
<mask> </div>
<mask> </div>
<mask> <div className="modal-footer">
<mask> <button
<mask> type="button"
<mask> className="btn btn-secondary"
<mask> onClick={closeModal}
<mask> >
<mask> <Trans>cancel_btn</Trans>
<mask> </button>
<mask> <button
<mask> type="submit"
<mask> className="btn btn-success"
<mask> disabled={processingAddFilter || processingConfigFilter}
<mask> >
<mask> <Trans>save_btn</Trans>
<mask> </button>
<mask> </div>
<mask> </form>
<mask> );
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
</s> add onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)} </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> add toggleFilteringModal={toggleFilteringModal} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Form.js |
keep add keep keep keep keep keep | <mask> processingConfigFilter: PropTypes.bool.isRequired,
<mask> whitelist: PropTypes.bool,
<mask> };
<mask>
<mask> export default flow([
<mask> withTranslation(),
<mask> reduxForm({ form: FORM_NAME.FILTER }),
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add filters: PropTypes.array.isRequired,
filtersCatalog: PropTypes.object, </s> remove toggleModal: PropTypes.func.isRequired,
</s> add toggleFilteringModal: PropTypes.func.isRequired, </s> add checked: PropTypes.bool, </s> add openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
</s> add openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
</s> remove ADD: 'add',
EDIT: 'edit',
</s> add SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST', | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Form.js |
keep keep keep replace keep keep keep keep keep | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import ReactModal from 'react-modal';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask>
<mask> import { MODAL_TYPE } from '../../helpers/constants';
<mask> import Form from './Form';
<mask> import '../ui/Modal.css';
<mask>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; </s> remove import Table from './Table';
</s> add </s> add import { getMap } from '../../helpers/helpers'; </s> add import Table from './Table'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep add keep keep keep keep keep | <mask> import Form from './Form';
<mask> import '../ui/Modal.css';
<mask>
<mask> ReactModal.setAppElement('#root');
<mask>
<mask> const MODAL_TYPE_TO_TITLE_TYPE_MAP = {
<mask> [MODAL_TYPE.EDIT_FILTERS]: 'edit',
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import Table from './Table';
</s> add </s> add import Table from './Table'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace keep keep keep keep keep | <mask> ReactModal.setAppElement('#root');
<mask>
<mask> class Modal extends Component {
<mask> closeModal = () => {
<mask> this.props.toggleModal();
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> isOpen,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
</s> add openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
</s> remove import Table from './Table';
</s> add </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> add import { getMap } from '../../helpers/helpers'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep add keep keep keep keep keep | <mask> currentFilterData,
<mask> whitelist,
<mask> } = this.props;
<mask>
<mask> let initialValues;
<mask> let selectedSources;
<mask> switch (modalType) {
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> add modalType,
toggleFilteringModal,
selectedSources,
filtersCatalog, </s> remove handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
</s> add handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> currentFilterData,
<mask> whitelist,
<mask> } = this.props;
<mask>
<mask> const newListTitle = whitelist ? (
<mask> <Trans>new_allowlist</Trans>
<mask> ) : (
<mask> <Trans>new_blocklist</Trans>
<mask> );
<mask>
<mask> const editListTitle = whitelist ? (
<mask> <Trans>edit_allowlist</Trans>
<mask> ) : (
<mask> <Trans>edit_blocklist</Trans>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
);
</s> add const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist)); </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} </s> add toggleFilteringModal,
filters,
t,
filtersCatalog, </s> remove <Fragment>
</s> add <> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> ) : (
<mask> <Trans>new_blocklist</Trans>
<mask> );
<mask>
<mask> const editListTitle = whitelist ? (
<mask> <Trans>edit_allowlist</Trans>
<mask> ) : (
<mask> <Trans>edit_blocklist</Trans>
<mask> );
<mask>
<mask> return (
<mask> <ReactModal
<mask> className="Modal__Bootstrap modal-dialog modal-dialog-centered"
<mask> closeTimeoutMS={0}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove <Fragment>
</s> add <> </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> onRequestClose={this.closeModal}
<mask> >
<mask> <div className="modal-content">
<mask> <div className="modal-header">
<mask> <h4 className="modal-title">
<mask> {modalType === MODAL_TYPE.EDIT ? (
<mask> editListTitle
<mask> ) : (
<mask> newListTitle
<mask> )}
<mask> </h4>
<mask> <button type="button" className="close" onClick={this.closeModal}>
<mask> <span className="sr-only">Close</span>
<mask> </button>
<mask> </div>
<mask> <Form
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); </s> remove const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
);
</s> add const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist)); </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <span className="sr-only">Close</span>
<mask> </button>
<mask> </div>
<mask> <Form
<mask> initialValues={{ ...currentFilterData }}
<mask> onSubmit={handleSubmit}
<mask> processingAddFilter={processingAddFilter}
<mask> processingConfigFilter={processingConfigFilter}
<mask> closeModal={this.closeModal}
<mask> whitelist={whitelist}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add toggleFilteringModal={toggleFilteringModal} </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> add filters={whitelistFilters} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> add filtersCatalog={filtersCatalog}
filters={filters} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep add keep keep keep keep | <mask> processingConfigFilter={processingConfigFilter}
<mask> closeModal={this.closeModal}
<mask> whitelist={whitelist}
<mask> />
<mask> </div>
<mask> </ReactModal>
<mask> );
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openAddFiltersModal} </s> add filters={whitelistFilters} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> add filtersCatalog={filtersCatalog}
filters={filters} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> Modal.propTypes = {
<mask> toggleModal: PropTypes.func.isRequired,
<mask> isOpen: PropTypes.bool.isRequired,
<mask> addFilter: PropTypes.func.isRequired,
<mask> isFilterAdded: PropTypes.bool.isRequired,
<mask> processingAddFilter: PropTypes.bool.isRequired,
<mask> processingConfigFilter: PropTypes.bool.isRequired,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add modalType: PropTypes.string.isRequired,
toggleFilteringModal: PropTypes.func.isRequired,
filtersCatalog: PropTypes.object,
selectedSources: PropTypes.object, </s> add filters: PropTypes.array.isRequired,
filtersCatalog: PropTypes.object, </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> remove handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
</s> add handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep add keep keep keep | <mask> modalType: PropTypes.string.isRequired,
<mask> currentFilterData: PropTypes.object.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> whitelist: PropTypes.bool,
<mask> };
<mask>
<mask> export default withTranslation()(Modal);
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add modalType: PropTypes.string.isRequired,
toggleFilteringModal: PropTypes.func.isRequired,
filtersCatalog: PropTypes.object,
selectedSources: PropTypes.object, </s> add checked: PropTypes.bool, </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> add openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
</s> add openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
</s> remove toggleModal: PropTypes.func.isRequired,
</s> add toggleFilteringModal: PropTypes.func.isRequired, | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Modal.js |
keep keep keep keep replace keep keep keep keep keep | <mask> type="button"
<mask> className="btn btn-icon btn-outline-primary btn-sm mr-2"
<mask> title={t('edit_table_action')}
<mask> onClick={() => toggleFilteringModal({
<mask> type: MODAL_TYPE.EDIT,
<mask> url: value,
<mask> })
<mask> }
<mask> >
<mask> <svg className="icons">
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> remove onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
</s> add onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)} </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openSelectTypeModal} </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openAddFiltersModal} </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Filters/Table.js |
keep keep keep add keep keep keep keep keep keep | <mask> .nav-icon {
<mask> display: none;
<mask> }
<mask>
<mask> .header-brand-img {
<mask> height: 32px;
<mask> }
<mask>
<mask> .header__logout {
<mask> width: 35px;
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
</s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
</s> add handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; </s> add } </s> add } | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Header/Header.css |
keep keep keep keep replace keep keep keep keep keep | <mask> config.tags = [];
<mask> }
<mask> }
<mask>
<mask> if (this.props.modalType === MODAL_TYPE.EDIT) {
<mask> this.handleFormUpdate(config, this.props.modalClientName);
<mask> } else {
<mask> this.handleFormAdd(config);
<mask> }
<mask> };
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
</s> add handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> remove import { FORM_NAME } from '../../helpers/constants';
</s> add import { renderInputField, renderSelectField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const getIconsData = (homepage, source) => ([
{
iconName: 'dashboard',
href: homepage,
className: 'ml-1',
},
{
iconName: 'info',
href: source,
},
]);
const renderIcons = (iconsData) => iconsData.map(({
iconName,
href,
className = '',
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
.sort()
.forEach((key) => {
const filter = filters[key];
filter.id = key;
if (filter.categoryId === categoryId) {
categoryFilters.push(filter);
}
});
return <div key={category.name} className="modal-body__item">
<h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
<p className="mb-3">{t(category.description)}</p>
{categoryFilters.map((filter) => {
const { homepage, source, name } = filter;
const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderSelectField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
}); </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove * @param initialValues {object}
* @param values {object}
</s> add * @param {object} initialValues
* @param {object} values | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Settings/Clients/ClientsTable.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <button
<mask> type="button"
<mask> className="btn btn-icon btn-outline-primary btn-sm mr-2"
<mask> onClick={() => toggleClientModal({
<mask> type: MODAL_TYPE.EDIT,
<mask> name: clientName,
<mask> })
<mask> }
<mask> disabled={processingUpdating}
<mask> title={t('edit_table_action')}
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> remove onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
</s> add onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)} </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Settings/Clients/ClientsTable.js |
keep keep keep keep replace keep keep keep keep keep | <mask> />
<mask> <button
<mask> type="button"
<mask> className="btn btn-success btn-standard mt-3"
<mask> onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
<mask> disabled={processingAdding}
<mask> >
<mask> <Trans>client_add</Trans>
<mask> </button>
<mask>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> remove type: MODAL_TYPE.EDIT,
</s> add type: MODAL_TYPE.EDIT_FILTERS, </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Settings/Clients/ClientsTable.js |
keep keep keep keep replace keep keep keep keep keep | <mask> >
<mask> <div className="modal-content">
<mask> <div className="modal-header">
<mask> <h4 className="modal-title">
<mask> {modalType === MODAL_TYPE.EDIT ? (
<mask> <Trans>client_edit</Trans>
<mask> ) : (
<mask> <Trans>client_new</Trans>
<mask> )}
<mask> </h4>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
</s> add let initialValues;
let selectedSources;
switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
initialValues = currentFilterData;
break;
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const catalogSourcesToIdMap = getMap(Object.values(filtersCatalog.filters), 'source', 'id'); </s> remove const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
);
</s> add const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist)); </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove {whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</s> add {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} </s> remove </div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
<Trans>cancel_btn</Trans>
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
<Trans>save_btn</Trans>
</button>
</div>
</form>
);
</s> add </>}
</div>
<div className="modal-footer">
<button
type="button"
className="btn btn-secondary"
onClick={closeModal}
>
{t('cancel_btn')}
</button>
<button
type="submit"
className="btn btn-success"
disabled={processingAddFilter || processingConfigFilter}
>
{t('save_btn')}
</button>
</div>
</form>; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/Settings/Clients/Modal.js |
keep keep keep add keep keep keep keep | <mask> <path d="M10 6l6 6-6 6" stroke="#888" strokeWidth="1.5" fill="none"
<mask> fillRule="evenodd" strokeLinecap="round" />
<mask> </svg>
<mask> </symbol>
<mask> </svg>
<mask> );
<mask>
<mask> export default Icons;
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add filters: PropTypes.array.isRequired,
filtersCatalog: PropTypes.object, </s> add modalType: PropTypes.string.isRequired,
toggleFilteringModal: PropTypes.func.isRequired,
filtersCatalog: PropTypes.object,
selectedSources: PropTypes.object, </s> add toggleFilteringModal={toggleFilteringModal} </s> remove </Fragment>
</s> add </> </s> add export const MODAL_OPEN_TIMEOUT = 150; </s> remove import { FORM_NAME } from '../../helpers/constants';
</s> add import { renderInputField, renderSelectField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const getIconsData = (homepage, source) => ([
{
iconName: 'dashboard',
href: homepage,
className: 'ml-1',
},
{
iconName: 'info',
href: source,
},
]);
const renderIcons = (iconsData) => iconsData.map(({
iconName,
href,
className = '',
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
.sort()
.forEach((key) => {
const filter = filters[key];
filter.id = key;
if (filter.categoryId === categoryId) {
categoryFilters.push(filter);
}
});
return <div key={category.name} className="modal-body__item">
<h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
<p className="mb-3">{t(category.description)}</p>
{categoryFilters.map((filter) => {
const { homepage, source, name } = filter;
const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderSelectField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
}); | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/components/ui/Icons.js |
keep keep add keep keep keep keep | <mask> export const SUCCESS_TOAST_TIMEOUT = 5000;
<mask> export const FAILURE_TOAST_TIMEOUT = 30000;
<mask> export const HIDE_TOOLTIP_DELAY = 300;
<mask>
<mask> export const UNSAFE_PORTS = [
<mask> 1,
<mask> 7,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove ADD: 'add',
EDIT: 'edit',
</s> add SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST', </s> add /**
* @param arr {array}
* @param key {string}
* @param value {string}
* @returns {object}
*/
export const getMap = (arr, key, value) => arr.reduce((acc, curr) => {
acc[curr[key]] = curr[value];
return acc;
}, {});
</s> remove * @param initialValues {object}
* @param values {object}
</s> add * @param {object} initialValues
* @param {object} values | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/constants.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> ERROR: 'error',
<mask> };
<mask>
<mask> export const MODAL_TYPE = {
<mask> ADD: 'add',
<mask> EDIT: 'edit',
<mask> };
<mask>
<mask> export const CLIENT_ID = {
<mask> MAC: 'mac',
<mask> IP: 'ip',
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add export const MODAL_OPEN_TIMEOUT = 150; </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> add /**
* @param arr {array}
* @param key {string}
* @param value {string}
* @returns {object}
*/
export const getMap = (arr, key, value) => arr.reduce((acc, curr) => {
acc[curr[key]] = curr[value];
return acc;
}, {});
</s> remove * @param initialValues {object}
* @param values {object}
</s> add * @param {object} initialValues
* @param {object} values | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/constants.js |
keep add keep keep keep keep keep | <mask> onClick,
<mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => <>
<mask> <label className={`checkbox ${modifier}`} onClick={onClick}>
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove }) => <Fragment>
</s> add }) => <> </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> </s> remove <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</s> add <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span> </s> remove <Fragment>
</s> add <> </s> remove import { FORM_NAME } from '../../helpers/constants';
</s> add import { renderInputField, renderSelectField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const getIconsData = (homepage, source) => ([
{
iconName: 'dashboard',
href: homepage,
className: 'ml-1',
},
{
iconName: 'info',
href: source,
},
]);
const renderIcons = (iconsData) => iconsData.map(({
iconName,
href,
className = '',
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
.sort()
.forEach((key) => {
const filter = filters[key];
filter.id = key;
if (filter.categoryId === categoryId) {
categoryFilters.push(filter);
}
});
return <div key={category.name} className="modal-body__item">
<h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
<p className="mb-3">{t(category.description)}</p>
{categoryFilters.map((filter) => {
const { homepage, source, name } = filter;
const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderSelectField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
}); </s> remove </Fragment>;
</s> add </>; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/form.js |
keep keep replace keep keep replace | <mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => <Fragment>
<mask> <label className={`checkbox ${modifier}`} onClick={onClick}>
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add checked, </s> remove <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</s> add <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span> </s> remove <Fragment>
</s> add <> </s> remove import { FORM_NAME } from '../../helpers/constants';
</s> add import { renderInputField, renderSelectField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const getIconsData = (homepage, source) => ([
{
iconName: 'dashboard',
href: homepage,
className: 'ml-1',
},
{
iconName: 'info',
href: source,
},
]);
const renderIcons = (iconsData) => iconsData.map(({
iconName,
href,
className = '',
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
.sort()
.forEach((key) => {
const filter = filters[key];
filter.id = key;
if (filter.categoryId === categoryId) {
categoryFilters.push(filter);
}
});
return <div key={category.name} className="modal-body__item">
<h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
<p className="mb-3">{t(category.description)}</p>
{categoryFilters.map((filter) => {
const { homepage, source, name } = filter;
const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderSelectField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
}); </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openAddFiltersModal} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/form.js |
keep keep keep keep replace replace replace replace replace replace keep replace keep keep keep | <mask> <label className={`checkbox ${modifier}`} onClick={onClick}>
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text checkbox__label-text--long">
<mask> <span className="checkbox__label-title">{placeholder}</span>
<mask> {subtitle && <span
<mask> className="checkbox__label-subtitle"
<mask> dangerouslySetInnerHTML={{ __html: subtitle }}
<mask> />}
<mask> </span>
<mask> </span>
<mask> </label>
<mask> {!disabled
<mask> && touched
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> </s> remove }) => <Fragment>
</s> add }) => <> </s> add checked, </s> remove </Fragment>;
</s> add </>; </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> </label>
<mask> {!disabled
<mask> && touched
<mask> && error && <span className="form__message form__message--error">{error}</span>}
<mask> </Fragment>;
<mask>
<mask> renderSelectField.propTypes = {
<mask> input: PropTypes.object.isRequired,
<mask> placeholder: PropTypes.string,
<mask> subtitle: PropTypes.string,
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove </span>
</s> add </s> remove <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</s> add <span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle
&& <span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span> </s> add checked: PropTypes.bool, </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/form.js |
keep keep keep add keep keep keep keep keep keep | <mask> subtitle: PropTypes.string,
<mask> disabled: PropTypes.bool,
<mask> onClick: PropTypes.func,
<mask> modifier: PropTypes.string,
<mask> meta: PropTypes.shape({
<mask> touched: PropTypes.bool,
<mask> error: PropTypes.object,
<mask> }).isRequired,
<mask> };
<mask>
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove </Fragment>;
</s> add </>; </s> add modalType: PropTypes.string.isRequired,
toggleFilteringModal: PropTypes.func.isRequired,
filtersCatalog: PropTypes.object,
selectedSources: PropTypes.object, </s> add filters: PropTypes.array.isRequired,
filtersCatalog: PropTypes.object, </s> add checked, </s> remove }) => <Fragment>
</s> add }) => <> </s> remove <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
</s> add <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/form.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> };
<mask> };
<mask>
<mask> /**
<mask> * @param initialValues {object}
<mask> * @param values {object}
<mask> * @returns {object} Returns different values of objects
<mask> */
<mask> export const getObjDiff = (initialValues, values) => Object.entries(values)
<mask> .reduce((acc, [key, value]) => {
<mask> if (value !== initialValues[key]) {
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> add /**
* @param arr {array}
* @param key {string}
* @param value {string}
* @returns {object}
*/
export const getMap = (arr, key, value) => arr.reduce((acc, curr) => {
acc[curr[key]] = curr[value];
return acc;
}, {});
</s> remove ADD: 'add',
EDIT: 'edit',
</s> add SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST', </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> add openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
</s> add openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
</s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/helpers.js |
keep keep add keep keep keep keep keep | <mask> return num.toLocaleString(currentLanguage);
<mask> };
<mask>
<mask> export const normalizeMultiline = (multiline) => `${normalizeTextarea(multiline)
<mask> .map((line) => line.trim())
<mask> .join('\n')}\n`;
<mask>
<mask> /**
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove * @param initialValues {object}
* @param values {object}
</s> add * @param {object} initialValues
* @param {object} values </s> remove export const removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { </s> remove return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
</s> add const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
setTimeout(() => toggleFilteringModal({ type: modalType }), timeout);
};
const openFilteringListModal = () => openModal(MODAL_TYPE.CHOOSE_FILTERING_LIST);
const openAddFiltersModal = () => openModal(MODAL_TYPE.ADD_FILTERS);
return <form onSubmit={handleSubmit}>
<div className="modal-body modal-body--medium">
{modalType === MODAL_TYPE.SELECT_MODAL_TYPE
&& <div className="d-flex justify-content-around">
<button onClick={openFilteringListModal}
className="btn btn-success btn-standard mr-2 btn-large">
{t('choose_from_list')}
</button>
<button onClick={openAddFiltersModal} className="btn btn-primary btn-standard">
{t('add_custom_list')}
</button>
</div>}
{modalType === MODAL_TYPE.CHOOSE_FILTERING_LIST
&& renderFilters(filtersCatalog, selectedSources, t)}
{modalType !== MODAL_TYPE.CHOOSE_FILTERING_LIST
&& modalType !== MODAL_TYPE.SELECT_MODAL_TYPE
&& <> </s> remove ADD: 'add',
EDIT: 'edit',
</s> add SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST', | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | client/src/helpers/helpers.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> func defaultFilters() []filter {
<mask> return []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
<mask> }
<mask> }
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
</s> + client: Add choosing filter lists
Fix #1325
Squashed commit of the following:
commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:34:53 2020 +0300
Merge branch 'master' into feature/1325
commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 19:33:53 2020 +0300
Merge branch 'master' into feature/1325
commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:04:32 2020 +0300
Merge branch 'feature/1325' of ssh://bit.adguard.com:7999/dns/adguard-home into feature/1325
commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 18:03:56 2020 +0300
Update locales, add title for select modal
commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <[email protected]>
Date: Mon Jul 6 17:26:37 2020 +0300
Update readme
commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:44:19 2020 +0300
Change info icon width
commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 13:38:58 2020 +0300
Review changes
commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <[email protected]>
Date: Mon Jul 6 12:01:57 2020 +0300
Merge branch 'master' into feature/1325
commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 15:52:01 2020 +0300
Added blocklists
commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <[email protected]>
Date: Fri Jul 3 14:06:19 2020 +0300
Merge branch 'master' into feature/1325
commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <[email protected]>
Date: Mon Jun 22 14:09:31 2020 +0300
Merge branch 'master' into feature/1325
commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <[email protected]>
Date: Tue May 26 19:00:26 2020 +0300
Math filters by url
commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <[email protected]>
Date: Mon May 25 21:07:21 2020 +0300
Change data format
commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <[email protected]>
Date: Thu May 14 19:52:45 2020 +0300
+ client: Add choosing filter lists </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
</s> add switch (modalType) {
case MODAL_TYPE.EDIT_FILTERS:
this.props.editFilter(modalFilterUrl, values);
break;
case MODAL_TYPE.ADD_FILTERS: {
const { name, url } = values;
this.props.addFilter(url, name);
break;
}
case MODAL_TYPE.CHOOSE_FILTERING_LIST: {
const changedValues = getObjDiff(initialValues, values);
Object.keys(changedValues)
.forEach((fieldName) => {
// filterId is actually in the field name
const { source, name } = filtersCatalog.filters[fieldName];
this.props.addFilter(source, name);
});
break;
}
default:
break; </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { FORM_NAME } from '../../helpers/constants';
</s> add import { renderInputField, renderSelectField } from '../../helpers/form';
import { MODAL_OPEN_TIMEOUT, MODAL_TYPE, FORM_NAME } from '../../helpers/constants';
const getIconsData = (homepage, source) => ([
{
iconName: 'dashboard',
href: homepage,
className: 'ml-1',
},
{
iconName: 'info',
href: source,
},
]);
const renderIcons = (iconsData) => iconsData.map(({
iconName,
href,
className = '',
}) => <a key={iconName} href={href} target="_blank" rel="noopener noreferrer"
className={classNames('d-flex align-items-center', className)}
>
<svg className="nav-icon nav-icon--gray">
<use xlinkHref={`#${iconName}`} />
</svg>
</a>);
const renderFilters = ({ categories, filters }, selectedSources, t) => Object.keys(categories)
.map((categoryId) => {
const category = categories[categoryId];
const categoryFilters = [];
Object.keys(filters)
.sort()
.forEach((key) => {
const filter = filters[key];
filter.id = key;
if (filter.categoryId === categoryId) {
categoryFilters.push(filter);
}
});
return <div key={category.name} className="modal-body__item">
<h6 className="font-weight-bold mb-1">{t(category.name)}</h6>
<p className="mb-3">{t(category.description)}</p>
{categoryFilters.map((filter) => {
const { homepage, source, name } = filter;
const isSelected = Object.prototype.hasOwnProperty.call(selectedSources, source);
const iconsData = getIconsData(homepage, source);
return <div key={name} className="d-flex align-items-center pb-1">
<Field
name={`${filter.id}`}
type="checkbox"
component={renderSelectField}
placeholder={t(name)}
disabled={isSelected}
checked={isSelected}
/>
{renderIcons(iconsData)}
</div>;
})}
</div>;
}); </s> add "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", </s> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; </s> remove import { renderInputField } from '../../helpers/form';
</s> add import classNames from 'classnames'; | https://github.com/AdguardTeam/AdGuardHome/commit/49646cf706dac1c2998d91f4a6f109b5026dabdd | home/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "dhcp_static_leases": "DHCP static leases",
<mask> "dhcp_leases_not_found": "No DHCP leases found",
<mask> "dhcp_config_saved": "Saved DHCP server config",
<mask> "form_error_required": "Required field",
<mask> "form_error_ip_format": "Invalid IPv4 format",
<mask> "form_error_mac_format": "Invalid MAC format",
<mask> "form_error_positive": "Must be greater than 0",
<mask> "dhcp_form_gateway_input": "Gateway IP",
<mask> "dhcp_form_subnet_input": "Subnet mask",
<mask> "dhcp_form_range_title": "Range of IP addresses",
</s> - client: allow add ip-v6 to exceptions </s> remove "form_error_ip_format": "Format IPv4 tidak valid",
</s> add </s> remove "form_error_ip_format": "Ongeldig IPv4 formaat",
</s> add </s> remove "form_error_ip_format": "Formato IPv4 non valido",
</s> add </s> remove "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en Yandex.",
</s> add </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
</s> add </s> add return <Trans>form_error_ip4_format</Trans>;
}
return false;
};
export const ipv6 = (value) => {
if (value && !new RegExp(R_IPV6).test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return false;
};
export const ip = (value) => {
if (value && !new RegExp(R_IPV4).test(value) && !new RegExp(R_IPV6).test(value)) { | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/en.json |
keep keep add keep keep keep keep keep keep | <mask> "next_btn": "Next",
<mask> "loading_table_status": "Loading...",
<mask> "page_table_footer_text": "Page",
<mask> "rows_table_footer_text": "rows",
<mask> "updated_custom_filtering_toast": "Updated the custom filtering rules",
<mask> "rule_removed_from_custom_filtering_toast": "Rule removed from the custom filtering rules",
<mask> "rule_added_to_custom_filtering_toast": "Rule added to the custom filtering rules",
<mask> "query_log_response_status": "Status: {{value}}",
<mask> "query_log_filtered": "Filtered by {{filter}}",
</s> - client: allow add ip-v6 to exceptions </s> remove import { renderField, renderRadioField, renderSelectField, renderServiceField, ipv4, mac, required } from '../../../helpers/form';
</s> add import { renderField, renderRadioField, renderSelectField, renderServiceField, ip, mac, required } from '../../../helpers/form'; </s> add return <Trans>form_error_ip4_format</Trans>;
}
return false;
};
export const ipv6 = (value) => {
if (value && !new RegExp(R_IPV6).test(value)) {
return <Trans>form_error_ip6_format</Trans>;
}
return false;
};
export const ip = (value) => {
if (value && !new RegExp(R_IPV4).test(value) && !new RegExp(R_IPV6).test(value)) { </s> remove validate={[ipv4, required]}
</s> add validate={[ip, required]} </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
</s> add </s> remove "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en Yandex.",
</s> add </s> remove "form_error_ip_format": "Ongeldig IPv4 formaat",
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/en.json |
keep keep keep keep replace keep keep keep keep keep | <mask> "dhcp_static_leases": "DHCP static leases",
<mask> "dhcp_leases_not_found": "DHCP lease tidak ditemukan",
<mask> "dhcp_config_saved": "Pengaturan server DHCP tersimpan",
<mask> "form_error_required": "Kolom yang harus diisi",
<mask> "form_error_ip_format": "Format IPv4 tidak valid",
<mask> "form_error_mac_format": "Format MAC tidak valid",
<mask> "form_error_positive": "Harus lebih dari 0",
<mask> "dhcp_form_gateway_input": "IP gateway",
<mask> "dhcp_form_subnet_input": "Subnet mask",
<mask> "dhcp_form_range_title": "Rentang alamat IP",
</s> - client: allow add ip-v6 to exceptions </s> remove "form_error_ip_format": "Invalid IPv4 format",
</s> add "form_error_ip4_format": "Invalid IPv4 format",
"form_error_ip6_format": "Invalid IPv6 format",
"form_error_ip_format": "Invalid IP format", </s> remove "form_error_ip_format": "Formato IPv4 non valido",
</s> add </s> remove "form_error_ip_format": "Ongeldig IPv4 formaat",
</s> add </s> remove "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, dan Yandex.",
</s> add </s> remove "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan",
</s> add </s> remove "enforce_save_search_hint": "AdGuard Home kan veilig zoeken forceren voor de volgende zoekmachines: Google, Youtube, Bing, en Yandex.",
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/id.json |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.