code_before
stringlengths 16
1.81M
| edits
stringlengths 4
328k
| next_edit
stringlengths 0
76.5k
| code_after
stringlengths 3
49.9M
| label_window
sequencelengths 4
1.81k
| instruction
stringlengths 20
51.9k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|---|---|---|
"os"
"path/filepath"
"testing"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
| </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. | "strings" | "os"
"path/filepath"
"strings"
"testing"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
name: "blocking_mode_good",
wantSet: "",
}, {
name: "blocking_mode_bad",
wantSet: "blocking_mode: incorrect value\n",
}, {
name: "ratelimit",
wantSet: "",
}, {
name: "edns_cs_enabled",
| </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 "!!!" | wantSet: "blocking_mode: incorrect value", | name: "blocking_mode_good",
wantSet: "",
}, {
name: "blocking_mode_bad",
wantSet: "blocking_mode: incorrect value",
}, {
name: "ratelimit",
wantSet: "",
}, {
name: "edns_cs_enabled", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
}, {
name: "upstream_mode_fastest_addr",
wantSet: "",
}, {
name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
}, {
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",
}, {
name: "cache_bad_ttl",
| </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 "!!!" | name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`, | }, {
name: "upstream_mode_fastest_addr",
wantSet: "",
}, {
name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`,
name: "upstream_dns_bad",
wantSet: `wrong upstreams specification: address !!!: ` +
`missing port in address`,
}, {
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",
}, {
name: "cache_bad_ttl", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
}, {
name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
}, {
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",
}, {
name: "cache_bad_ttl",
wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
}, {
name: "upstream_mode_bad",
| </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: "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{} | 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`, | }, {
name: "upstream_dns_bad",
wantSet: "wrong upstreams specification: missing port in address\n",
}, {
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`,
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`,
}, {
name: "cache_bad_ttl",
wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
}, {
name: "upstream_mode_bad", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
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",
}, {
name: "cache_bad_ttl",
wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
}, {
name: "upstream_mode_bad",
wantSet: "upstream_mode: incorrect value\n",
}, {
name: "local_ptr_upstreams_good",
| </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 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{} | wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`, | 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",
}, {
name: "cache_bad_ttl",
wantSet: `cache_ttl_min must be less or equal than cache_ttl_max`,
}, {
name: "upstream_mode_bad",
wantSet: "upstream_mode: incorrect value\n",
}, {
name: "local_ptr_upstreams_good", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
name: "cache_bad_ttl",
wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
}, {
name: "upstream_mode_bad",
wantSet: "upstream_mode: incorrect value\n",
}, {
name: "local_ptr_upstreams_good",
wantSet: "",
}, {
name: "local_ptr_upstreams_null",
| </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 "!!!" | wantSet: `upstream_mode: incorrect value`, | name: "cache_bad_ttl",
wantSet: "cache_ttl_min must be less or equal than cache_ttl_max\n",
}, {
name: "upstream_mode_bad",
wantSet: `upstream_mode: incorrect value`,
}, {
name: "local_ptr_upstreams_good",
wantSet: "",
}, {
name: "local_ptr_upstreams_null", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody)
require.Nil(t, err)
s.handleSetConfig(w, r)
assert.Equal(t, tc.wantSet, w.Body.String())
w.Body.Reset()
s.handleGetConfig(w, nil)
assert.JSONEq(t, string(caseData.Want), w.Body.String())
w.Body.Reset()
| </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
}) | assert.Equal(t, tc.wantSet, strings.TrimSuffix(w.Body.String(), "\n")) | r, err = http.NewRequest(http.MethodPost, "http://example.com", rBody)
require.Nil(t, err)
s.handleSetConfig(w, r)
assert.Equal(t, tc.wantSet, strings.TrimSuffix(w.Body.String(), "\n"))
w.Body.Reset()
s.handleGetConfig(w, nil)
assert.JSONEq(t, string(caseData.Want), w.Body.String())
w.Body.Reset() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/http_test.go |
},
"upstream_dns_bad": {
"req": {
"upstream_dns": [
""
]
},
"want": {
"upstream_dns": [
"8.8.8.8:53",
| </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`, | "!!!" | },
"upstream_dns_bad": {
"req": {
"upstream_dns": [
"!!!"
]
},
"want": {
"upstream_dns": [
"8.8.8.8:53", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json |
"resolve_clients": false,
"local_ptr_upstreams": []
}
}
} | </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) | "resolve_clients": false,
"local_ptr_upstreams": []
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json |
|
"local_ptr_upstreams": []
}
}
}
| </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> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) | } | "local_ptr_upstreams": []
}
}
}
} | [
"keep",
"keep",
"keep",
"add"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/testdata/TestDNSForwardHTTTP_handleSetConfig.json |
}
}
return false
}
// 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> 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{} | }
}
return false
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/dnsforward/util.go |
|
if !ok {
return nil
}
if len(c.Upstreams) == 0 {
return nil
}
if c.upstreamConfig == nil {
conf, err := proxy.ParseUpstreamsConfig(
| </s> remove c.Upstreams,
</s> add upstreams, </s> remove if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { </s> remove upstreams = filterOutComments(upstreams)
</s> add upstreams = aghstrings.FilterOut(upstreams, aghstrings.IsCommentOrEmpty) | upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 { | if !ok {
return nil
}
upstreams := aghstrings.FilterOut(c.Upstreams, aghstrings.IsCommentOrEmpty)
if len(upstreams) == 0 {
return nil
}
if c.upstreamConfig == nil {
conf, err := proxy.ParseUpstreamsConfig( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/home/clients.go |
}
if c.upstreamConfig == nil {
conf, err := proxy.ParseUpstreamsConfig(
c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
)
| </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 if !isUpstream(input) {
</s> add if aghstrings.IsCommentOrEmpty(input) { | upstreams, | }
if c.upstreamConfig == nil {
conf, err := proxy.ParseUpstreamsConfig(
upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | 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 | https://github.com/AdguardTeam/AdGuardHome/commit/48d702f76ac2e651ce788abf006799efcd482152 | internal/home/clients.go |
"rewritten": "Umgeschrieben",
"safe_search": "Sichere Suche",
"blocklist": "Sperrliste",
"milliseconds_abbreviation": "ms"
} | </s> remove } </s> add </s> remove } </s> add | "rewritten": "Umgeschrieben",
"safe_search": "Sichere Suche",
"blocklist": "Sperrliste",
"milliseconds_abbreviation": "ms"
| [
"keep",
"keep",
"keep",
"keep",
"replace"
] | + 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/__locales/de.json |
|
"safe_search": "Sichere Suche",
"blocklist": "Sperrliste",
"milliseconds_abbreviation": "ms"
}
| </s> remove } </s> add </s> remove } </s> add </s> remove } </s> add | } | "safe_search": "Sichere Suche",
"blocklist": "Sperrliste",
"milliseconds_abbreviation": "ms"
}
} | [
"keep",
"keep",
"keep",
"add"
] | + 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/__locales/de.json |
"edit_blocklist": "Edit blocklist",
"edit_allowlist": "Edit allowlist",
"enter_valid_blocklist": "Enter a valid URL to the blocklist.",
"enter_valid_allowlist": "Enter a valid URL to the allowlist.",
"form_error_url_format": "Invalid URL format",
"form_error_url_or_path_format": "Invalid URL or absolute path of the list",
| </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 | "choose_blocklist": "Choose blocklists",
"choose_allowlist": "Choose allowlists", | "edit_blocklist": "Edit blocklist",
"edit_allowlist": "Edit allowlist",
"choose_blocklist": "Choose blocklists",
"choose_allowlist": "Choose allowlists",
"enter_valid_blocklist": "Enter a valid URL to the blocklist.",
"enter_valid_allowlist": "Enter a valid URL to the allowlist.",
"form_error_url_format": "Invalid URL format",
"form_error_url_or_path_format": "Invalid URL or absolute path of the list", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/en.json |
"domain": "Domain",
"answer": "Answer",
"filter_added_successfully": "The list has been successfully added",
"filter_updated": "The list has been successfully updated",
"statistics_configuration": "Statistics configuration",
"statistics_retention": "Statistics retention",
"statistics_retention_desc": "If you decrease the interval value, some data will be lost",
"statistics_clear": " Clear statistics",
"statistics_clear_confirm": "Are you sure you want to clear statistics?",
| </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"}, | "filter_removed_successfully": "The list has been successfully removed", | "domain": "Domain",
"answer": "Answer",
"filter_added_successfully": "The list has been successfully added",
"filter_removed_successfully": "The list has been successfully removed",
"filter_updated": "The list has been successfully updated",
"statistics_configuration": "Statistics configuration",
"statistics_retention": "Statistics retention",
"statistics_retention_desc": "If you decrease the interval value, some data will be lost",
"statistics_clear": " Clear statistics",
"statistics_clear_confirm": "Are you sure you want to clear statistics?", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/en.json |
"check_desc": "Check if the host name is filtered",
"check": "Check",
"form_enter_host": "Enter a host name",
"filtered_custom_rules": "Filtered by Custom filtering rules",
"host_whitelisted": "The host is whitelisted",
"check_ip": "IP addresses: {{ip}}",
"check_cname": "CNAME: {{cname}}",
"check_reason": "Reason: {{reason}}",
| </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; | "choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list", | "check_desc": "Check if the host name is filtered",
"check": "Check",
"form_enter_host": "Enter a host name",
"filtered_custom_rules": "Filtered by Custom filtering rules",
"choose_from_list": "Choose from the list",
"add_custom_list": "Add a custom list",
"host_whitelisted": "The host is whitelisted",
"check_ip": "IP addresses: {{ip}}",
"check_cname": "CNAME: {{cname}}",
"check_reason": "Reason: {{reason}}", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/en.json |
"enter_cache_ttl_max_override": "Enter maximum TTL",
"cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server. This value can't larger than 3600 (1 hour)",
"cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server",
"min_exceeds_max_value": "Minimum value exceeds maximum value",
"value_not_larger_than": "Value can't be larger than {{maximum}}"
}
| </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'; | "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" | "enter_cache_ttl_max_override": "Enter maximum TTL",
"cache_ttl_min_override_desc": "Override TTL value (minimum) received from upstream server. This value can't larger than 3600 (1 hour)",
"cache_ttl_max_override_desc": "Override TTL value (maximum) received from upstream server",
"min_exceeds_max_value": "Minimum value exceeds maximum value",
"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"
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | + 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/__locales/en.json |
"blocking_mode": "Blocking modus",
"default": "Standaard",
"custom_ip": "Aangepast IP",
"blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6",
"dns_over_https": "DNS-via-HTTPS",
"dns_over_tls": "DNS-via-TLS",
| </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 | "nxdomain": "NXDOMAIN",
"null_ip": "Nul IP", | "blocking_mode": "Blocking modus",
"default": "Standaard",
"nxdomain": "NXDOMAIN",
"null_ip": "Nul IP",
"custom_ip": "Aangepast IP",
"blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6",
"dns_over_https": "DNS-via-HTTPS",
"dns_over_tls": "DNS-via-TLS", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"nxdomain": "NXDOMAIN",
"null_ip": "Nul IP",
"custom_ip": "Aangepast IP",
"dns_over_https": "DNS-via-HTTPS",
"dns_over_tls": "DNS-via-TLS",
"plain_dns": "Gewone DNS",
"form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet",
| </s> | "blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6", | "nxdomain": "NXDOMAIN",
"null_ip": "Nul IP",
"custom_ip": "Aangepast IP",
"blocking_ipv4": "Blokkeren IP4",
"blocking_ipv6": "Blokkeren IP6",
"dns_over_https": "DNS-via-HTTPS",
"dns_over_tls": "DNS-via-TLS",
"plain_dns": "Gewone DNS",
"form_enter_rate_limit": "Voer ratio limiet in",
"rate_limit": "Ratio limiet", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"dns_over_https": "DNS-via-HTTPS",
"dns_over_tls": "DNS-via-TLS",
"plain_dns": "Gewone DNS",
"tracker_source": "Bron volger",
"source_label": "Bron",
"found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
"category_label": "Categorie",
| </s> | "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.", | "dns_over_https": "DNS-via-HTTPS",
"dns_over_tls": "DNS-via-TLS",
"plain_dns": "Gewone DNS",
"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.",
"tracker_source": "Bron volger",
"source_label": "Bron",
"found_in_known_domain_db": "Gevonden in de bekende domeingegevensbank.",
"category_label": "Categorie", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"try_again": "Probeer opnieuw",
"domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.",
"example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.",
"example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <0>example.org</0>.",
"fastest_addr": "Snelste IP adres",
"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.",
"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>",
| </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"}, | "disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.", | "try_again": "Probeer opnieuw",
"domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.",
"example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.",
"example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <0>example.org</0>.",
"disable_ipv6": "Zet IPv6 uit",
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
"fastest_addr": "Snelste IP adres",
"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.",
"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>", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
"fastest_addr": "Snelste IP adres",
"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.",
"tags_title": "Labels",
"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",
"check": "Controleren",
| </s> | "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.", | "disable_ipv6_desc": "Als deze functie is ingeschakeld, worden alle DNS-query's voor IPv6-adressen (type AAAA) verwijderd.",
"fastest_addr": "Snelste IP adres",
"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.",
"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.",
"tags_title": "Labels",
"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",
"check": "Controleren", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"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.",
"tags_title": "Labels",
"check": "Controleren",
"form_enter_host": "Voer een hostnaam in",
"filtered_custom_rules": "Gefilterd door aangepaste filterregels",
"host_whitelisted": "De host staat op de toestemmingslijst",
"check_ip": "IP-adressen: {{ip}}",
| </s> | "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", | "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.",
"tags_title": "Labels",
"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",
"check": "Controleren",
"form_enter_host": "Voer een hostnaam in",
"filtered_custom_rules": "Gefilterd door aangepaste filterregels",
"host_whitelisted": "De host staat op de toestemmingslijst",
"check_ip": "IP-adressen: {{ip}}", | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"check": "Controleren",
"form_enter_host": "Voer een hostnaam in",
"host_whitelisted": "De host staat op de toestemmingslijst",
"check_ip": "IP-adressen: {{ip}}",
"check_cname": "CNAME: {{cname}}",
"check_reason": "Reden: {{reason}}",
"check_rule": "Regel: {{rule}}",
| </s> | "filtered_custom_rules": "Gefilterd door aangepaste filterregels", | "check": "Controleren",
"form_enter_host": "Voer een hostnaam in",
"filtered_custom_rules": "Gefilterd door aangepaste filterregels",
"host_whitelisted": "De host staat op de toestemmingslijst",
"check_ip": "IP-adressen: {{ip}}",
"check_cname": "CNAME: {{cname}}",
"check_reason": "Reden: {{reason}}",
"check_rule": "Regel: {{rule}}", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/__locales/nl.json |
"blocked_adult_websites": "Blokkerte voksennettsteder",
"blocked_threats": "Blokkerte trusler",
"allowed": "Unntak",
"blocklist": "Blokkeringsliste"
} | </s> remove } </s> add </s> remove } </s> add | "blocked_adult_websites": "Blokkerte voksennettsteder",
"blocked_threats": "Blokkerte trusler",
"allowed": "Unntak",
"blocklist": "Blokkeringsliste"
| [
"keep",
"keep",
"keep",
"keep",
"replace"
] | + 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/__locales/no.json |
|
"rewritten": "Przepisane",
"safe_search": "Bezpieczne wyszukiwanie",
"blocklist": "Lista zablokowanych",
"milliseconds_abbreviation": "ms"
} | </s> remove } </s> add </s> remove } </s> add | "rewritten": "Przepisane",
"safe_search": "Bezpieczne wyszukiwanie",
"blocklist": "Lista zablokowanych",
"milliseconds_abbreviation": "ms"
| [
"keep",
"keep",
"keep",
"keep",
"replace"
] | + 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/__locales/pl.json |
|
"safe_search": "Bezpieczne wyszukiwanie",
"blocklist": "Lista zablokowanych",
"milliseconds_abbreviation": "ms"
}
| </s> remove } </s> add </s> remove } </s> add </s> remove } </s> add | } | "safe_search": "Bezpieczne wyszukiwanie",
"blocklist": "Lista zablokowanych",
"milliseconds_abbreviation": "ms"
}
} | [
"keep",
"keep",
"keep",
"add"
] | + 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/__locales/pl.json |
export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter({ url, name, whitelist });
dispatch(addFilterSuccess(url));
dispatch(toggleFilteringModal());
| </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> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} </s> remove if (filtering.modalType === MODAL_TYPE.EDIT) {
</s> add if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { | export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { | export const addFilterRequest = createAction('ADD_FILTER_REQUEST');
export const addFilterFailure = createAction('ADD_FILTER_FAILURE');
export const addFilterSuccess = createAction('ADD_FILTER_SUCCESS');
export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => {
dispatch(addFilterRequest());
try {
await apiClient.addFilter({ url, name, whitelist });
dispatch(addFilterSuccess(url));
dispatch(toggleFilteringModal()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/actions/filtering.js |
dispatch(addFilterRequest());
try {
await apiClient.addFilter({ url, name, whitelist });
dispatch(addFilterSuccess(url));
dispatch(toggleFilteringModal());
dispatch(addSuccessToast('filter_added_successfully'));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure());
| </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} </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 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) => { | if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} | dispatch(addFilterRequest());
try {
await apiClient.addFilter({ url, name, whitelist });
dispatch(addFilterSuccess(url));
if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
}
dispatch(addSuccessToast('filter_added_successfully'));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(addFilterFailure()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/actions/filtering.js |
export const removeFilterRequest = createAction('REMOVE_FILTER_REQUEST');
export const removeFilterFailure = createAction('REMOVE_FILTER_FAILURE');
export const removeFilterSuccess = createAction('REMOVE_FILTER_SUCCESS');
export const removeFilter = (url, whitelist = false) => async (dispatch) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter({ url, whitelist });
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
| </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) => { | export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { | export const removeFilterRequest = createAction('REMOVE_FILTER_REQUEST');
export const removeFilterFailure = createAction('REMOVE_FILTER_FAILURE');
export const removeFilterSuccess = createAction('REMOVE_FILTER_SUCCESS');
export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => {
dispatch(removeFilterRequest());
try {
await apiClient.removeFilter({ url, whitelist });
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/actions/filtering.js |
try {
await apiClient.removeFilter({ url, whitelist });
dispatch(removeFilterSuccess(url));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
}
| </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) => { | if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
}
dispatch(addSuccessToast('filter_removed_successfully')); | try {
await apiClient.removeFilter({ url, whitelist });
dispatch(removeFilterSuccess(url));
if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
}
dispatch(addSuccessToast('filter_removed_successfully'));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(removeFilterFailure());
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/actions/filtering.js |
export const editFilterRequest = createAction('EDIT_FILTER_REQUEST');
export const editFilterFailure = createAction('EDIT_FILTER_FAILURE');
export const editFilterSuccess = createAction('EDIT_FILTER_SUCCESS');
export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
dispatch(editFilterRequest());
try {
await apiClient.setFilterUrl({ url, data, whitelist });
dispatch(editFilterSuccess(url));
dispatch(toggleFilteringModal());
| </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 removeFilter = (url, whitelist = false) => async (dispatch) => {
</s> add export const removeFilter = (url, whitelist = false) => async (dispatch, getState) => { </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} | export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { | export const editFilterRequest = createAction('EDIT_FILTER_REQUEST');
export const editFilterFailure = createAction('EDIT_FILTER_FAILURE');
export const editFilterSuccess = createAction('EDIT_FILTER_SUCCESS');
export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => {
dispatch(editFilterRequest());
try {
await apiClient.setFilterUrl({ url, data, whitelist });
dispatch(editFilterSuccess(url));
dispatch(toggleFilteringModal()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/actions/filtering.js |
dispatch(editFilterRequest());
try {
await apiClient.setFilterUrl({ url, data, whitelist });
dispatch(editFilterSuccess(url));
dispatch(toggleFilteringModal());
dispatch(addSuccessToast('filter_updated'));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(editFilterFailure());
| </s> remove dispatch(toggleFilteringModal());
</s> add if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} </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> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { | if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
} | dispatch(editFilterRequest());
try {
await apiClient.setFilterUrl({ url, data, whitelist });
dispatch(editFilterSuccess(url));
if (getState().filtering.isModalOpen) {
dispatch(toggleFilteringModal());
}
dispatch(addSuccessToast('filter_updated'));
dispatch(getFilteringStatus());
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(editFilterFailure()); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/actions/filtering.js |
}
}
.font-monospace {
font-family: var(--font-family-monospace);
}
.mw-75 {
max-width: 75% !important;
| </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; | .modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
| }
}
.modal-body--medium {
max-height: 20rem;
overflow-y: scroll;
}
.modal-body__item:not(:first-child) {
padding-top: 1.5rem;
}
.font-monospace {
font-family: var(--font-family-monospace);
}
.mw-75 {
max-width: 75% !important; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/App/index.css |
const { name, url } = values;
const { filtering } = this.props;
const whitelist = true;
if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values, whitelist);
} else {
this.props.addFilter(url, name, whitelist);
}
};
| </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'); | if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) { | const { name, url } = values;
const { filtering } = this.props;
const whitelist = true;
if (filtering.modalType === MODAL_TYPE.EDIT_FILTERS) {
this.props.editFilter(filtering.modalFilterUrl, values, whitelist);
} else {
this.props.addFilter(url, name, whitelist);
}
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/DnsAllowlist.js |
handleRefresh = () => {
this.props.refreshFilters({ whitelist: true });
};
render() {
const {
t,
toggleFilteringModal,
addFilter,
toggleFilterStatus,
| </s> remove this.props.toggleModal();
</s> add this.props.toggleFilteringModal(); </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
&& <> | openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
| handleRefresh = () => {
this.props.refreshFilters({ whitelist: true });
};
openAddFiltersModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.ADD_FILTERS });
};
render() {
const {
t,
toggleFilteringModal,
addFilter,
toggleFilterStatus, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/DnsAllowlist.js |
toggleFilter={this.toggleFilter}
whitelist={whitelist}
/>
<Actions
handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
handleRefresh={this.handleRefresh}
processingRefreshFilters={processingRefreshFilters}
whitelist={whitelist}
/>
</Card>
| </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openSelectTypeModal} </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 }) => <> | handleAdd={this.openAddFiltersModal} | toggleFilter={this.toggleFilter}
whitelist={whitelist}
/>
<Actions
handleAdd={this.openAddFiltersModal}
handleRefresh={this.handleRefresh}
processingRefreshFilters={processingRefreshFilters}
whitelist={whitelist}
/>
</Card> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/DnsAllowlist.js |
</div>
</div>
</div>
<Modal
isOpen={isModalOpen}
toggleFilteringModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
| </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} | filters={whitelistFilters} | </div>
</div>
</div>
<Modal
filters={whitelistFilters}
isOpen={isModalOpen}
toggleFilteringModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/DnsAllowlist.js |
</div>
</div>
<Modal
isOpen={isModalOpen}
toggleModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
handleSubmit={this.handleSubmit}
| </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} | toggleFilteringModal={toggleFilteringModal} | </div>
</div>
<Modal
isOpen={isModalOpen}
toggleFilteringModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
handleSubmit={this.handleSubmit} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/DnsAllowlist.js |
import React, { Component, Fragment } from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from 'react-i18next';
import PageTitle from '../ui/PageTitle';
import Card from '../ui/Card';
| </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'; | import React, { Component } from 'react'; | import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { withTranslation } from 'react-i18next';
import PageTitle from '../ui/PageTitle';
import Card from '../ui/Card'; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
import PageTitle from '../ui/PageTitle';
import Card from '../ui/Card';
import Modal from './Modal';
import Actions from './Actions';
import Table from './Table';
import { MODAL_TYPE } from '../../helpers/constants';
import { getCurrentFilter } from '../../helpers/helpers';
class DnsBlocklist extends Component {
| </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 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'; | import PageTitle from '../ui/PageTitle';
import Card from '../ui/Card';
import Modal from './Modal';
import Actions from './Actions';
import { MODAL_TYPE } from '../../helpers/constants';
import { getCurrentFilter } from '../../helpers/helpers';
class DnsBlocklist extends Component { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
|
import Modal from './Modal';
import Actions from './Actions';
import { MODAL_TYPE } from '../../helpers/constants';
import {
getCurrentFilter,
getObjDiff,
| </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'; | import Table from './Table'; | import Modal from './Modal';
import Actions from './Actions';
import Table from './Table';
import { MODAL_TYPE } from '../../helpers/constants';
import {
getCurrentFilter,
getObjDiff, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
import Actions from './Actions';
import Table from './Table';
import { MODAL_TYPE } from '../../helpers/constants';
import { getCurrentFilter } from '../../helpers/helpers';
class DnsBlocklist extends Component {
componentDidMount() {
this.props.getFilteringStatus();
}
| </s> remove import Table from './Table';
</s> add </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'; | import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); | import Actions from './Actions';
import Table from './Table';
import { MODAL_TYPE } from '../../helpers/constants';
import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json');
class DnsBlocklist extends Component {
componentDidMount() {
this.props.getFilteringStatus();
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
componentDidMount() {
this.props.getFilteringStatus();
}
handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
| </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) { </s> remove if (this.props.modalType === MODAL_TYPE.EDIT) {
</s> add if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { </s> remove import { getCurrentFilter } from '../../helpers/helpers';
</s> add import {
getCurrentFilter,
getObjDiff,
} from '../../helpers/helpers';
const filtersCatalog = require('../../helpers/filters/filters.json'); </s> remove export const addFilter = (url, name, whitelist = false) => async (dispatch) => {
</s> add export const addFilter = (url, name, whitelist = false) => async (dispatch, getState) => { | handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props; | componentDidMount() {
this.props.getFilteringStatus();
}
handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props;
handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props;
handleSubmit = (values, _, { initialValues }) => {
const { filtering: { modalFilterUrl, modalType } } = this.props;
if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
if (filtering.modalType === MODAL_TYPE.EDIT) {
this.props.editFilter(filtering.modalFilterUrl, values);
} else {
this.props.addFilter(url, name);
}
};
handleDelete = (url) => {
if (window.confirm(this.props.t('list_confirm_delete'))) {
| </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 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>;
}); | 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; | handleSubmit = (values) => {
const { name, url } = values;
const { filtering } = this.props;
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;
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;
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;
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;
}
};
handleDelete = (url) => {
if (window.confirm(this.props.t('list_confirm_delete'))) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
handleRefresh = () => {
this.props.refreshFilters({ whitelist: false });
};
render() {
const {
t,
toggleFilteringModal,
addFilter,
| </s> remove this.props.toggleModal();
</s> add this.props.toggleFilteringModal(); </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
&& <> | openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
| handleRefresh = () => {
this.props.refreshFilters({ whitelist: false });
};
openSelectTypeModal = () => {
this.props.toggleFilteringModal({ type: MODAL_TYPE.SELECT_MODAL_TYPE });
};
render() {
const {
t,
toggleFilteringModal,
addFilter, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
|| processingRemoveFilter
|| processingRefreshFilters;
return (
<Fragment>
<PageTitle
title={t('dns_blocklists')}
subtitle={t('dns_blocklists_desc')}
/>
<div className="content">
| </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> 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
&& <> | <> | || processingRemoveFilter
|| processingRefreshFilters;
return (
<>
<PageTitle
title={t('dns_blocklists')}
subtitle={t('dns_blocklists_desc')}
/>
<div className="content"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
handleDelete={this.handleDelete}
toggleFilter={this.toggleFilter}
/>
<Actions
handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
handleRefresh={this.handleRefresh}
processingRefreshFilters={processingRefreshFilters}
/>
</Card>
</div>
| </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> remove }) => <Fragment>
</s> add }) => <> | handleAdd={this.openSelectTypeModal} | handleDelete={this.handleDelete}
toggleFilter={this.toggleFilter}
/>
<Actions
handleAdd={this.openSelectTypeModal}
handleRefresh={this.handleRefresh}
processingRefreshFilters={processingRefreshFilters}
/>
</Card>
</div> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
</div>
<Modal
isOpen={isModalOpen}
toggleFilteringModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
| </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove initialValues={{ ...currentFilterData }}
</s> add selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} | filtersCatalog={filtersCatalog}
filters={filters} | </div>
<Modal
filtersCatalog={filtersCatalog}
filters={filters}
isOpen={isModalOpen}
toggleFilteringModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
</div>
</div>
<Modal
isOpen={isModalOpen}
toggleModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
handleSubmit={this.handleSubmit}
| </s> | toggleFilteringModal={toggleFilteringModal} | </div>
</div>
<Modal
isOpen={isModalOpen}
toggleFilteringModal={toggleFilteringModal}
addFilter={addFilter}
isFilterAdded={isFilterAdded}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
handleSubmit={this.handleSubmit} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
handleSubmit={this.handleSubmit}
modalType={modalType}
currentFilterData={currentFilterData}
/>
</Fragment>
);
}
}
DnsBlocklist.propTypes = {
| </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} | </> | handleSubmit={this.handleSubmit}
modalType={modalType}
currentFilterData={currentFilterData}
/>
</>
);
}
}
DnsBlocklist.propTypes = { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 |
import React from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { FORM_NAME } from '../../helpers/constants';
| </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 React, { Component, Fragment } from 'react';
</s> add import React, { Component } from 'react'; </s> remove import Table from './Table';
</s> add | import { withTranslation } from 'react-i18next'; | import React from 'react';
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { FORM_NAME } from '../../helpers/constants';
| [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { FORM_NAME } from '../../helpers/constants';
const Form = (props) => {
const {
| </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 { 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 import Table from './Table';
</s> add | import classNames from 'classnames'; | import PropTypes from 'prop-types';
import { Field, reduxForm } from 'redux-form';
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import classNames from 'classnames';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { FORM_NAME } from '../../helpers/constants';
const Form = (props) => {
const { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
import { FORM_NAME } from '../../helpers/constants';
const Form = (props) => {
const {
t,
closeModal,
| </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 | 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>;
}); | import { Trans, withTranslation } from 'react-i18next';
import flow from 'lodash/flow';
import { renderInputField } from '../../helpers/form';
import { validatePath, validateRequiredValue } from '../../helpers/validators';
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>;
});
const Form = (props) => {
const {
t,
closeModal, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
processingAddFilter,
processingConfigFilter,
whitelist,
} = props;
const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal();
| </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> remove export const editFilter = (url, data, whitelist = false) => async (dispatch) => {
</s> add export const editFilter = (url, data, whitelist = false) => async (dispatch, getState) => { | modalType,
toggleFilteringModal,
selectedSources,
filtersCatalog, | processingAddFilter,
processingConfigFilter,
whitelist,
modalType,
toggleFilteringModal,
selectedSources,
filtersCatalog,
} = props;
const openModal = (modalType, timeout = MODAL_OPEN_TIMEOUT) => {
toggleFilteringModal(); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
processingConfigFilter,
whitelist,
} = props;
return (
<form onSubmit={handleSubmit}>
<div className="modal-body">
<div className="form__group">
<Field
id="name"
name="name"
type="text"
| </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)); | 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
&& <> | processingConfigFilter,
whitelist,
} = props;
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
&& <>
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
&& <>
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
&& <>
<div className="form__group">
<Field
id="name"
name="name"
type="text" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
normalizeOnBlur={(data) => data.trim()}
/>
</div>
<div className="form__description">
{whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</div>
</div>
<div className="modal-footer">
<button
type="button"
| </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 <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove {modalType === MODAL_TYPE.EDIT ? (
</s> add {modalType === MODAL_TYPE.EDIT_FILTERS ? ( </s> remove handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
</s> add handleAdd={this.openSelectTypeModal} | {whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')} | normalizeOnBlur={(data) => data.trim()}
/>
</div>
<div className="form__description">
{whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
{whitelist ? t('enter_valid_allowlist') : t('enter_valid_blocklist')}
</div>
</div>
<div className="modal-footer">
<button
type="button" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
<div className="form__description">
{whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</div>
</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>
);
};
Form.propTypes = {
t: PropTypes.func.isRequired,
closeModal: PropTypes.func.isRequired,
| </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>} </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 ? ( | </>}
</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>; | <div className="form__description">
{whitelist ? <Trans>enter_valid_allowlist</Trans>
: <Trans>enter_valid_blocklist</Trans>}
</div>
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
</>}
</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>;
};
Form.propTypes = {
t: PropTypes.func.isRequired,
closeModal: PropTypes.func.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
processingConfigFilter: PropTypes.bool.isRequired,
whitelist: PropTypes.bool,
};
export default flow([
withTranslation(),
reduxForm({ form: FORM_NAME.FILTER }),
| </s> remove toggleModal: PropTypes.func.isRequired,
</s> add toggleFilteringModal: PropTypes.func.isRequired, | modalType: PropTypes.string.isRequired,
toggleFilteringModal: PropTypes.func.isRequired,
filtersCatalog: PropTypes.object,
selectedSources: PropTypes.object, | processingConfigFilter: PropTypes.bool.isRequired,
whitelist: PropTypes.bool,
modalType: PropTypes.string.isRequired,
toggleFilteringModal: PropTypes.func.isRequired,
filtersCatalog: PropTypes.object,
selectedSources: PropTypes.object,
};
export default flow([
withTranslation(),
reduxForm({ form: FORM_NAME.FILTER }), | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Form.js |
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import ReactModal from 'react-modal';
import { Trans, withTranslation } from 'react-i18next';
import { MODAL_TYPE } from '../../helpers/constants';
import Form from './Form';
import '../ui/Modal.css';
| </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 | import { withTranslation } from 'react-i18next'; | import React, { Component } from 'react';
import PropTypes from 'prop-types';
import ReactModal from 'react-modal';
import { withTranslation } from 'react-i18next';
import { MODAL_TYPE } from '../../helpers/constants';
import Form from './Form';
import '../ui/Modal.css';
| [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
import Form from './Form';
import '../ui/Modal.css';
ReactModal.setAppElement('#root');
const MODAL_TYPE_TO_TITLE_TYPE_MAP = {
[MODAL_TYPE.EDIT_FILTERS]: 'edit',
| </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 | import { getMap } from '../../helpers/helpers'; | import Form from './Form';
import '../ui/Modal.css';
import { getMap } from '../../helpers/helpers';
ReactModal.setAppElement('#root');
const MODAL_TYPE_TO_TITLE_TYPE_MAP = {
[MODAL_TYPE.EDIT_FILTERS]: 'edit', | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
ReactModal.setAppElement('#root');
class Modal extends Component {
closeModal = () => {
this.props.toggleModal();
};
render() {
const {
isOpen,
| </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
&& <> | this.props.toggleFilteringModal(); | ReactModal.setAppElement('#root');
class Modal extends Component {
closeModal = () => {
this.props.toggleFilteringModal();
};
render() {
const {
isOpen, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
currentFilterData,
whitelist,
} = this.props;
let initialValues;
let selectedSources;
switch (modalType) {
| </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> 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) { | toggleFilteringModal,
filters,
t,
filtersCatalog, | currentFilterData,
whitelist,
toggleFilteringModal,
filters,
t,
filtersCatalog,
} = this.props;
let initialValues;
let selectedSources;
switch (modalType) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
currentFilterData,
whitelist,
} = this.props;
const newListTitle = whitelist ? (
<Trans>new_allowlist</Trans>
) : (
<Trans>new_blocklist</Trans>
);
const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
| </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')} | 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'); | currentFilterData,
whitelist,
} = this.props;
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');
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');
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');
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');
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');
const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
) : (
<Trans>new_blocklist</Trans>
);
const editListTitle = whitelist ? (
<Trans>edit_allowlist</Trans>
) : (
<Trans>edit_blocklist</Trans>
);
return (
<ReactModal
className="Modal__Bootstrap modal-dialog modal-dialog-centered"
closeTimeoutMS={0}
| </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')} | const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist)); | ) : (
<Trans>new_blocklist</Trans>
);
const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist));
const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist));
const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist));
const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist));
const selectedValues = getSelectedValues(filters, catalogSourcesToIdMap);
initialValues = selectedValues.selectedFilterIds;
selectedSources = selectedValues.selectedSources;
break;
}
default:
}
const title = t(getTitle(modalType, whitelist));
return (
<ReactModal
className="Modal__Bootstrap modal-dialog modal-dialog-centered"
closeTimeoutMS={0} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
onRequestClose={this.closeModal}
>
<div className="modal-content">
<div className="modal-header">
<h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button>
</div>
<Form
| </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)); | {title && <h4 className="modal-title">{title}</h4>} | onRequestClose={this.closeModal}
>
<div className="modal-content">
<div className="modal-header">
{title && <h4 className="modal-title">{title}</h4>}
{title && <h4 className="modal-title">{title}</h4>}
{title && <h4 className="modal-title">{title}</h4>}
{title && <h4 className="modal-title">{title}</h4>}
{title && <h4 className="modal-title">{title}</h4>}
{title && <h4 className="modal-title">{title}</h4>}
{title && <h4 className="modal-title">{title}</h4>}
<button type="button" className="close" onClick={this.closeModal}>
<span className="sr-only">Close</span>
</button>
</div>
<Form | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
<span className="sr-only">Close</span>
</button>
</div>
<Form
initialValues={{ ...currentFilterData }}
onSubmit={handleSubmit}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
closeModal={this.closeModal}
whitelist={whitelist}
| </s> remove <h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
editListTitle
) : (
newListTitle
)}
</h4>
</s> add {title && <h4 className="modal-title">{title}</h4>} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} | selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType} | <span className="sr-only">Close</span>
</button>
</div>
<Form
selectedSources={selectedSources}
initialValues={initialValues}
filtersCatalog={filtersCatalog}
modalType={modalType}
onSubmit={handleSubmit}
processingAddFilter={processingAddFilter}
processingConfigFilter={processingConfigFilter}
closeModal={this.closeModal}
whitelist={whitelist} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
processingConfigFilter={processingConfigFilter}
closeModal={this.closeModal}
whitelist={whitelist}
/>
</div>
</ReactModal>
);
| </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> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} </s> remove toggleModal={toggleFilteringModal}
</s> add toggleFilteringModal={toggleFilteringModal} | toggleFilteringModal={toggleFilteringModal} | processingConfigFilter={processingConfigFilter}
closeModal={this.closeModal}
whitelist={whitelist}
toggleFilteringModal={toggleFilteringModal}
/>
</div>
</ReactModal>
); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
}
}
Modal.propTypes = {
toggleModal: PropTypes.func.isRequired,
isOpen: PropTypes.bool.isRequired,
addFilter: PropTypes.func.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired,
| </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; | toggleFilteringModal: PropTypes.func.isRequired, | }
}
Modal.propTypes = {
toggleFilteringModal: PropTypes.func.isRequired,
isOpen: PropTypes.bool.isRequired,
addFilter: PropTypes.func.isRequired,
isFilterAdded: PropTypes.bool.isRequired,
processingAddFilter: PropTypes.bool.isRequired,
processingConfigFilter: PropTypes.bool.isRequired, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
modalType: PropTypes.string.isRequired,
currentFilterData: PropTypes.object.isRequired,
t: PropTypes.func.isRequired,
whitelist: PropTypes.bool,
};
export default withTranslation()(Modal);
| </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>; | filters: PropTypes.array.isRequired,
filtersCatalog: PropTypes.object, | modalType: PropTypes.string.isRequired,
currentFilterData: PropTypes.object.isRequired,
t: PropTypes.func.isRequired,
whitelist: PropTypes.bool,
filters: PropTypes.array.isRequired,
filtersCatalog: PropTypes.object,
};
export default withTranslation()(Modal); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | + 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/Modal.js |
type="button"
className="btn btn-icon btn-outline-primary btn-sm mr-2"
title={t('edit_table_action')}
onClick={() => toggleFilteringModal({
type: MODAL_TYPE.EDIT,
url: value,
})
}
>
<svg className="icons">
| </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} | type: MODAL_TYPE.EDIT_FILTERS, | type="button"
className="btn btn-icon btn-outline-primary btn-sm mr-2"
title={t('edit_table_action')}
onClick={() => toggleFilteringModal({
type: MODAL_TYPE.EDIT_FILTERS,
url: value,
})
}
>
<svg className="icons"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Table.js |
.nav-icon {
display: none;
}
.header-brand-img {
height: 32px;
}
.header__logout {
width: 35px;
| </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; | .nav-icon--gray {
color: #9aa0ac;
}
| .nav-icon {
display: none;
}
.nav-icon--gray {
color: #9aa0ac;
}
.header-brand-img {
height: 32px;
}
.header__logout {
width: 35px; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Header/Header.css |
config.tags = [];
}
}
if (this.props.modalType === MODAL_TYPE.EDIT) {
this.handleFormUpdate(config, this.props.modalClientName);
} else {
this.handleFormAdd(config);
}
};
| </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
&& <> | if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) { | config.tags = [];
}
}
if (this.props.modalType === MODAL_TYPE.EDIT_FILTERS) {
this.handleFormUpdate(config, this.props.modalClientName);
} else {
this.handleFormAdd(config);
}
}; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Settings/Clients/ClientsTable.js |
<button
type="button"
className="btn btn-icon btn-outline-primary btn-sm mr-2"
onClick={() => toggleClientModal({
type: MODAL_TYPE.EDIT,
name: clientName,
})
}
disabled={processingUpdating}
title={t('edit_table_action')}
| </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')} | type: MODAL_TYPE.EDIT_FILTERS, | <button
type="button"
className="btn btn-icon btn-outline-primary btn-sm mr-2"
onClick={() => toggleClientModal({
type: MODAL_TYPE.EDIT_FILTERS,
name: clientName,
})
}
disabled={processingUpdating}
title={t('edit_table_action')} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Settings/Clients/ClientsTable.js |
/>
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
| </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>} | onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)} | />
<button
type="button"
className="btn btn-success btn-standard mt-3"
onClick={() => toggleClientModal(MODAL_TYPE.ADD_FILTERS)}
disabled={processingAdding}
>
<Trans>client_add</Trans>
</button>
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Settings/Clients/ClientsTable.js |
>
<div className="modal-content">
<div className="modal-header">
<h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT ? (
<Trans>client_edit</Trans>
) : (
<Trans>client_new</Trans>
)}
</h4>
| </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')} | {modalType === MODAL_TYPE.EDIT_FILTERS ? ( | >
<div className="modal-content">
<div className="modal-header">
<h4 className="modal-title">
{modalType === MODAL_TYPE.EDIT_FILTERS ? (
<Trans>client_edit</Trans>
) : (
<Trans>client_new</Trans>
)}
</h4> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/Settings/Clients/Modal.js |
<path d="M10 6l6 6-6 6" stroke="#888" strokeWidth="1.5" fill="none"
fillRule="evenodd" strokeLinecap="round" />
</svg>
</symbol>
</svg>
);
export default Icons;
| </s> remove </Fragment>
</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> | <path d="M10 6l6 6-6 6" stroke="#888" strokeWidth="1.5" fill="none"
fillRule="evenodd" strokeLinecap="round" />
</svg>
</symbol>
<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>
</svg>
);
export default Icons; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/ui/Icons.js |
export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
export const HIDE_TOOLTIP_DELAY = 300;
export const UNSAFE_PORTS = [
1,
7,
| </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', | export const MODAL_OPEN_TIMEOUT = 150; | export const SUCCESS_TOAST_TIMEOUT = 5000;
export const FAILURE_TOAST_TIMEOUT = 30000;
export const HIDE_TOOLTIP_DELAY = 300;
export const MODAL_OPEN_TIMEOUT = 150;
export const UNSAFE_PORTS = [
1,
7, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/constants.js |
ERROR: 'error',
};
export const MODAL_TYPE = {
ADD: 'add',
EDIT: 'edit',
};
export const CLIENT_ID = {
MAC: 'mac',
IP: 'ip',
| </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) => { | SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST', | ERROR: 'error',
};
export const MODAL_TYPE = {
SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
SELECT_MODAL_TYPE: 'SELECT_MODAL_TYPE',
ADD_FILTERS: 'ADD_FILTERS',
EDIT_FILTERS: 'EDIT_FILTERS',
CHOOSE_FILTERING_LIST: 'CHOOSE_FILTERING_LIST',
};
export const CLIENT_ID = {
MAC: 'mac',
IP: 'ip', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/constants.js |
onClick,
modifier = 'checkbox--form',
meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || 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}/> </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>;
}); | checked, | onClick,
modifier = 'checkbox--form',
checked,
meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
disabled,
onClick,
modifier = 'checkbox--form',
meta: { touched, error },
}) => <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
| </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 </span>
</s> add | }) => <> | disabled,
onClick,
modifier = 'checkbox--form',
meta: { touched, error },
}) => <>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
meta: { touched, error },
}) => <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span
className="checkbox__label-subtitle"
| </s> remove }) => <Fragment>
</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> remove </span>
</s> add </s> remove </Fragment>;
</s> add </>; | <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/> | meta: { touched, error },
}) => <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} checked={input.checked || checked}/>
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && <span
className="checkbox__label-subtitle" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<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>
</span>
</label>
{!disabled
&& touched
| </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>
</s> add </s> remove }) => <Fragment>
</s> add }) => <> </s> remove </Fragment>;
</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> | <label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<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>
<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>
<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>
<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>
<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>
<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>
</span>
</span>
</label>
{!disabled
&& touched | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span>
</span>
</label>
{!disabled
&& touched
&& error && <span className="form__message form__message--error">{error}</span>}
</Fragment>;
| </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 <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>} | className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>}
</span>
</label>
{!disabled
&& touched
&& error && <span className="form__message form__message--error">{error}</span>}
</Fragment>; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
|
</label>
{!disabled
&& touched
&& error && <span className="form__message form__message--error">{error}</span>}
</Fragment>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string,
| </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> 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
&& <> | </>; | </label>
{!disabled
&& touched
&& error && <span className="form__message form__message--error">{error}</span>}
</>;
renderSelectField.propTypes = {
input: PropTypes.object.isRequired,
placeholder: PropTypes.string,
subtitle: PropTypes.string, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
| </s> remove </Fragment>;
</s> add </>; </s> remove }) => <Fragment>
</s> add }) => <> | checked: PropTypes.bool, | subtitle: PropTypes.string,
disabled: PropTypes.bool,
onClick: PropTypes.func,
modifier: PropTypes.string,
checked: PropTypes.bool,
meta: PropTypes.shape({
touched: PropTypes.bool,
error: PropTypes.object,
}).isRequired,
};
| [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/form.js |
};
};
/**
* @param initialValues {object}
* @param values {object}
* @returns {object} Returns different values of objects
*/
export const getObjDiff = (initialValues, values) => Object.entries(values)
.reduce((acc, [key, value]) => {
if (value !== initialValues[key]) {
| </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
&& <> | * @param {object} initialValues
* @param {object} values | };
};
/**
* @param {object} initialValues
* @param {object} values
* @param {object} initialValues
* @param {object} values
* @returns {object} Returns different values of objects
*/
export const getObjDiff = (initialValues, values) => Object.entries(values)
.reduce((acc, [key, value]) => {
if (value !== initialValues[key]) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/helpers.js |
return num.toLocaleString(currentLanguage);
};
export const normalizeMultiline = (multiline) => `${normalizeTextarea(multiline)
.map((line) => line.trim())
.join('\n')}\n`;
/**
| </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
&& <> | /**
* @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;
}, {});
| return num.toLocaleString(currentLanguage);
};
/**
* @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;
}, {});
export const normalizeMultiline = (multiline) => `${normalizeTextarea(multiline)
.map((line) => line.trim())
.join('\n')}\n`;
/** | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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/helpers/helpers.js |
}
func defaultFilters() []filter {
return []filter{
{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"},
{Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
}
}
// field ordering is important -- yaml fields will mirror ordering from here
| </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> remove import { Trans, withTranslation } from 'react-i18next';
</s> add import { withTranslation } from 'react-i18next'; | {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"}, | }
func defaultFilters() []filter {
return []filter{
{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"},
{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"},
{Filter: dnsfilter.Filter{ID: 4}, Enabled: false, URL: "https://www.malwaredomainlist.com/hostslist/hosts.txt", Name: "MalwareDomainList.com Hosts List"},
}
}
// field ordering is important -- yaml fields will mirror ordering from here | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | + 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 | home/filter.go |
"dhcp_static_leases": "DHCP static leases",
"dhcp_leases_not_found": "No DHCP leases found",
"dhcp_config_saved": "Saved DHCP server config",
"form_error_required": "Required field",
"form_error_ip_format": "Invalid IPv4 format",
"form_error_mac_format": "Invalid MAC format",
"form_error_positive": "Must be greater than 0",
"dhcp_form_gateway_input": "Gateway IP",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Range of IP addresses",
| </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 | "form_error_ip4_format": "Invalid IPv4 format",
"form_error_ip6_format": "Invalid IPv6 format",
"form_error_ip_format": "Invalid IP format", | "dhcp_static_leases": "DHCP static leases",
"dhcp_leases_not_found": "No DHCP leases found",
"dhcp_config_saved": "Saved DHCP server config",
"form_error_required": "Required field",
"form_error_ip4_format": "Invalid IPv4 format",
"form_error_ip6_format": "Invalid IPv6 format",
"form_error_ip_format": "Invalid IP format",
"form_error_mac_format": "Invalid MAC format",
"form_error_positive": "Must be greater than 0",
"dhcp_form_gateway_input": "Gateway IP",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Range of IP addresses", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/en.json |
"next_btn": "Next",
"loading_table_status": "Loading...",
"page_table_footer_text": "Page",
"rows_table_footer_text": "rows",
"updated_custom_filtering_toast": "Updated the custom filtering rules",
"rule_removed_from_custom_filtering_toast": "Rule removed from the custom filtering rules",
"rule_added_to_custom_filtering_toast": "Rule added to the custom filtering rules",
"query_log_response_status": "Status: {{value}}",
"query_log_filtered": "Filtered by {{filter}}",
| </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> 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 | "of_table_footer_text": "of", | "next_btn": "Next",
"loading_table_status": "Loading...",
"page_table_footer_text": "Page",
"of_table_footer_text": "of",
"rows_table_footer_text": "rows",
"updated_custom_filtering_toast": "Updated the custom filtering rules",
"rule_removed_from_custom_filtering_toast": "Rule removed from the custom filtering rules",
"rule_added_to_custom_filtering_toast": "Rule added to the custom filtering rules",
"query_log_response_status": "Status: {{value}}",
"query_log_filtered": "Filtered by {{filter}}", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/en.json |
"dhcp_static_leases": "DHCP static leases",
"dhcp_leases_not_found": "DHCP lease tidak ditemukan",
"dhcp_config_saved": "Pengaturan server DHCP tersimpan",
"form_error_required": "Kolom yang harus diisi",
"form_error_ip_format": "Format IPv4 tidak valid",
"form_error_mac_format": "Format MAC tidak valid",
"form_error_positive": "Harus lebih dari 0",
"dhcp_form_gateway_input": "IP gateway",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Rentang alamat IP",
| </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 | "dhcp_static_leases": "DHCP static leases",
"dhcp_leases_not_found": "DHCP lease tidak ditemukan",
"dhcp_config_saved": "Pengaturan server DHCP tersimpan",
"form_error_required": "Kolom yang harus diisi",
"form_error_mac_format": "Format MAC tidak valid",
"form_error_positive": "Harus lebih dari 0",
"dhcp_form_gateway_input": "IP gateway",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Rentang alamat IP", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/id.json |
|
"use_adguard_browsing_sec_hint": "AdGuard Home akan mengecek jika domain diblacklist oleh layanan web keamanan penjelajahan. Akan menggunakan lookup API yang ramah privasi untuk melakukan cek: hanya awalan singkat hash SHA256 dari nama domain yang dikirim ke server.",
"use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
"use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
"enforce_safe_search": "Paksa penelusuran aman",
"enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, dan Yandex.",
"no_servers_specified": "Sever tidak disebutkan",
"general_settings": "Pengaturan umum",
"dns_settings": "Pengaturan DNS",
"encryption_settings": "Pengaturan enkripsi",
"dhcp_settings": "Pengaturan DHCP",
| </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": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan",
</s> add </s> remove "form_error_ip_format": "Format IPv4 tidak valid",
</s> add </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
</s> add </s> remove "form_error_ip_format": "Ongeldig IPv4 formaat",
</s> add | "use_adguard_browsing_sec_hint": "AdGuard Home akan mengecek jika domain diblacklist oleh layanan web keamanan penjelajahan. Akan menggunakan lookup API yang ramah privasi untuk melakukan cek: hanya awalan singkat hash SHA256 dari nama domain yang dikirim ke server.",
"use_adguard_parental": "Gunakan layanan web kontrol orang tua AdGuard",
"use_adguard_parental_hint": "AdGuard Home akan mengecek jika domain mengandung materi dewasa. Akan menggunakan API yang ramah privasi yang sama sebagai layanan web keamanan penjelajahan.",
"enforce_safe_search": "Paksa penelusuran aman",
"no_servers_specified": "Sever tidak disebutkan",
"general_settings": "Pengaturan umum",
"dns_settings": "Pengaturan DNS",
"encryption_settings": "Pengaturan enkripsi",
"dhcp_settings": "Pengaturan DHCP", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/id.json |
|
"example_meaning_host_block": "AdGuard Home sekarang akan mengembalikan alamat 127.0.0.1 untuk domain example.org (namun tidak subdomainnya)",
"example_comment": "! Komentar di sini",
"example_comment_meaning": "hanya sebuah komentar",
"example_comment_hash": "Juga sebuah komentar",
"example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan",
"example_upstream_regular": "DNS reguler (melalui UDP)",
"example_upstream_dot": "terenkripsi <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
"example_upstream_doh": "terenkripsi <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
"example_upstream_sdns": "anda bisa menggunakan <a href='https://dnscrypt.info/stamps/' target='_blank'>Stempel DNS</a> untuk <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> atau pengarah <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
"example_upstream_tcp": "DNS reguler (melalui TCP)",
| </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 dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, dan Yandex.",
</s> add </s> remove "form_error_ip_format": "Format IPv4 tidak valid",
</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 | "example_meaning_host_block": "AdGuard Home sekarang akan mengembalikan alamat 127.0.0.1 untuk domain example.org (namun tidak subdomainnya)",
"example_comment": "! Komentar di sini",
"example_comment_meaning": "hanya sebuah komentar",
"example_comment_hash": "Juga sebuah komentar",
"example_upstream_regular": "DNS reguler (melalui UDP)",
"example_upstream_dot": "terenkripsi <a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a>",
"example_upstream_doh": "terenkripsi <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
"example_upstream_sdns": "anda bisa menggunakan <a href='https://dnscrypt.info/stamps/' target='_blank'>Stempel DNS</a> untuk <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> atau pengarah <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
"example_upstream_tcp": "DNS reguler (melalui TCP)", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/id.json |
|
"dhcp_static_leases": "Leases DHCP statici",
"dhcp_leases_not_found": "Nessun lease DHCP trovato",
"dhcp_config_saved": "Configurazione server DHCP salvata",
"form_error_required": "Campo richiesto",
"form_error_ip_format": "Formato IPv4 non valido",
"form_error_mac_format": "Formato MAC non valido",
"form_error_positive": "Deve essere maggiore di 0",
"dhcp_form_gateway_input": "IP Gateway",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Range indirizzi IP",
| </s> remove "form_error_ip_format": "Format IPv4 tidak valid",
</s> add </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": "Ongeldig IPv4 formaat",
</s> add </s> remove "example_regex_meaning": "blokir akses ke domain yang cocok dengan ekspresi reguler yang ditentukan",
</s> add | "dhcp_static_leases": "Leases DHCP statici",
"dhcp_leases_not_found": "Nessun lease DHCP trovato",
"dhcp_config_saved": "Configurazione server DHCP salvata",
"form_error_required": "Campo richiesto",
"form_error_mac_format": "Formato MAC non valido",
"form_error_positive": "Deve essere maggiore di 0",
"dhcp_form_gateway_input": "IP Gateway",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Range indirizzi IP", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/it.json |
|
"example_comment_meaning": "un commento",
"example_comment_hash": "# Un altro commento",
"example_upstream_regular": "DNS regolari (via UDP)",
"example_upstream_dot": "<a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a> criptato",
"example_upstream_doh": "<a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a> criptato",
"example_upstream_sdns": "puoi usare <a href='https://dnscrypt.info/stamps/' target='_blank'>DNS Stamps</a> per <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> oppure dei resolver con <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>",
| </s> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
</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 | "example_regex_meaning": "blocca l'accesso ai domini che corrispondono alla specifica espressione regolare", | "example_comment_meaning": "un commento",
"example_comment_hash": "# Un altro commento",
"example_regex_meaning": "blocca l'accesso ai domini che corrispondono alla specifica espressione regolare",
"example_upstream_regular": "DNS regolari (via UDP)",
"example_upstream_dot": "<a href='https://en.wikipedia.org/wiki/DNS_over_TLS' target='_blank'>DNS-over-TLS</a> criptato",
"example_upstream_doh": "<a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a> criptato",
"example_upstream_sdns": "puoi usare <a href='https://dnscrypt.info/stamps/' target='_blank'>DNS Stamps</a> per <a href='https://dnscrypt.info/' target='_blank'>DNSCrypt</a> oppure dei resolver con <a href='https://en.wikipedia.org/wiki/DNS_over_HTTPS' target='_blank'>DNS-over-HTTPS</a>", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/it.json |
"blocked_service": "Servizio bloccato",
"block_all": "Blocca tutto",
"unblock_all": "Sblocca tutto",
"stats_params": "Configurazione delle statistiche",
"config_successfully_saved": "Configurazione salvata correttamente",
"interval_24_hour": "24 ore",
"interval_days": "{{count}} giorni",
| </s> remove "form_error_ip_format": "Formato IPv4 non valido",
</s> add </s> remove validate={[ipv4, required]}
</s> add validate={[ip, required]} </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> remove "example_regex_meaning": "blokkeer de toegang tot de domeinen die overeenkomen met de opgegeven reguliere expressie",
</s> add | "encryption_certificate_path": "Percorso di certificato",
"encryption_private_key_path": "Percorso della chiave privata",
"encryption_certificates_source_path": "Definisci un percorso alle file dei certificati",
"encryption_certificates_source_content": "Incolla i contenuti di certificato",
"encryption_key_source_path": "Imposta un file chiave privata",
"encryption_key_source_content": "Incolla i contenuti della chiave privata", | "blocked_service": "Servizio bloccato",
"block_all": "Blocca tutto",
"unblock_all": "Sblocca tutto",
"encryption_certificate_path": "Percorso di certificato",
"encryption_private_key_path": "Percorso della chiave privata",
"encryption_certificates_source_path": "Definisci un percorso alle file dei certificati",
"encryption_certificates_source_content": "Incolla i contenuti di certificato",
"encryption_key_source_path": "Imposta un file chiave privata",
"encryption_key_source_content": "Incolla i contenuti della chiave privata",
"stats_params": "Configurazione delle statistiche",
"config_successfully_saved": "Configurazione salvata correttamente",
"interval_24_hour": "24 ore",
"interval_days": "{{count}} giorni", | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/it.json |
"dhcp_leases": "DHCP lease overzicht",
"dhcp_leases_not_found": "Geen DHCP lease gevonden",
"dhcp_config_saved": "DHCP server configuratie opgeslagen",
"form_error_required": "Vereist veld",
"form_error_ip_format": "Ongeldig IPv4 formaat",
"form_error_mac_format": "Ongeldig MAC formaat.",
"form_error_positive": "Moet groter zijn dan 0",
"dhcp_form_gateway_input": "Gateway IP",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Bereik van IP adressen",
| </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": "Format IPv4 tidak valid",
</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 "enforce_save_search_hint": "AdGuard Home dapat memaksa penelusuran aman pada mesin pencari berikut: Google, Youtube, Bing, dan Yandex.",
</s> add | "dhcp_leases": "DHCP lease overzicht",
"dhcp_leases_not_found": "Geen DHCP lease gevonden",
"dhcp_config_saved": "DHCP server configuratie opgeslagen",
"form_error_required": "Vereist veld",
"form_error_mac_format": "Ongeldig MAC formaat.",
"form_error_positive": "Moet groter zijn dan 0",
"dhcp_form_gateway_input": "Gateway IP",
"dhcp_form_subnet_input": "Subnet mask",
"dhcp_form_range_title": "Bereik van IP adressen", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | - client: allow add ip-v6 to exceptions | https://github.com/AdguardTeam/AdGuardHome/commit/49e800727b2e866fa1f9d429bd1c0c17ce8466b3 | client/src/__locales/nl.json |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.