docstring_tokens
stringlengths
0
76.5k
code_tokens
stringlengths
75
1.81M
label_window
listlengths
4
2.12k
html_url
stringlengths
74
116
file_name
stringlengths
3
311
mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95 h1:n/xhncJPSt0YzfOhnyn41XxUdrWQNgmLBG72FE27Fqw= mvdan.cc/unparam v0.0.0-20230125043941-70a0ce6e7b95/go.mod h1:2vU506e8nGWodqcci641NLi4im2twWSq4Lod756epHQ=
<mask> honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= <mask> honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= <mask> mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= <mask> mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VB...
[ "keep", "keep", "keep", "keep", "replace", "replace" ]
https://github.com/AdguardTeam/AdGuardHome/commit/04f49933854f315857abd572c0dc45473c2fae0d
internal/tools/go.sum
jsonEntry["upstream"] = entry.Upstream
<mask> log.Debug("Querylog: msg.Unpack(entry.OrigAnswer): %s: %s", err, string(entry.OrigAnswer)) <mask> } <mask> } <mask> <mask> return jsonEntry <mask> } <mask> <mask> func answerToMap(a *dns.Msg) []map[string]interface{} { <mask> if a == nil || len(a.Answer) == 0 { </s> + new query logs API + "u...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/json.go
<mask> if getDoubleQuotesEnclosedValue(&c.value) { <mask> c.strict = true <mask> } <mask> <mask> if ct == ctClient && l.conf.AnonymizeClientIP { <mask> c.value = l.getClientIP(c.value) <mask> } <mask> <mask> if ct == ctFilteringStatus && !util.ContainsString(filteringStatusValues, c.value) { <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/qlog_http.go
"search": ctDomainOrClient, "response_status": ctFilteringStatus,
<mask> p.maxFileScanEntries = 0 <mask> } <mask> <mask> paramNames := map[string]criteriaType{ <mask> "filter_domain": ctDomain, <mask> "filter_client": ctClient, <mask> "filter_question_type": ctQuestionType, <mask> "filter_response_status": ctFilteringStatus, <mask> } <mask>...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/qlog_http.go
criteriaType: ctDomainOrClient,
<mask> <mask> // search by domain (strict) <mask> params = newSearchParams() <mask> params.searchCriteria = append(params.searchCriteria, searchCriteria{ <mask> criteriaType: ctDomain, <mask> strict: true, <mask> value: "test.example.org", <mask> }) <mask> entries, _ = l.search(params)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/qlog_test.go
criteriaType: ctDomainOrClient,
<mask> <mask> // search by domain (not strict) <mask> params = newSearchParams() <mask> params.searchCriteria = append(params.searchCriteria, searchCriteria{ <mask> criteriaType: ctDomain, <mask> strict: false, <mask> value: "example.org", <mask> }) <mask> entries, _ = l.search(params)...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/qlog_test.go
criteriaType: ctDomainOrClient,
<mask> <mask> // search by client IP (strict) <mask> params = newSearchParams() <mask> params.searchCriteria = append(params.searchCriteria, searchCriteria{ <mask> criteriaType: ctClient, <mask> strict: true, <mask> value: "2.2.2.2", <mask> }) <mask> entries, _ = l.search(params) <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/qlog_test.go
criteriaType: ctDomainOrClient,
<mask> <mask> // search by client IP (part of) <mask> params = newSearchParams() <mask> params.searchCriteria = append(params.searchCriteria, searchCriteria{ <mask> criteriaType: ctClient, <mask> strict: false, <mask> value: "2.2.2", <mask> }) <mask> entries, _ = l.search(params) <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/qlog_test.go
ctDomainOrClient criteriaType = iota // domain name or client IP address
<mask> <mask> type criteriaType int <mask> <mask> const ( <mask> ctDomain criteriaType = iota // domain name <mask> ctClient // client IP address <mask> ctQuestionType // question type <mask> ctFilteringStatus // filtering st...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
filteringStatusProcessed = "processed" // not blocked, not white-listed entries
<mask> filteringStatusBlockedParental = "blocked_parental" // blocked by parental control <mask> filteringStatusWhitelisted = "whitelisted" // whitelisted <mask> filteringStatusRewritten = "rewritten" // all kinds of rewrites <mask> filteringStatusSafeSearch ...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
filteringStatusProcessed,
<mask> filteringStatusBlockedSafebrowsing, filteringStatusBlockedParental, <mask> filteringStatusWhitelisted, filteringStatusRewritten, filteringStatusSafeSearch, <mask> } <mask> <mask> // searchCriteria - every search request may contain a list of different search criteria <mask> // we use each of them to mat...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
case ctDomainOrClient: return c.quickMatchJSONValue(line, "QH") || c.quickMatchJSONValue(line, "IP")
<mask> func (c *searchCriteria) quickMatch(line string) bool { <mask> // note that we do this only for a limited set of criteria <mask> <mask> switch c.criteriaType { <mask> case ctDomain: <mask> return c.quickMatchJSONValue(line, "QH") <mask> case ctClient: <mask> return c.quickMatchJSONValue(line, "I...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
case ctDomainOrClient:
<mask> // match - checks if the log entry matches this search criteria <mask> // nolint (gocyclo) <mask> func (c *searchCriteria) match(entry *logEntry) bool { <mask> switch c.criteriaType { <mask> case ctDomain: <mask> if c.strict && entry.QHost == c.value { <mask> return true <mask> } <mask> if !c...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
<mask> } <mask> if !c.strict && strings.Contains(entry.QHost, c.value) { <mask> return true <mask> } <mask> return false <mask> case ctClient: <mask> if c.strict && entry.IP == c.value { <mask> return true <mask> } <mask> if !c.strict && strings.Contains(entry.IP, c.value) { <mask> re...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
<mask> if !c.strict && strings.Contains(entry.IP, c.value) { <mask> return true <mask> } <mask> return false <mask> case ctQuestionType: <mask> if c.strict && entry.QType == c.value { <mask> return true <mask> } <mask> if !c.strict && strings.Contains(entry.QType, c.value) { <mask> retur...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
case filteringStatusProcessed: return !(res.Reason == dnsfilter.FilteredBlackList || res.Reason == dnsfilter.FilteredBlockedService || res.Reason == dnsfilter.NotFilteredWhiteList)
<mask> case filteringStatusSafeSearch: <mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch <mask> default: <mask> return false <mask> } <mask> } <mask> <mask> return false </s> + new query logs API + "upstream" + filteringStatusProcessed + ctDomainOrClient remove ctQuesti...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
<mask> return res.IsFiltered && res.Reason == dnsfilter.FilteredSafeSearch <mask> default: <mask> return false <mask> } <mask> <mask> default: <mask> return false <mask> } <mask> <mask> return false <mask> } </s> + new query logs API + "upstream" + filteringStatusProcessed + ctDomainOrClie...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0500aa9591d1fb52f24182734859c398203d6962
querylog/search_criteria.go
const blockButton = ( <> <div className="title--border" /> <button type="button" className={ classNames( 'button-action--arrow-option', { 'bg--dange...
<mask> setModalOpened(false); <mask> } <mask> }; <mask> <mask> const blockButton = <button <mask> className={classNames('title--border text-center button-action--arrow-option', { 'bg--danger': !isBlocked })} <mask> onClick={onToggleBloc...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Cells/index.js
<mask> .custom-select--logs { <mask> padding: 0.5rem 0.75rem 0.5rem 2rem !important; <mask> } <mask> <mask> .bg--danger { <mask> color: var(--danger) !important; <mask> } <mask> <mask> .form-control--search { <mask> box-shadow: 0 1px 0 #ddd; <mask> padding: 0 2.5rem; <mask> height: 2.2...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
@media screen and (max-width: 1024px) { .button-action__container { display: none; } }
<mask> height: 1.6rem; <mask> } <mask> <mask> .button-action__container--detailed { <mask> bottom: 1.3rem; <mask> } <mask> <mask> .button-action { <mask> outline: 0 !important; </s> Pull request: 4775 fix query log issue on tablet devices Updates #4775 Squashed commit of the following: commit...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
padding-top: 0.5rem; padding-bottom: 0.5rem; text-align: center; font-weight: 700;
<mask> background: transparent; <mask> border: 0; <mask> display: block; <mask> width: 100%; <mask> text-align: left; <mask> color: inherit; <mask> } <mask> <mask> .button-action--arrow-option:disabled { <mask> display: none; </s> Pull request: 4775 fix query log issue on tablet ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
cursor: pointer; } .button-action--arrow-option:hover, .button-action--arrow-option:focus { outline: none; } .button-action--arrow-option:focus-visible { outline: 2px solid #295a9f;
<mask> padding-bottom: 0.5rem; <mask> text-align: center; <mask> font-weight: 700; <mask> color: inherit; <mask> } <mask> <mask> .button-action--arrow-option:disabled { <mask> display: none; </s> Pull request: 4775 fix query log issue on tablet devices Updates #4775 Squashed commit of th...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
.tooltip-custom__container .button-action--arrow-option { padding-bottom: 0; text-align: left; font-weight: 400; }
<mask> display: none; <mask> } <mask> <mask> .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover { <mask> background: var(--gray-f3); <mask> overflow: hidden; <mask> } <mask> </s> Pull request: 4775 fix query log issue on tablet devices Updates #4775 Squashed commit of ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
<mask> display: none; <mask> } <mask> <mask> .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover { <mask> cursor: pointer; <mask> background: var(--gray-f3); <mask> overflow: hidden; <mask> } <mask> <mask> .button-action--arrow-option-container { </s> Pull request: ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
.bg--danger { color: var(--danger); } .bg--green { color: var(--green79); }
<mask> font-style: italic; <mask> font-weight: normal; <mask> margin-bottom: 1rem; <mask> } </s> Pull request: 4775 fix query log issue on tablet devices Updates #4775 Squashed commit of the following: commit 9ad85d2306b68227e11c7b1dd792e3fe6389939d Merge: 95aa29d6 41f081d8 Author: Ildar Kamalov <ik...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/Logs.css
MEDIUM_SCREEN_SIZE,
<mask> import queryString from 'query-string'; <mask> import classNames from 'classnames'; <mask> import { <mask> BLOCK_ACTIONS, <mask> SMALL_SCREEN_SIZE, <mask> } from '../../helpers/constants'; <mask> import Loading from '../ui/Loading'; <mask> import Filters from './Filters'; <mask> import Disabled ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/index.js
const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth <= MEDIUM_SCREEN_SIZE);
<mask> <mask> const search = search_url_param || filter?.search || ''; <mask> const response_status = response_status_url_param || filter?.response_status || ''; <mask> <mask> const [isSmallScreen, setIsSmallScreen] = useState(window.innerWidth < SMALL_SCREEN_SIZE); <mask> const [detailedDataCur...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/index.js
const mediaQuery = window.matchMedia(`(max-width: ${MEDIUM_SCREEN_SIZE}px)`);
<mask> setIsLoading(false); <mask> })(); <mask> }, [response_status, search]); <mask> <mask> const mediaQuery = window.matchMedia(`(max-width: ${SMALL_SCREEN_SIZE}px)`); <mask> const mediaQueryHandler = (e) => { <mask> setIsSmallScreen(e.matches); <mask> if (e.ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/components/Logs/index.js
export const MEDIUM_SCREEN_SIZE = 1024;
<mask> ...DHCP_FORM_NAMES, <mask> }; <mask> <mask> export const SMALL_SCREEN_SIZE = 767; <mask> export const MEDIUM_SCREEN_SIZE = 1023; <mask> <mask> export const SECONDS_IN_DAY = 60 * 60 * 24; <mask> <mask> export const UINT32_RANGE = { <mask> MIN: 0, </s> Pull request: 4775 fix query log issue o...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/053bb72a004df5f0eaaef827ee08c78af312fbf8
client/src/helpers/constants.js
<svg className="icons icon12">
<mask> className="btn btn-icon btn-outline-primary btn-sm" <mask> title={t('refresh_btn')} <mask> onClick={() => getAllStats()} <mask> > <mask> <svg className="icons"> <mask> <use xlinkHref="#refresh" /> <mask> </svg> <mask> </button>; <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Dashboard/index.js
<svg className="icons icon12">
<mask> url, <mask> }) <mask> } <mask> > <mask> <svg className="icons"> <mask> <use xlinkHref="#edit" /> <mask> </...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Filters/Table.js
<svg className="icons icon12">
<mask> className="btn btn-icon btn-outline-secondary btn-sm" <mask> onClick={() => handleDelete(url)} <mask> title={t('delete_table_action')} <mask> > <mask> <svg className="icons...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Filters/Table.js
className="icon24"
<mask> </button> <mask> {content && ( <mask> <button className={buttonArrowClass} disabled={processingRules}> <mask> <IconTooltip <mask> className="h-100" <mask> tooltipClass="button...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Logs/Cells/ClientCell.js
.icon24 { width: 24px; height: 24px; } .icon12 { width: 12px; height: 12px; }
<mask> max-height: 100% !important; <mask> } <mask> <mask> .cursor--pointer { <mask> cursor: pointer; <mask> } <mask> <mask> .custom-select__arrow--left { </s> 5505 fix icons Updates #5505 Squashed commit of the following: commit 3d66b82808b9c3904bad8bb32f3927172bfdcda6 Author: Ildar Kamalov <ik@a...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Logs/Logs.css
<mask> width: 100%; <mask> height: 100%; <mask> display: flex; <mask> justify-content: center; <mask> align-items: center; <mask> } <mask> <mask> .button-action:active { <mask> background: var(--btn-block-active); <mask> } </s> 5505 fix icons Updates #5505 Squashed commit of the fo...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Logs/Logs.css
<svg className="icons icon12">
<mask> } <mask> disabled={processingUpdating} <mask> title={t('edit_table_action')} <mask> > <mask> <svg className="icons"> <mask> <use xlinkHref=...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Settings/Clients/ClientsTable/ClientsTable.js
<svg className="icons icon12">
<mask> onClick={() => handleDelete({ name: clientName })} <mask> disabled={processingDeleting} <mask> title={t('delete_table_action')} <mask> > <mask> <svg className="icons"> <ma...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/Settings/Clients/ClientsTable/ClientsTable.js
<symbol id="refresh" viewBox="0 0 24 24" stroke="currentColor" fill="none" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2"> <polyline points="23 4 23 10 17 10"></polyline> <polyline points="1 20 1 14 7 14"></polyline> <path d="M3.51 9a9 9 0 0 1 14.85-3.36L23 10M1...
<mask> <path <mask> d="m19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1 -2.83 0l-.06-.06a1.65 1.65 0 0 0 -1.82-.33 1.65 1.65 0 0 0 -1 1.51v.17a2 2 0 0 1 -2 2 2 2 0 0 1 -2-2v-.09a1.65 1.65 0 0 0 -1.08-1.51 1.65 1.65 0 0 0 -1.82.33l-.06.06a2 2 0 0 1 -2.83 0 2 2 0 0 1 0-2.8...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/ui/Icons.js
<symbol id="chevron-down" width="24" height="24" viewBox="0 0 24 24">
<mask> <path d="M60 54.5h8v40h-8zM60 35.5h8v8h-8z" /> <mask> </svg> <mask> </symbol> <mask> <mask> <symbol id="chevron-down" viewBox="0 0 24 24"> <mask> <g fill="none" fillRule="evenodd"> <mask> <path d="M0 0h24v24H0z" fill="#878787" fillOp...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/ui/Icons.js
<svg className="icons icon12">
<mask> onClick={onClick} <mask> disabled={processingVersion} <mask> title={t('check_updates_now')} <mask> > <mask> <svg className="icons"> <mask> <use xlinkHref="#refresh" /> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/057804a459c2631494a87133f08e4f8da7d73798
client/src/components/ui/Version.js
"encryption_https_desc": "If HTTPS port is configured, AdGuard Home admin interface will be accessible via HTTPS, and it will also provide DNS-over-HTTPS on '\/dns-query' location.",
<mask> "encryption_server_desc": "In order to use HTTPS, you need yo enter the server name that matches your SSL certificate.", <mask> "encryption_redirect": "Redirect to HTTPS automatically", <mask> "encryption_redirect_desc": "If checked, AdGuard Home will automatically redirect you from HTTP to HTTPS ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/__locales/en.json
"encryption_expire": "Expires",
<mask> "encryption_certificates": "Certificates", <mask> "encryption_certificates_desc": "In order to use encryption, you need to provide a valid SSL certificates chain for your domain. You can get a free certificate on <0>{{link}}</0> or you can buy it from one of the trusted Certificate Authorities.", <mas...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/__locales/en.json
"encryption_enable": "Enable Encryption (HTTPS, DNS-over-HTTPS, and DNS-over-TLS)", "encryption_enable_desc": "If encryption is enabled, AdGuard Home admin interface will work over HTTPS, and the DNS server will listen for requests over DNS-over-HTTPS and DNS-over-TLS.", "encryption_chain_valid": "Certifica...
<mask> "encryption_status": "Status", <mask> "encryption_expire": "Expires", <mask> "encryption_key": "Private key", <mask> "encryption_key_input": "Copy/paste your PEM-encoded private key for your cerficate here.", <mask> "topline_expiring_certificate": "Your SSL certificate is about to expire...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/__locales/en.json
"topline_expired_certificate": "Your SSL certificate is expired. Update <0>Encryption settings</0>.",
<mask> "encryption_subject": "Subject", <mask> "encryption_issuer": "Issuer", <mask> "encryption_hostnames": "Hostnames", <mask> "topline_expiring_certificate": "Your SSL certificate is about to expire. Update <0>Encryption settings</0>.", <mask> "form_error_port_range": "Enter port value in th...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/__locales/en.json
<mask> dispatch(findActiveDhcpFailure()); <mask> } <mask> } <mask> }; <mask> <mask> export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST'); <mask> export const getTlsStatusFailure = createAction('GET_TLS_STATUS_FAILURE'); <mask> export const getTlsStatusSuccess = crea...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/actions/index.js
TLS_VALIDATE = { path: 'tls/validate', method: 'POST' };
<mask> // DNS-over-HTTPS and DNS-over-TLS <mask> TLS_STATUS = { path: 'tls/status', method: 'GET' }; <mask> TLS_CONFIG = { path: 'tls/configure', method: 'POST' }; <mask> <mask> getTlsStatus() { <mask> const { path, method } = this.TLS_STATUS; <mask> return this.makeRequest(path,...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/api/Api.js
validateTlsConfig(config) { const { path, method } = this.TLS_VALIDATE; const parameters = { data: config, headers: { 'Content-Type': 'application/json' }, }; return this.makeRequest(path, method, parameters); }
<mask> headers: { 'Content-Type': 'application/json' }, <mask> }; <mask> return this.makeRequest(path, method, parameters); <mask> } <mask> } </s> Added validation on change and enable encryption checkbox </s> remove const encryption = handleActions({ [actions.getTlsStatusReque...
[ "keep", "keep", "keep", "add", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/api/Api.js
import { withNamespaces } from 'react-i18next';
<mask> import React, { Component, Fragment } from 'react'; <mask> import { HashRouter, Route } from 'react-router-dom'; <mask> import PropTypes from 'prop-types'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import LoadingBar from 'react-redux-loading-bar'; <mask> <mask> import 'react-ta...
[ "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/App/index.js
import EncryptionTopline from '../ui/EncryptionTopline';
<mask> import Status from '../ui/Status'; <mask> import Topline from '../ui/Topline'; <mask> import i18n from '../../i18n'; <mask> <mask> class App extends Component { <mask> componentDidMount() { <mask> this.props.getDnsStatus(); </s> Added validation on change and enable encryption checkbox </s> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/App/index.js
<mask> const updateAvailable = <mask> !dashboard.processingVersions && <mask> dashboard.isCoreRunning && <mask> dashboard.isUpdateAvailable; <mask> const isExpiringCertificate = !encryption.processing && encryption.warning; <mask> <mask> return ( <mas...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/App/index.js
{!encryption.processing && <EncryptionTopline notAfter={encryption.not_after} />
<mask> <Topline type="info"> <mask> {dashboard.announcement} <a href={dashboard.announcementUrl} target="_blank" rel="noopener noreferrer">Click here</a> for more info. <mask> </Topline> <mask> } <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/App/index.js
<mask> <mask> class Header extends Component { <mask> state = { <mask> isMenuOpen: false, <mask> isDropdownOpen: false, <mask> }; <mask> <mask> toggleMenuOpen = () => { <mask> this.setState(prevState => ({ isMenuOpen: !prevState.isMenuOpen })); <mask> }; </s> Added v...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Header/index.js
const { isMenuOpen } = this.state;
<mask> render() { <mask> const { dashboard } = this.props; <mask> const badgeClass = classnames({ <mask> 'badge dns-status': true, <mask> 'badge-success': dashboard.protectionEnabled, <mask> 'badge-danger': !dashboard.protectionEnabled, <mask> }); ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Header/index.js
isMenuOpen={isMenuOpen}
<mask> </div> <mask> </div> <mask> <Menu <mask> location={this.props.location} <mask> isMenuOpen={this.state.isMenuOpen} <mask> toggleMenuOpen={this.toggl...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Header/index.js
import { connect } from 'react-redux';
<mask> import React, { Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm, formValueSelector } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> import format from 'date-fns/format'; </s...
[ "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
import { Field, reduxForm, formValueSelector } from 'redux-form';
<mask> import React, { Fragment } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { Field, reduxForm } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderField, renderSelectField, toNumber, p...
[ "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
import format from 'date-fns/format';
<mask> import { Field, reduxForm, formValueSelector } from 'redux-form'; <mask> import { Trans, withNamespaces } from 'react-i18next'; <mask> import flow from 'lodash/flow'; <mask> <mask> import { renderField, renderSelectField, toNumber, port } from '../../../helpers/form'; <mask> import { EMPTY_DATE } from '.....
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
import { EMPTY_DATE } from '../../../helpers/constants';
<mask> import format from 'date-fns/format'; <mask> <mask> import { renderField, renderSelectField, toNumber, port } from '../../../helpers/form'; <mask> import i18n from '../../../i18n'; <mask> <mask> const validate = (values) => { <mask> const errors = {}; </s> Added validation on change and enable encr...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
let Form = (props) => {
<mask> <mask> return errors; <mask> }; <mask> <mask> const Form = (props) => { <mask> const { <mask> t, <mask> handleSubmit, <mask> reset, <mask> invalid, </s> Added validation on change and enable encryption checkbox </s> remove statusCert, statusKey...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
handleChange, isEnabled, certificateChain, privateKey,
<mask> let Form = (props) => { <mask> const { <mask> t, <mask> handleSubmit, <mask> reset, <mask> invalid, <mask> submitting, <mask> processing, </s> Added validation on change and enable encryption checkbox </s> remove const Form = (props) => { </s> add let...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
not_after, valid_chain, valid_key, dns_names, key_type, issuer, subject, warning_validation,
<mask> reset, <mask> invalid, <mask> submitting, <mask> processing, <mask> statusCert, <mask> statusKey, <mask> } = props; <mask> <mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> <div className="row"> </s> Added validat...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
<div className="col-12"> <div className="form__group form__group--settings"> <Field name="enabled" type="checkbox" component={renderSelectField} pla...
<mask> return ( <mask> <form onSubmit={handleSubmit}> <mask> <div className="row"> <mask> <div className="col-12"> <mask> <label className="form__label" htmlFor="server_name"> <mask> <Trans>encryption_server</Trans> <mask> ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
onChange={handleChange} disabled={!isEnabled}
<mask> className="form-control" <mask> placeholder={t('encryption_server_enter')} <mask> /> <mask> <div className="form__desc"> <mask> <Trans>encryption_server_desc</Trans> <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
onChange={handleChange} disabled={!isEnabled}
<mask> component={renderSelectField} <mask> placeholder={t('encryption_redirect')} <mask> /> <mask> <div className="form__desc"> <mask> <Trans>encryption_redirect_desc</Trans> <mask>...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
onChange={handleChange} disabled={!isEnabled}
<mask> className="form-control" <mask> placeholder={t('encryption_https')} <mask> validate={[port]} <mask> normalize={toNumber} <mask> /> <mask> <div clas...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
onChange={handleChange} disabled={!isEnabled}
<mask> validate={[port]} <mask> normalize={toNumber} <mask> /> <mask> <div className="form__desc"> <mask> <Trans>encryption_dot_desc</Trans> <mask> </div> </...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
onChange={handleChange} disabled={!isEnabled}
<mask> type="text" <mask> className="form-control form-control--textarea" <mask> placeholder={t('encryption_certificates_input')} <mask> /> <mask> <div className="form__status"> <mas...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
{certificateChain &&
<mask> className="form-control form-control--textarea" <mask> placeholder={t('encryption_certificates_input')} <mask> /> <mask> <div className="form__status"> <mask> {statusCert && <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
<ul> <li className={valid_chain ? 'text-success' : 'text-danger'}> {valid_chain ? <Trans>encryption_chain_valid</Trans> ...
<mask> <Fragment> <mask> <div className="form__label form__label--bold"> <mask> <Trans>encryption_status</Trans>: <mask> </div> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
<mask> {statusCert} <mask> </div> <mask> </Fragment> <mask> } <mask> {/* <div> <mask> <Trans values={{ domains: '*.exa...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
onChange={handleChange} disabled={!isEnabled}
<mask> type="text" <mask> className="form-control form-control--textarea" <mask> placeholder="Copy/paste your PEM-encoded private key for your cerficate here." <mask> /> <mask> <div c...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
{privateKey &&
<mask> className="form-control form-control--textarea" <mask> placeholder="Copy/paste your PEM-encoded private key for your cerficate here." <mask> /> <mask> <div className="form__status"> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
<p className={valid_key ? 'text-success' : 'text-danger'}> {valid_key ? <Trans values={{ type: key_type }}> encryption_key_valid ...
<mask> <Fragment> <mask> <div className="form__label form__label--bold"> <mask> <Trans>encryption_status</Trans>: <mask> </div> <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
<div className="col-12"> <p className="text-danger"> {warning_validation && warning_validation} </p> </div>
<mask> </div> <mask> </div> <mask> </div> <mask> </div> <mask> <mask> <div className="btn-list mt-2"> <mask> <button </s> Added validation on change and enable encryption checkbox </s> remove <div cl...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
<div className="btn-list mt-2">
<mask> </div> <mask> </div> <mask> </div> <mask> <mask> <div className="btn-list"> <mask> <button <mask> type="submit" <mask> className="btn btn-success btn-standart" <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
disabled={ invalid || submitting || processing || !valid_chain || !valid_key || warning_validation }
<mask> <div className="btn-list"> <mask> <button <mask> type="submit" <mask> className="btn btn-success btn-standart" <mask> disabled={invalid || submitting || processing} <mask> > <mask> <...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
type="button"
<mask> > <mask> <Trans>save_config</Trans> <mask> </button> <mask> <button <mask> type="submit" <mask> className="btn btn-secondary btn-standart" <mask> disabled={submitting || processi...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
handleChange: PropTypes.func, isEnabled: PropTypes.bool.isRequired, certificateChain: PropTypes.string.isRequired, privateKey: PropTypes.string.isRequired,
<mask> Form.propTypes = { <mask> handleSubmit: PropTypes.func.isRequired, <mask> reset: PropTypes.func.isRequired, <mask> submitting: PropTypes.bool.isRequired, <mask> invalid: PropTypes.bool.isRequired, <mask> initialValues: PropTypes.object.isRequired, <mask> processing: PropTypes.bool....
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
status_key: PropTypes.string, not_after: PropTypes.string, warning_validation: PropTypes.string, valid_chain: PropTypes.bool, valid_key: PropTypes.bool, dns_names: PropTypes.string, key_type: PropTypes.string, issuer: PropTypes.string, subject: PropTypes.string,
<mask> submitting: PropTypes.bool.isRequired, <mask> invalid: PropTypes.bool.isRequired, <mask> initialValues: PropTypes.object.isRequired, <mask> processing: PropTypes.bool.isRequired, <mask> statusCert: PropTypes.string, <mask> statusKey: PropTypes.string, <mask> t: PropTypes.func.i...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
const selector = formValueSelector('encryptionForm'); Form = connect((state) => { const isEnabled = selector(state, 'enabled'); const certificateChain = selector(state, 'certificate_chain'); const privateKey = selector(state, 'private_key'); return { isEnabled, certificateChain, ...
<mask> subject: PropTypes.string, <mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default flow([ <mask> withNamespaces(), <mask> reduxForm({ <mask> form: 'encryptionForm', </s> Added validation on change and enable encryption checkbox </s> remove statusCert: Pro...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/Form.js
import debounce from 'lodash/debounce';
<mask> import React, { Component } from 'react'; <mask> import PropTypes from 'prop-types'; <mask> import { withNamespaces } from 'react-i18next'; <mask> <mask> import Form from './Form'; <mask> import Card from '../../ui/Card'; <mask> </s> Added validation on change and enable encryption checkbox </s> remove...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
handleFormChange = debounce((values) => { this.props.validateTlsConfig(values); }, 300);
<mask> }; <mask> <mask> render() { <mask> const { encryption, t } = this.props; <mask> const { <mask> enabled, </s> Added validation on change and enable encryption checkbox </s> remove processing, processingConfig, status_cert: statusCert,...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
enabled, server_name, force_https, port_https, port_dns_over_tls, certificate_chain, private_key,
<mask> <mask> render() { <mask> const { encryption, t } = this.props; <mask> const { <mask> processing, <mask> processingConfig, <mask> status_cert: statusCert, <mask> status_key: statusKey, <mask> ...values <mask> } = en...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
initialValues={{ enabled, server_name, force_https, port_https, port_dns_over_tls, certificate_chain...
<mask> subtitle={t('encryption_desc')} <mask> bodyType="card-body box-body--settings" <mask> > <mask> <Form <mask> initialValues={{ ...values }} <mask> processing={en...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
<mask> > <mask> <Form <mask> initialValues={{ ...values }} <mask> processing={encryption.processingConfig} <mask> statusCert={statusCert} <mask> statusKey={st...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
onChange={this.handleFormChange} {...this.props.encryption}
<mask> processing={encryption.processingConfig} <mask> onSubmit={this.handleFormSubmit} <mask> /> <mask> </Card> <mask> } <mask> </div> </s> Added validation on change and enable encryp...
[ "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
validateTlsConfig: PropTypes.func.isRequired,
<mask> Encryption.propTypes = { <mask> setTlsConfig: PropTypes.func.isRequired, <mask> encryption: PropTypes.object.isRequired, <mask> t: PropTypes.func.isRequired, <mask> }; <mask> <mask> export default withNamespaces()(Encryption); </s> Added validation on change and enable encryption checkbox </...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/Encryption/index.js
validateTlsConfig={this.props.validateTlsConfig}
<mask> encryption={this.props.encryption} <mask> setTlsConfig={this.props.setTlsConfig} <mask> /> <mask> <Dhcp <mask> dhcp={this.props.dhcp} <...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/components/Settings/index.js
} from '../actions'; import {
<mask> getDhcpInterfaces, <mask> setDhcpConfig, <mask> findActiveDhcp, <mask> getTlsStatus, <mask> setTlsConfig, <mask> validateTlsConfig, <mask> } from '../actions/encryption'; </s> Added validation on change and enable encryption checkbox </s> remove } from '../actions'; </s> add ...
[ "keep", "keep", "add", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/containers/Settings.js
validateTlsConfig, } from '../actions/encryption';
<mask> setDhcpConfig, <mask> findActiveDhcp, <mask> getTlsStatus, <mask> setTlsConfig, <mask> } from '../actions'; <mask> import Settings from '../components/Settings'; <mask> <mask> const mapStateToProps = (state) => { <mask> const { <mask> settings, </s> Added validation on cha...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/containers/Settings.js
validateTlsConfig,
<mask> setDhcpConfig, <mask> findActiveDhcp, <mask> getTlsStatus, <mask> setTlsConfig, <mask> }; <mask> <mask> export default connect( <mask> mapStateToProps, <mask> mapDispatchToProps, </s> Added validation on change and enable encryption checkbox </s> remove } from '../actions'; </...
[ "keep", "keep", "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/containers/Settings.js
export const EMPTY_DATE = '0001-01-01T00:00:00Z';
<mask> }; <mask> <mask> export const STANDARD_DNS_PORT = 53; <mask> export const STANDARD_WEB_PORT = 80; </s> Added validation on change and enable encryption checkbox </s> remove export const getTlsStatusRequest = createAction('GET_TLS_STATUS_REQUEST'); export const getTlsStatusFailure = createAction('GET_TLS_S...
[ "keep", "keep", "keep", "add" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/helpers/constants.js
import encryption from './encryption';
<mask> import * as actions from '../actions'; <mask> import toasts from './toasts'; <mask> <mask> const settings = handleActions({ <mask> [actions.initSettingsRequest]: state => ({ ...state, processing: true }), <mask> [actions.initSettingsFailure]: state => ({ ...state, processing: false }), <mask> ...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/reducers/index.js
<mask> active: null, <mask> leases: [], <mask> }); <mask> <mask> const encryption = handleActions({ <mask> [actions.getTlsStatusRequest]: state => ({ ...state, processing: true }), <mask> [actions.getTlsStatusFailure]: state => ({ ...state, processing: false }), <mask> [actions.getTlsStatus...
[ "keep", "keep", "keep", "keep", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "replace", "re...
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
client/src/reducers/index.js
Enabled bool `yaml:"enabled" json:"enabled"`
<mask> <mask> var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"} <mask> <mask> type tlsConfigSettings struct { <mask> Enabled bool `yaml:"enaled" json:"enabled"` <mask> ServerName string `yaml:"server_name" json:"server_name,omitempty"` <mask> ForceHTTPS bool `yaml:"force_https" ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/05cce8b1073dd4c005157177bdc129cba813a12c
config.go
// // Algorithm: // . Get the list of filters to be updated // . For each filter run the download and checksum check operation // . If filter data hasn't changed, set new update time // . If filter data has changed, parse it, save it on disk, set new update time // . Apply changes to the current configuration // . R...
<mask> // Checks filters updates if necessary <mask> // If force is true, it ignores the filter.LastUpdated field value <mask> func refreshFiltersIfNecessary(force bool) int { <mask> var updateFilters []filter <mask> <mask> config.RLock() <mask> for i := range config.Filters { <mask> f := &config.Filters[...
[ "keep", "add", "keep", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a
filter.go
var updateFilters []filter
<mask> <mask> // Checks filters updates if necessary <mask> // If force is true, it ignores the filter.LastUpdated field value <mask> func refreshFiltersIfNecessary(force bool) int { <mask> config.Lock() <mask> <mask> // fetch URLs <mask> updateCount := 0 <mask> for i := range config.Filters { <mask> ...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a
filter.go
config.RLock()
<mask> // If force is true, it ignores the filter.LastUpdated field value <mask> func refreshFiltersIfNecessary(force bool) int { <mask> config.Lock() <mask> <mask> // fetch URLs <mask> updateCount := 0 <mask> for i := range config.Filters { <mask> filter := &config.Filters[i] // otherwise we will be ope...
[ "keep", "keep", "keep", "keep", "replace", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a
filter.go
f := &config.Filters[i] // otherwise we will be operating on a copy
<mask> <mask> // fetch URLs <mask> updateCount := 0 <mask> for i := range config.Filters { <mask> filter := &config.Filters[i] // otherwise we will be operating on a copy <mask> <mask> if !filter.Enabled { <mask> continue <mask> } <mask> </s> * filters: rework update mechanism so that UI doesn...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a
filter.go
if !f.Enabled {
<mask> updateCount := 0 <mask> for i := range config.Filters { <mask> filter := &config.Filters[i] // otherwise we will be operating on a copy <mask> <mask> if !filter.Enabled { <mask> continue <mask> } <mask> <mask> if !force && time.Since(filter.LastUpdated) <= updatePeriod { <mask> contin...
[ "keep", "keep", "keep", "keep", "replace", "keep", "keep", "keep", "keep", "keep" ]
https://github.com/AdguardTeam/AdGuardHome/commit/0647f3fe8666a38cbdc7a747279513338e49568a
filter.go