docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
border-top: 1px solid var(--card-border-color); | <mask> .counters__row {
<mask> display: flex;
<mask> align-items: center;
<mask> justify-content: space-between;
<mask> border-top: 1px solid #dee2e6;
<mask> padding: 0.75rem 1.5rem;
<mask> }
<mask>
<mask> .counters__column--value {
<mask> flex-shrink: 0;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Dashboard/Dashboard.css |
border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); | <mask> .nav-tabs .nav-link.active {
<mask> border-color: var(--green-74);
<mask> color: var(--green-74);
<mask> background: transparent;
<mask> }
<mask>
<mask> .nav-tabs .nav-link.active:hover {
<mask> border-color: #58a273;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); </s> remove border-color: #448700;
</s> add border-color: #4b9400; | [
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Header/Header.css |
border-color: #4b9400;
color: #4b9400; | <mask> background: transparent;
<mask> }
<mask>
<mask> .nav-tabs .nav-link.active:hover {
<mask> border-color: #58a273;
<mask> color: #58a273;
<mask> }
<mask>
<mask> .nav-icon {
<mask> width: 15px;
<mask> height: 15px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove border-color: #3e7a00;
</s> add border-color: #448700; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Header/Header.css |
color: var(--mcolor); | <mask> box-shadow: 2px 4px 8px rgba(0, 0, 0, 0.2);
<mask> border-radius: 4px !important;
<mask> pointer-events: auto !important;
<mask> background-color: var(--ctrl-bgcolor);
<mask> color: var(--scolor);
<mask> z-index: 102;
<mask> overflow-y: auto;
<mask> max-height: 100%;
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Cells/IconTooltip.css |
[data-theme="dark"] {
--red: rgba(223, 56, 18, 0.25);
--green-pale: rgba(103, 178, 121, 0.25);
--yellow: rgba(247, 181, 0, 0.2);
}
| <mask> --btn-unblock-active: #4d4d4d;
<mask> --option-border-radius: 4px;
<mask> }
<mask>
<mask> .logs__text {
<mask> padding: 0 1px;
<mask> text-overflow: ellipsis;
<mask> white-space: nowrap;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
[data-theme="dark"] .logs__text a {
color: var(--gray-f3);
}
[data-theme="dark"] .logs__text a:hover {
color: var(--gray-f3);
}
| <mask> }
<mask>
<mask> .logs__text--bold {
<mask> font-weight: 600;
<mask> }
<mask>
<mask> .logs__time {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
[data-theme=dark] .icon--selected {
opacity: 0.75;
}
| <mask> }
<mask>
<mask> .text-pre {
<mask> white-space: pre-wrap !important;
<mask> overflow-wrap: break-word;
<mask> overflow: visible;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove color: var(--scolor);
</s> add color: var(--mcolor); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
@media screen and (min-width: 1025px) {
.logs__cell--client {
width: 13rem;
}
}
| <mask> position: relative;
<mask> }
<mask>
<mask> .logs__cell--header__container > .logs__cell--header__item {
<mask> border-right: 0;
<mask> font-size: 1rem;
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
[data-theme="dark"] .tooltip-custom__container .button-action--arrow-option:not(:disabled):hover {
background: var(--ctrl-dropdown-bgcolor-focus);
}
| <mask> overflow: hidden;
<mask> }
<mask>
<mask> .button-action--arrow-option-container {
<mask> overflow: visible;
<mask> transform-origin: left;
<mask> padding: 1rem 0;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
[data-theme="dark"] .logs__question.icon--lightgray {
color: var(--gray-f3);
}
| <mask> color: var(--green79);
<mask> }
<mask>
<mask> @media (max-width: 1024px) {
<mask> .logs__question {
<mask> display: none;
<mask> }
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
.logs__modal-wrap {
padding: 1rem 1.5rem;
background-color: var(--card-bgcolor);
} | <mask>
<mask> .logs__modal {
<mask> max-width: 720px;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/Logs.css |
width: 'calc(100% - 32px)', | <mask> isOpen={isSmallScreen && isModalOpened}
<mask> onRequestClose={closeModal}
<mask> style={{
<mask> content: {
<mask> width: '100%',
<mask> height: 'fit-content',
<mask> left: '50%',
<mask> top: 47,
<mask> padding: '1rem 1.5rem 1rem',
<mask> maxWidth: '720px',
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove padding: '1rem 1.5rem 1rem',
</s> add padding: '0', </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/index.js |
padding: '0', | <mask> width: '100%',
<mask> height: 'fit-content',
<mask> left: '50%',
<mask> top: 47,
<mask> padding: '1rem 1.5rem 1rem',
<mask> maxWidth: '720px',
<mask> transform: 'translateX(-50%)',
<mask> },
<mask> overlay: {
<mask> backgroundColor: 'rgba(0,0,0,0.5)',
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove width: '100%',
</s> add width: 'calc(100% - 32px)', </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove stroke: 'black',
</s> add stroke: 'currentColor', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Logs/index.js |
border: 1px solid var(--card-border-color); | <mask> flex-direction: row-reverse;
<mask> align-items: center;
<mask> margin-bottom: 15px;
<mask> padding: 10px 15px;
<mask> border: 1px solid #eee;
<mask> border-radius: 4px;
<mask> cursor: pointer;
<mask> }
<mask>
<mask> .service__text {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/Settings/Clients/Service.css |
background-color: var(--btn-success-bgcolor); | <mask> .dropdown-item.active,
<mask> .dropdown-item:active {
<mask> background-color: var(--green-74);
<mask> }
<mask>
<mask> .dropdown-menu {
<mask> cursor: default;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Dropdown.css |
import React, { useState, useEffect } from 'react'; | <mask> import React from 'react';
<mask> import { useTranslation } from 'react-i18next';
<mask> import { useDispatch, useSelector } from 'react-redux';
<mask> import classNames from 'classnames';
<mask>
<mask> import { REPOSITORY, PRIVACY_POLICY_LINK, THEMES } from '../../helpers/constants';
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; | <mask>
<mask> import Version from './Version';
<mask> import './Footer.css';
<mask> import './Select.css';
<mask> import { setHtmlLangAttr } from '../../helpers/helpers';
<mask> import { changeTheme } from '../../actions';
<mask>
<mask> const linksData = [
<mask> {
<mask> href: REPOSITORY.URL,
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove import React from 'react';
</s> add import React, { useState, useEffect } from 'react'; </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
const [currentThemeLocal, setCurrentThemeLocal] = useState('auto');
useEffect(() => {
if (!isLoggedIn) {
setUITheme(window.matchMedia('(prefers-color-scheme: dark)').matches ? THEMES.dark : THEMES.light);
}
}, []); | <mask> const profileName = useSelector((state) => (state.dashboard ? state.dashboard.name : ''));
<mask> const isLoggedIn = profileName !== '';
<mask>
<mask> const getYear = () => {
<mask> const today = new Date();
<mask> return today.getFullYear();
<mask> };
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
const onThemeChangedLocal = (event) => {
const { value } = event.target;
setUITheme(value);
setCurrentThemeLocal(value);
};
| <mask> };
<mask>
<mask> const renderCopyright = () => <div className="footer__column">
<mask> <div className="footer__copyright">
<mask> {t('copyright')} © {getYear()}{' '}
<mask> <a target="_blank" rel="noopener noreferrer" href="https://link.adtidy.org/forward.html?action=home&from=ui&app=home">AdGuard</a>
<mask> </div>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} </s> remove <img src={logo} className="h-6" alt="logo" />
</s> add <img src={logo} className="h-6 login__logo" alt="logo" /> </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); | <mask> >
<mask> {t(name)}
<mask> </a>);
<mask>
<mask> const renderThemeSelect = (currentTheme, isLoggedIn) => {
<mask> if (!isLoggedIn) {
<mask> return '';
<mask> }
<mask>
<mask> return <select
<mask> className="form-control select select--theme"
<mask> value={currentTheme}
<mask> onChange={onThemeChanged}
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove import { setHtmlLangAttr } from '../../helpers/helpers';
</s> add import { setHtmlLangAttr, setUITheme } from '../../helpers/helpers'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
const renderThemeSelect = () => (
<select | <mask> if (!isLoggedIn) {
<mask> return '';
<mask> }
<mask>
<mask> return <select
<mask> className="form-control select select--theme"
<mask> value={currentTheme}
<mask> onChange={onThemeChanged}
<mask> >
<mask> {Object.values(THEMES)
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
{themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); | <mask> className="form-control select select--theme"
<mask> value={currentTheme}
<mask> onChange={onThemeChanged}
<mask> >
<mask> {Object.values(THEMES)
<mask> .map((theme) => (
<mask> <option key={theme} value={theme}>
<mask> {t(`theme_${theme}`)}
<mask> </option>
<mask> ))}
<mask> </select>;
<mask> };
<mask>
<mask> return (
<mask> <>
<mask> <footer className="footer">
<mask> <div className="container">
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove <img src={logo} className="h-6" alt="logo" />
</s> add <img src={logo} className="h-6 login__logo" alt="logo" /> </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
{isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} | <mask> <div className="footer__column footer__column--links">
<mask> {renderLinks(linksData)}
<mask> </div>
<mask> <div className="footer__column footer__column--theme">
<mask> {renderThemeSelect(currentTheme, isLoggedIn)}
<mask> </div>
<mask> <div className="footer__column footer__column--language">
<mask> <select
<mask> className="form-control select select--language"
<mask> value={i18n.language}
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove <img src={logo} className="h-6" alt="logo" />
</s> add <img src={logo} className="h-6 login__logo" alt="logo" /> </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Footer.js |
.card-chart-bg {
color: var(--black);
}
| <mask> .line__tooltip-text {
<mask> font-size: 0.7rem;
<mask> }
<mask>
<mask> .card-chart-bg path[d^="M0,32"] {
<mask> transform: translateY(32px);
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Line.css |
stroke: 'currentColor', | <mask> data={data}
<mask> theme={{
<mask> crosshair: {
<mask> line: {
<mask> stroke: 'black',
<mask> strokeWidth: 1,
<mask> strokeOpacity: 0.35,
<mask> },
<mask> },
<mask> }}
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove strokeOpacity: 0.35,
</s> add strokeOpacity: 0.5, </s> remove padding: '1rem 1.5rem 1rem',
</s> add padding: '0', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Line.js |
strokeOpacity: 0.5, | <mask> crosshair: {
<mask> line: {
<mask> stroke: 'black',
<mask> strokeWidth: 1,
<mask> strokeOpacity: 0.35,
<mask> },
<mask> },
<mask> }}
<mask> xScale={{
<mask> type: 'linear',
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove stroke: 'black',
</s> add stroke: 'currentColor', </s> remove padding: '1rem 1.5rem 1rem',
</s> add padding: '0', | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Line.js |
background-color: var(--loading-bg); | <mask> left: 0;
<mask> z-index: 100;
<mask> width: 100%;
<mask> min-height: 100vh;
<mask> background-color: rgba(255, 255, 255, 0.48);
<mask> }
<mask>
<mask> .loading:after {
<mask> content: "";
<mask> position: fixed;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove width: '100%',
</s> add width: 'calc(100% - 32px)', </s> remove color: var(--scolor);
</s> add color: var(--mcolor); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Loading.css |
.ReactTable .-loading .-loading-inner {
color: var(--gray300);
}
| <mask> }
<mask>
<mask> .ReactTable .-pagination input, .ReactTable .-pagination select {
<mask> color: var(--rt-nodata-color);
<mask> background-color: var(--rt-nodata-bgcolor);
<mask> }
<mask>
<mask> [data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-track {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/ReactTable.css |
[data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-track {
background-color: var(--card-bgcolor);
}
[data-theme=dark] .ReactTable .rt-table::-webkit-scrollbar-thumb {
background-color: #888888;
}
| <mask> background-color: var(--rt-nodata-bgcolor);
<mask> }
<mask>
<mask> [data-theme=dark] .ReactTable .-pagination .-btn {
<mask> filter: invert(1);
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove color: var(--scolor);
background-color: var(--ctrl-bgcolor);
</s> add filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/ReactTable.css |
filter: invert(1);
}
[data-theme=dark] .ReactTable .-pagination .-btn:disabled {
opacity: 1; | <mask> background-color: var(--rt-nodata-bgcolor);
<mask> }
<mask>
<mask> [data-theme=dark] .ReactTable .-pagination .-btn {
<mask> color: var(--scolor);
<mask> background-color: var(--ctrl-bgcolor);
<mask> }
<mask>
<mask> .rt-tr-group.logs__row--red {
<mask> background-color: rgba(223, 56, 18, 0.05);
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove color: var(--scolor);
</s> add color: var(--mcolor); </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/ReactTable.css |
border-color: var(--btn-success-bgcolor); | <mask>
<mask> .btn-success {
<mask> color: #fff;
<mask> background-color: var(--btn-success-bgcolor);
<mask> border-color: #5eba00;
<mask> }
<mask>
<mask> .btn-success:hover {
<mask> color: #fff;
<mask> background-color: #4b9400;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
border-color: #4b9400; | <mask>
<mask> .btn-success:hover {
<mask> color: #fff;
<mask> background-color: #4b9400;
<mask> border-color: #448700;
<mask> }
<mask>
<mask> .btn-success:focus,
<mask> .btn-success.focus {
<mask> box-shadow: 0 0 0 2px rgba(94, 186, 0, 0.5);
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove border-color: #3e7a00;
</s> add border-color: #448700; </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
border-color: #448700; | <mask> .btn-success:not(:disabled):not(.disabled).active,
<mask> .show>.btn-success.dropdown-toggle {
<mask> color: #fff;
<mask> background-color: #448700;
<mask> border-color: #3e7a00;
<mask> }
<mask>
<mask> .btn-success:not(:disabled):not(.disabled):active:focus,
<mask> .btn-success:not(:disabled):not(.disabled).active:focus,
<mask> .show>.btn-success.dropdown-toggle:focus {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #448700;
</s> add border-color: #4b9400; </s> remove border-color: #5eba00;
</s> add border-color: var(--btn-success-bgcolor); </s> remove border-color: var(--green-74);
color: var(--green-74);
</s> add border-color: var(--btn-success-bgcolor);
color: var(--btn-success-bgcolor); </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
[data-theme=dark] .dropdown-menu {
border: 1px solid var(--card-border-color);
}
| <mask> }
<mask>
<mask> .dropup .dropdown-menu {
<mask> margin-top: 0;
<mask> margin-bottom: 0.125rem;
<mask> }
<mask>
<mask> .dropup .dropdown-toggle::after {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: var(--green-74);
</s> add background-color: var(--btn-success-bgcolor); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
border-bottom: 1px solid var(--card-border-color); | <mask> align-items: flex-start;
<mask> -ms-flex-pack: justify;
<mask> justify-content: space-between;
<mask> padding: 1rem;
<mask> border-bottom: 1px solid #e9ecef;
<mask> border-top-left-radius: 3px;
<mask> border-top-right-radius: 3px;
<mask> }
<mask>
<mask> .modal-header .close {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
border-top: 1px solid var(--card-border-color); | <mask> align-items: center;
<mask> -ms-flex-pack: end;
<mask> justify-content: flex-end;
<mask> padding: 1rem;
<mask> border-top: 1px solid #e9ecef;
<mask> }
<mask>
<mask> .modal-footer> :not(:first-child) {
<mask> margin-left: 0.25rem;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
[data-theme=dark] .dropdown-item {
color: #ffffff;
}
| <mask> color: #6e7687;
<mask> }
<mask>
<mask> .dropdown-menu-arrow:before {
<mask> position: absolute;
<mask> top: -6px;
<mask> left: 12px;
<mask> display: inline-block;
<mask> border-right: 5px solid transparent;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-color: #58a273;
color: #58a273;
</s> add border-color: #4b9400;
color: #4b9400; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
[data-theme=dark] .dropdown-menu-arrow:after {
border-bottom: 5px solid var(--card-border-color);
}
| <mask> }
<mask>
<mask> .dropdown-menu-arrow.dropdown-menu-right:before,
<mask> .dropdown-menu-arrow.dropdown-menu-right:after {
<mask> left: auto;
<mask> right: 12px;
<mask> }
<mask>
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
[data-theme=dark] .custom-switch-indicator {
opacity: 0.75;
}
| <mask> border: 1px solid rgba(0, 40, 100, 0.12);
<mask> transition: 0.3s border-color, 0.3s background-color;
<mask> }
<mask>
<mask> .custom-switch-indicator:before {
<mask> content: "";
<mask> position: absolute;
<mask> height: calc(1.25rem - 4px);
<mask> width: calc(1.25rem - 4px);
<mask> top: 1px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove width: '100%',
</s> add width: 'calc(100% - 32px)', </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabler.css |
border-bottom: 1px solid var(--card-border-color); | <mask> display: flex;
<mask> justify-content: space-between;
<mask> margin-bottom: 15px;
<mask> padding: 10px 0;
<mask> border-bottom: 1px solid #e8e8e8;
<mask> overflow: auto;
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .tabs__controls {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-top: 1px solid #dee2e6;
</s> add border-top: 1px solid var(--card-border-color); </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove border-bottom: 1px solid #e9ecef;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabs.css |
[data-theme=dark] .tab__control {
filter: invert(1);
}
| <mask> cursor: pointer;
<mask> opacity: 0.6;
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .tab__control {
<mask> white-space: normal;
<mask> }
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/components/ui/Tabs.css |
background-color: var(--card-bgcolor); | <mask> max-width: 650px;
<mask> margin: 0 auto;
<mask> padding: 30px 20px;
<mask> line-height: 1.6;
<mask> background-color: #fff;
<mask> box-shadow: 0 1px 4px rgba(74, 74, 74, 0.36);
<mask> border-radius: 3px;
<mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); </s> remove border-color: #448700;
</s> add border-color: #4b9400; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/install/Setup/Setup.css |
[data-theme=dark] .setup__container {
box-shadow: none;
border: 1px solid var(--card-border-color);
}
| <mask> }
<mask>
<mask> @media screen and (min-width: 768px) {
<mask> .setup__container {
<mask> width: 650px;
<mask> padding: 40px 30px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove border-bottom: 1px solid #e8e8e8;
</s> add border-bottom: 1px solid var(--card-border-color); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/install/Setup/Setup.css |
[data-theme=dark] .setup__logo {
filter: invert(1);
}
| <mask> max-width: 140px;
<mask> }
<mask>
<mask> .setup__nav {
<mask> text-align: center;
<mask> }
<mask>
<mask> .setup__step {
<mask> margin-bottom: 25px;
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove border: 1px solid #eee;
</s> add border: 1px solid var(--card-border-color); </s> remove border-top: 1px solid #e9ecef;
</s> add border-top: 1px solid var(--card-border-color); | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/install/Setup/Setup.css |
[data-theme=dark] .login__logo {
filter: invert(1);
}
| <mask> }
<mask>
<mask> .login__form {
<mask> margin: auto;
<mask> padding: 40px 15px 100px;
<mask> width: 100%;
<mask> max-width: 24rem;
<mask> }
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove background-color: #fff;
</s> add background-color: var(--card-bgcolor); </s> remove background-color: rgba(255, 255, 255, 0.48);
</s> add background-color: var(--loading-bg); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/login/Login/Login.css |
<img src={logo} className="h-6 login__logo" alt="logo" /> | <mask> return (
<mask> <div className="login">
<mask> <div className="login__form">
<mask> <div className="text-center mb-6">
<mask> <img src={logo} className="h-6" alt="logo" />
<mask> </div>
<mask> <Form onSubmit={this.handleSubmit} processing={processingLogin} />
<mask> <div className="login__info">
<mask> <button
<mask> type="button"
</s> Fix dark theme bugs
Updates #5375
Squashed commit of the following:
commit 40666b010697381e11b3a36d9c2ed1c1507f27ed
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 18:34:06 2023 +0200
Review fix
commit 44f3d6095bc9b426e8142f8c9d915a1441f3d791
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 17:02:38 2023 +0200
Clear
commit 44274ba54c9ff2bd2caf5fa69bf06c587f8858e5
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 13:25:01 2023 +0200
Clear
commit 8b48c523cbbe3f73160331a9c516388c7965a7a2
Author: Arseny Lisin <[email protected]>
Date: Tue Jan 31 12:14:37 2023 +0200
Review fix
commit 3b8cd94cdd8d3fc90cdc27053964489414055cc9
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 16:13:15 2023 +0200
Fix query log popup bg
commit 14d4c87164200f7c918bac02c9cc5f1cffb83932
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 15:03:06 2023 +0200
revert icons
commit 98b042726e1510f85c9cf5a4caba2d56885f120b
Author: Arseny Lisin <[email protected]>
Date: Mon Jan 30 14:45:35 2023 +0200
Fix dark theme bugs </s> remove {renderThemeSelect(currentTheme, isLoggedIn)}
</s> add {isLoggedIn ? renderThemeSelect() : renderThemeSelectLocal()} </s> remove {Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))}
</select>;
};
</s> add {themeSelectOptions()}
</select>
);
const renderThemeSelectLocal = () => (
<select
className="form-control select select--theme"
value={currentThemeLocal}
onChange={onThemeChangedLocal}
>
{themeSelectOptions()}
</select>
); </s> remove return <select
</s> add const renderThemeSelect = () => (
<select </s> remove const renderThemeSelect = (currentTheme, isLoggedIn) => {
if (!isLoggedIn) {
return '';
}
</s> add const themeSelectOptions = () => (
Object.values(THEMES)
.map((theme) => (
<option key={theme} value={theme}>
{t(`theme_${theme}`)}
</option>
))
); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46382e88250d9734a6e634fa79376334ee1fbe24 | client/src/login/Login/index.js |
'dockerGo': 'adguard/golang-ubuntu:3.3' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
<mask>
<mask> 'stages':
<mask> - 'Make release':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:3.3' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Build final releases on release branches manually.
<mask> 'triggers': []
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:3.3' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:3.3' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:3.1'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request: bamboo-specs: upd go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit b7f0f61d9c8b0eef753ee24c18a477299a455e94
Author: Ainar Garipov <[email protected]>
Date: Wed Jul 14 12:04:59 2021 +0300
bamboo-specs: upd go </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:3.1'
</s> add 'dockerGo': 'adguard/golang-ubuntu:3.3' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4684c8e4ed83e904d705a501e30aa52a0bfe33b4 | bamboo-specs/test.yaml |
github.com/AdguardTeam/dnsproxy v0.40.1 | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.40.0
<mask> github.com/AdguardTeam/golibs v0.10.3
<mask> github.com/AdguardTeam/urlfilter v0.15.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: all: opt log levels
Updates #3929.
Squashed commit of the following:
commit bfb2361d81a0667c36193484ca125d08e5638b21
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 24 17:23:39 2021 +0300
all: opt log levels </s> remove github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 h1:lYNi7VeCBhmdyf5xEUxfj84ikgiz5cjzocL9moiIRhk=
github.com/AdguardTeam/dnsproxy v0.40.1/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove log.Error("error while shutting down http server %q: %s", srv.Addr, err)
</s> add if errors.Is(err, context.Canceled) {
log.Debug("shutting down http server %q: %s", srv.Addr, err)
} else {
log.Error("shutting down http server %q: %s", srv.Addr, err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46cd974e2a5cda25032e44c525a164a0989ee061 | go.mod |
github.com/AdguardTeam/dnsproxy v0.40.1 h1:lYNi7VeCBhmdyf5xEUxfj84ikgiz5cjzocL9moiIRhk=
github.com/AdguardTeam/dnsproxy v0.40.1/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
<mask> github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY=
<mask> github.com/AdguardTeam/golibs v0.10.3 h1:FBgk17zf35ESVWQKIqEUiqqB2bDaCBC8X5vMU760yB4=
<mask> github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> Pull request: all: opt log levels
Updates #3929.
Squashed commit of the following:
commit bfb2361d81a0667c36193484ca125d08e5638b21
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 24 17:23:39 2021 +0300
all: opt log levels </s> remove github.com/AdguardTeam/dnsproxy v0.40.0
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 </s> remove log.Error("error while shutting down http server %q: %s", srv.Addr, err)
</s> add if errors.Is(err, context.Canceled) {
log.Debug("shutting down http server %q: %s", srv.Addr, err)
} else {
log.Error("shutting down http server %q: %s", srv.Addr, err)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46cd974e2a5cda25032e44c525a164a0989ee061 | go.sum |
if errors.Is(err, context.Canceled) {
log.Debug("shutting down http server %q: %s", srv.Addr, err)
} else {
log.Error("shutting down http server %q: %s", srv.Addr, err)
} | <mask> }
<mask>
<mask> err := srv.Shutdown(ctx)
<mask> if err != nil {
<mask> log.Error("error while shutting down http server %q: %s", srv.Addr, err)
<mask> }
<mask> }
<mask>
<mask> // Apply new configuration, start DNS server, restart Web server
<mask> func (web *Web) handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
</s> Pull request: all: opt log levels
Updates #3929.
Squashed commit of the following:
commit bfb2361d81a0667c36193484ca125d08e5638b21
Author: Ainar Garipov <[email protected]>
Date: Fri Dec 24 17:23:39 2021 +0300
all: opt log levels </s> remove github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0=
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 h1:lYNi7VeCBhmdyf5xEUxfj84ikgiz5cjzocL9moiIRhk=
github.com/AdguardTeam/dnsproxy v0.40.1/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/AdguardTeam/dnsproxy v0.40.0
</s> add github.com/AdguardTeam/dnsproxy v0.40.1 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/46cd974e2a5cda25032e44c525a164a0989ee061 | internal/home/controlinstall.go |
"version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" | <mask> "path-exists": "^3.0.0"
<mask> }
<mask> },
<mask> "lodash": {
<mask> "version": "4.17.15",
<mask> "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
<mask> "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
<mask> },
<mask> "lodash-es": {
<mask> "version": "4.17.15",
<mask> "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.15.tgz",
<mask> "integrity": "sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ=="
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove "lodash": "^4.17.15",
</s> add "lodash": "^4.17.19", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/package-lock.json |
"resolved": "", | <mask> "dev": true
<mask> },
<mask> "kind-of": {
<mask> "version": "6.0.2",
<mask> "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
<mask> "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
<mask> "dev": true
<mask> }
<mask> }
<mask> },
<mask> "snapdragon-util": {
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/package-lock.json |
"lodash": "^4.17.19", | <mask> "date-fns": "^1.29.0",
<mask> "i18next": "^19.4.4",
<mask> "i18next-browser-languagedetector": "^4.2.0",
<mask> "ipaddr.js": "^1.9.1",
<mask> "lodash": "^4.17.15",
<mask> "nanoid": "^3.1.9",
<mask> "prop-types": "^15.7.2",
<mask> "query-string": "^6.13.1",
<mask> "react": "^16.13.1",
<mask> "react-click-outside": "^3.0.1",
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove }) => <option key={label} value={query}
disabled={disabled}>{t(label)}</option>)}
</s> add }) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/package.json |
<mask> }
<mask> }
<mask>
<mask> @media screen and (max-width: 992px) {
<mask> .container {
<mask> padding: 0 !important;
<mask> }
<mask>
<mask> .container--wrap {
<mask> min-height: calc(100vh);
<mask> }
<mask> }
<mask>
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/App/index.css |
|
<form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}} | <mask>
<mask> const normalizeOnBlur = (data) => data.trim();
<mask>
<mask> return (
<mask> <form className="d-flex flex-wrap form-control--container"
<mask> onSubmit={(e) => {
<mask> e.preventDefault();
<mask> }}
<mask> >
<mask> <div className="field__search">
<mask> <Field
<mask> id={FORM_NAMES.search}
<mask> name={FORM_NAMES.search}
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
</s> add className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent', responseStatusClass)} </s> remove }) => <option key={label} value={query}
disabled={disabled}>{t(label)}</option>)}
</s> add }) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
} </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/Logs/Filters/Form.js |
className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent', responseStatusClass)} | <mask> <div className="field__select">
<mask> <Field
<mask> name={FORM_NAMES.response_status}
<mask> component="select"
<mask> className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
<mask> >
<mask> {Object.values(RESPONSE_FILTER)
<mask> .map(({
<mask> query, label, disabled,
<mask> }) => <option key={label} value={query}
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove }) => <option key={label} value={query}
disabled={disabled}>{t(label)}</option>)}
</s> add }) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
} </s> remove <form className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
</s> add <form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}} </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/Logs/Filters/Form.js |
}) => (
<option
key={label}
value={query}
disabled={disabled}
>
{t(label)}
</option>
))
} | <mask> >
<mask> {Object.values(RESPONSE_FILTER)
<mask> .map(({
<mask> query, label, disabled,
<mask> }) => <option key={label} value={query}
<mask> disabled={disabled}>{t(label)}</option>)}
<mask> </Field>
<mask> </div>
<mask> </form>
<mask> );
<mask> };
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left ml-small form-control--transparent', responseStatusClass)}
</s> add className={classNames('form-control custom-select custom-select--logs custom-select__arrow--left form-control--transparent', responseStatusClass)} </s> remove <form className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}}
</s> add <form
className="d-flex flex-wrap form-control--container"
onSubmit={(e) => {
e.preventDefault();
}} </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/Logs/Filters/Form.js |
background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; | <mask> cursor: pointer;
<mask> }
<mask>
<mask> .custom-select__arrow--left {
<mask> background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
<mask> background-size: 1.5rem;
<mask> }
<mask>
<mask> .custom-select--logs {
<mask> padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
<mask> }
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/Logs/Logs.css |
padding: 0.5rem 0.75rem 0.5rem 2rem !important; | <mask> background-size: 1.5rem;
<mask> }
<mask>
<mask> .custom-select--logs {
<mask> padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
<mask> }
<mask>
<mask> .bg--danger {
<mask> color: var(--danger);
<mask> }
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/Logs/Logs.css |
padding-left: 24px;
padding-right: 24px; | <mask> }
<mask>
<mask> .field__select {
<mask> margin-top: 1.5rem;
<mask> }
<mask> }
<mask>
<mask> @media (max-width: 575px) {
<mask> .logs__table .rt-tr {
</s> Merge: - client: fix container padding
Closes #1921
Squashed commit of the following:
commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:41:50 2020 +0300
- client: fix container padding
commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <[email protected]>
Date: Fri Jul 24 14:40:36 2020 +0300
- client: npm audit fix </s> remove .container {
padding: 0 !important;
}
</s> add </s> remove padding: 0.5rem 0.75rem 0.5rem 1.75rem !important;
</s> add padding: 0.5rem 0.75rem 0.5rem 2rem !important; </s> remove background: #fff url('./chevron-down.svg') no-repeat left 0.2rem center;
background-size: 1.5rem;
</s> add background: #fff url('./chevron-down.svg') no-repeat;
background-position: 5px 9px;
background-size: 22px; </s> remove "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
</s> add "resolved": "", </s> remove "version": "4.17.15",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
</s> add "version": "4.17.19",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
"integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/4743743b1f31e8620a42bd777fdf3efdef225309 | client/src/components/Logs/Logs.css |
const maxInterval = 1 * 60 * 60
intval := 5 // use a dynamically increasing time interval
nUpdated := 0 | <mask> }
<mask>
<mask> // Sets up a timer that will be checking for filters updates periodically
<mask> func periodicallyRefreshFilters() {
<mask> for {
<mask> isNetworkErr := false
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 {
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
isNetworkErr := false | <mask> nUpdated := 0
<mask> for {
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 {
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
<mask> nUpdated, isNetworkErr = refreshFiltersIfNecessary(false)
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) | <mask> for {
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && refreshStatus == 0 {
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
<mask> _ = refreshFiltersIfNecessary(false)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> }
<mask> time.Sleep(1 * time.Hour)
<mask> }
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
if nUpdated != 0 {
intval = maxInterval
}
}
if isNetworkErr {
intval *= 2
if intval > maxInterval {
intval = maxInterval
} | <mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> }
<mask>
<mask> time.Sleep(time.Duration(intval) * time.Second)
<mask> }
<mask> }
<mask>
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
time.Sleep(time.Duration(intval) * time.Second) | <mask> _ = refreshFiltersIfNecessary(false)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> }
<mask> time.Sleep(1 * time.Hour)
<mask> }
<mask> }
<mask>
<mask> // Refresh filters
<mask> func refreshFilters() (int, error) {
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
nUpdated, _ := refreshFiltersIfNecessary(true) | <mask> }
<mask>
<mask> refreshStatus = 1
<mask> refreshLock.Lock()
<mask> nUpdated := refreshFiltersIfNecessary(true)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> return nUpdated, nil
<mask> }
<mask>
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove _ = refreshFiltersIfNecessary(false)
</s> add nUpdated, isNetworkErr = refreshFiltersIfNecessary(false) </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
//
// Return the number of updated filters
// Return TRUE - there was a network error and nothing could be updated
func refreshFiltersIfNecessary(force bool) (int, bool) { | <mask> // . store the new data on disk (1.txt)
<mask> // . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
<mask> // . dnsfilter activates new filters
<mask> // . Remove the old filter files (1.txt.old)
<mask> func refreshFiltersIfNecessary(force bool) int {
<mask> var updateFilters []filter
<mask> var updateFlags []bool // 'true' if filter data has changed
<mask>
<mask> log.Debug("Filters: updating...")
<mask>
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove return updateCount
</s> add return updateCount, false </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
nfail := 0 | <mask> updateFilters = append(updateFilters, uf)
<mask> }
<mask> config.RUnlock()
<mask>
<mask> for i := range updateFilters {
<mask> uf := &updateFilters[i]
<mask> updated, err := uf.update()
<mask> updateFlags = append(updateFlags, updated)
<mask> if err != nil {
<mask> nfail++
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
nfail++ | <mask> uf := &updateFilters[i]
<mask> updated, err := uf.update()
<mask> updateFlags = append(updateFlags, updated)
<mask> if err != nil {
<mask> log.Printf("Failed to update filter %s: %s\n", uf.URL, err)
<mask> continue
<mask> }
<mask> uf.LastUpdated = now
<mask> }
<mask>
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove nUpdated := refreshFiltersIfNecessary(true)
</s> add nUpdated, _ := refreshFiltersIfNecessary(true) </s> remove return updateCount
</s> add return updateCount, false | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
if nfail == len(updateFilters) {
return 0, true
}
| <mask> }
<mask>
<mask> updateCount := 0
<mask> for i := range updateFilters {
<mask> uf := &updateFilters[i]
<mask> updated := updateFlags[i]
<mask> if updated {
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove return updateCount
</s> add return updateCount, false | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
return updateCount, false | <mask> }
<mask> }
<mask>
<mask> log.Debug("Filters: update finished")
<mask> return updateCount
<mask> }
<mask>
<mask> // Allows printable UTF-8 text with CR, LF, TAB characters
<mask> func isPrintableText(data []byte) bool {
<mask> for _, c := range data {
</s> Merge: * filters: use increasing update interval
Close #1246
Squashed commit of the following:
commit d0b40719457c1bc41c2f32b425c95e35916366e9
Author: Simon Zolin <[email protected]>
Date: Wed Jan 15 13:41:45 2020 +0300
minor
commit c1b682156c1b71dcfc2febe02e3df0a4d5e0a81b
Author: Simon Zolin <[email protected]>
Date: Tue Jan 14 20:09:27 2020 +0300
* filters: increasing update interval </s> remove func refreshFiltersIfNecessary(force bool) int {
</s> add //
// Return the number of updated filters
// Return TRUE - there was a network error and nothing could be updated
func refreshFiltersIfNecessary(force bool) (int, bool) { </s> remove time.Sleep(1 * time.Hour)
</s> add time.Sleep(time.Duration(intval) * time.Second) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/47631105c7e92b6dbc232110af3050b4d8534f8f | home/filter.go |
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` | <mask> Port int `yaml:"port"`
<mask>
<mask> dnsforward.FilteringConfig `yaml:",inline"`
<mask>
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"`
<mask> Ratelimit int `yaml:"ratelimit"`
<mask> RefuseAny bool `yaml:"refuse_any"`
<mask> Pprof string `yaml:"-"`
<mask> Cache string `yaml:"-"`
<mask> Prometheus string `yaml:"-"`
<mask> BootstrapDNS string `yaml:"bootstrap_dns"`
<mask> UpstreamDNS []string `yaml:"upstream_dns"`
<mask> }
<mask>
<mask> var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
<mask>
<mask> // initialize to default values, will be changed later when reading config or parsing command line
</s> dnsforward -- implement ratelimit and refuseany </s> remove ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
</s> add ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RatelimitWhitelist []string `yaml:"ratelimit_whitelist"`
RefuseAny bool `yaml:"refuse_any"` </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | config.go |
QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true, | <mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features
<mask> FilteringEnabled: true, // whether or not use filter lists
<mask> BlockedResponseTTL: 10, // in seconds
<mask> },
<mask> BootstrapDNS: "8.8.8.8:53",
<mask> UpstreamDNS: defaultDNS,
<mask> Cache: "cache",
<mask> Prometheus: "prometheus :9153",
<mask> },
</s> dnsforward -- implement ratelimit and refuseany </s> remove QueryLogEnabled: true,
Ratelimit: 20,
RefuseAny: true,
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153",
</s> add BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | config.go |
BootstrapDNS: "8.8.8.8:53",
UpstreamDNS: defaultDNS,
Cache: "cache",
Prometheus: "prometheus :9153", | <mask> ProtectionEnabled: true, // whether or not use any of dnsfilter features
<mask> FilteringEnabled: true, // whether or not use filter lists
<mask> BlockedResponseTTL: 10, // in seconds
<mask> },
<mask> QueryLogEnabled: true,
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> BootstrapDNS: "8.8.8.8:53",
<mask> UpstreamDNS: defaultDNS,
<mask> Cache: "cache",
<mask> Prometheus: "prometheus :9153",
<mask> },
<mask> Filters: []filter{
<mask> {Filter: dnsfilter.Filter{ID: 1}, Enabled: true, URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt", Name: "AdGuard Simplified Domain Names filter"},
<mask> {Filter: dnsfilter.Filter{ID: 2}, Enabled: false, URL: "https://adaway.org/hosts.txt", Name: "AdAway"},
<mask> {Filter: dnsfilter.Filter{ID: 3}, Enabled: false, URL: "https://hosts-file.net/ad_servers.txt", Name: "hpHosts - Ad and Tracking servers only"},
</s> dnsforward -- implement ratelimit and refuseany </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | config.go |
gocache "github.com/patrickmn/go-cache" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // Server is the main way to start a DNS server.
<mask> //
<mask> // Example:
</s> dnsforward -- implement ratelimit and refuseany </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) </s> remove ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
</s> add ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RatelimitWhitelist []string `yaml:"ratelimit_whitelist"`
RefuseAny bool `yaml:"refuse_any"` </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
ratelimitBuckets *gocache.Cache // where the ratelimiters are stored, per IP
| <mask>
<mask> cache cache
<mask>
<mask> sync.RWMutex
<mask> ServerConfig
<mask> }
<mask>
</s> dnsforward -- implement ratelimit and refuseany </s> remove ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
</s> add ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RatelimitWhitelist []string `yaml:"ratelimit_whitelist"`
RefuseAny bool `yaml:"refuse_any"` </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RatelimitWhitelist []string `yaml:"ratelimit_whitelist"`
RefuseAny bool `yaml:"refuse_any"` | <mask> }
<mask> */
<mask>
<mask> type FilteringConfig struct {
<mask> ProtectionEnabled bool `yaml:"protection_enabled"`
<mask> FilteringEnabled bool `yaml:"filtering_enabled"`
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
<mask>
<mask> dnsfilter.Config `yaml:",inline"`
<mask> }
<mask>
<mask> // The zero ServerConfig is empty and ready for use.
</s> dnsforward -- implement ratelimit and refuseany </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
// if any of ServerConfig values are zero, then default values from below are used | <mask>
<mask> FilteringConfig
<mask> }
<mask>
<mask> var defaultValues = ServerConfig{
<mask> UDPListenAddr: &net.UDPAddr{Port: 53},
<mask> FilteringConfig: FilteringConfig{BlockedResponseTTL: 3600},
<mask> Upstreams: []Upstream{
<mask> //// dns over HTTPS
<mask> // &dnsOverHTTPS{address: "https://1.1.1.1/dns-query"},
</s> dnsforward -- implement ratelimit and refuseany </s> remove ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
</s> add ProtectionEnabled bool `yaml:"protection_enabled"`
FilteringEnabled bool `yaml:"filtering_enabled"`
BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RatelimitWhitelist []string `yaml:"ratelimit_whitelist"`
RefuseAny bool `yaml:"refuse_any"` </s> remove QueryLogEnabled bool `yaml:"querylog_enabled"`
Ratelimit int `yaml:"ratelimit"`
RefuseAny bool `yaml:"refuse_any"`
Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"`
</s> add Pprof string `yaml:"-"`
Cache string `yaml:"-"`
Prometheus string `yaml:"-"`
BootstrapDNS string `yaml:"bootstrap_dns"`
UpstreamDNS []string `yaml:"upstream_dns"` </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
if msg.Question[0].Qtype == dns.TypeANY && s.RefuseAny {
return s.genNotImpl(msg), nil, nil, nil
}
| <mask> return s.genServerFailure(msg), nil, nil, nil
<mask> }
<mask>
<mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
<mask> host := strings.TrimSuffix(msg.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host)
<mask> if err != nil {
<mask> log.Printf("dnsfilter failed to check host '%s': %s", host, err)
</s> dnsforward -- implement ratelimit and refuseany </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
ip, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
// not a fatal error, move on
}
// ratelimit based on IP only, protects CPU cycles and outbound connections
if s.isRatelimited(ip) {
// log.Printf("Ratelimiting %s based on IP only", ip)
return // do nothing, don't reply, we got ratelimited
} | <mask>
<mask> func (s *Server) handlePacket(p []byte, addr net.Addr, conn *net.UDPConn) {
<mask> start := time.Now()
<mask>
<mask> msg := &dns.Msg{}
<mask> err = msg.Unpack(p)
<mask> if err != nil {
<mask> log.Printf("got invalid DNS packet: %s", err)
</s> dnsforward -- implement ratelimit and refuseany </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
err = msg.Unpack(p) | <mask> func (s *Server) handlePacket(p []byte, addr net.Addr, conn *net.UDPConn) {
<mask> start := time.Now()
<mask>
<mask> msg := &dns.Msg{}
<mask> err := msg.Unpack(p)
<mask> if err != nil {
<mask> log.Printf("got invalid DNS packet: %s", err)
<mask> return // do nothing
<mask> }
<mask>
</s> dnsforward -- implement ratelimit and refuseany </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
// ratelimit based on reply size now
replysize := reply.Len()
if s.isRatelimitedForReply(ip, replysize) {
log.Printf("Ratelimiting %s based on IP and size %d", ip, replysize)
return // do nothing, don't reply, we got ratelimited
}
// we're good to respond | <mask>
<mask> if reply != nil {
<mask> rerr := s.respond(reply, addr, conn)
<mask> if rerr != nil {
<mask> log.Printf("Couldn't respond to UDP packet: %s", err)
<mask> }
</s> dnsforward -- implement ratelimit and refuseany </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) | <mask> }
<mask> }
<mask>
<mask> // query logging and stats counters
<mask> elapsed := time.Since(start)
<mask> upstreamAddr := ""
<mask> if upstream != nil {
<mask> upstreamAddr = upstream.Address()
<mask> }
<mask> host, _, err := net.SplitHostPort(addr.String())
<mask> if err != nil {
<mask> log.Printf("Failed to split %v into host/port: %s", addr, err)
<mask> }
<mask> logRequest(msg, reply, result, elapsed, host, upstreamAddr)
<mask> }
<mask>
<mask> //
</s> dnsforward -- implement ratelimit and refuseany </s> remove logRequest(msg, reply, result, elapsed, host, upstreamAddr)
</s> add </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
<mask> host, _, err := net.SplitHostPort(addr.String())
<mask> if err != nil {
<mask> log.Printf("Failed to split %v into host/port: %s", addr, err)
<mask> }
<mask> logRequest(msg, reply, result, elapsed, host, upstreamAddr)
<mask> }
<mask>
<mask> //
<mask> // packet sending functions
<mask> //
</s> dnsforward -- implement ratelimit and refuseany </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
|
resp.RecursionAvailable = true
return &resp
}
func (s *Server) genNotImpl(request *dns.Msg) *dns.Msg {
resp := dns.Msg{}
resp.SetRcode(request, dns.RcodeNotImplemented)
resp.RecursionAvailable = true
resp.SetEdns0(1452, false) // NOTIMPL without EDNS is treated as 'we don't support EDNS', so explicitly set it | <mask> resp := dns.Msg{}
<mask> resp.SetRcode(request, dns.RcodeServerFailure)
<mask> return &resp
<mask> }
<mask>
<mask> func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg {
<mask> resp := dns.Msg{}
</s> dnsforward -- implement ratelimit and refuseany </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
resp.RecursionAvailable = true | <mask> resp := dns.Msg{}
<mask> resp.SetRcode(request, dns.RcodeNameError)
<mask> resp.Ns = s.genSOA(request)
<mask> return &resp
<mask> }
<mask>
</s> dnsforward -- implement ratelimit and refuseany </s> remove err := msg.Unpack(p)
</s> add err = msg.Unpack(p) </s> remove elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
host, _, err := net.SplitHostPort(addr.String())
if err != nil {
log.Printf("Failed to split %v into host/port: %s", addr, err)
</s> add if s.QueryLogEnabled {
elapsed := time.Since(start)
upstreamAddr := ""
if upstream != nil {
upstreamAddr = upstream.Address()
}
logRequest(msg, reply, result, elapsed, ip, upstreamAddr) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/478ce03386b92c265f63742b44c3b456e534d593 | dnsforward/dnsforward.go |
"strconv" | <mask> "net"
<mask> "net/netip"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove `"bad arpa domain name \"non.arpa\": not a reversed ip network"`,
</s> add `"bad arpa domain name \"non.arpa.\": not a reversed ip network"`, </s> remove `bad arpa domain name "hello.world": not a reversed ip network`,
</s> add `bad arpa domain name "hello.world.": not a reversed ip network`, </s> remove `bad arpa domain name "non.arpa": not a reversed ip network`,
</s> add `bad arpa domain name "non.arpa.": not a reversed ip network`, </s> remove if !privateNets.Contains(subnet.IP) {
</s> add if !privateNets.Contains(subnet.Addr().AsSlice()) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
//
// TODO(e.burkov): Use netip.Addr when we switch to netip more fully. | <mask> // was parsed successfully and belongs to one of the locally served IP
<mask> // ranges. It is also filled with unmapped version of the address if it's
<mask> // within DNS64 prefixes.
<mask> unreversedReqIP net.IP
<mask>
<mask> // err is the error returned from a processing function.
<mask> err error
<mask>
<mask> // clientID is the ClientID from DoH, DoQ, or DoT, if provided.
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove if !s.privateNets.Contains(ip) {
</s> add subnetAddr := subnet.Addr()
addrData := subnetAddr.AsSlice()
if !s.privateNets.Contains(addrData) { </s> remove log.Debug("dnsforward: parsing reversed addr: %s", err)
</s> add if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove log.Debug("dnsforward: addr %s is from locally served network", ip)
</s> add log.Debug("dnsforward: addr %s is from locally served network", subnetAddr) </s> remove ip, err := netutil.IPFromReversedAddr(q.Name)
</s> add subnet, err := extractARPASubnet(q.Name) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
subnet, err := extractARPASubnet(q.Name) | <mask> // No need for restriction.
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> ip, err := netutil.IPFromReversedAddr(q.Name)
<mask> if err != nil {
<mask> log.Debug("dnsforward: parsing reversed addr: %s", err)
<mask>
<mask> // DNS-Based Service Discovery uses PTR records having not an ARPA
<mask> // format of the domain name in question. Those shouldn't be
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove log.Debug("dnsforward: parsing reversed addr: %s", err)
</s> add if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove var subnet *net.IPNet
subnet, err = netutil.SubnetFromReversedAddr(domain)
</s> add var subnet netip.Prefix
subnet, err = extractARPASubnet(domain) </s> remove log.Debug("dnsforward: request is not for arpa domain")
</s> add log.Debug("dnsforward: parsing reversed addr: %s", err) </s> remove return resultCodeSuccess
</s> add return resultCodeError | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") | <mask> }
<mask>
<mask> ip, err := netutil.IPFromReversedAddr(q.Name)
<mask> if err != nil {
<mask> log.Debug("dnsforward: parsing reversed addr: %s", err)
<mask>
<mask> // DNS-Based Service Discovery uses PTR records having not an ARPA
<mask> // format of the domain name in question. Those shouldn't be
<mask> // invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
<mask> // RFC 2782.
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove ip, err := netutil.IPFromReversedAddr(q.Name)
</s> add subnet, err := extractARPASubnet(q.Name) </s> remove var subnet *net.IPNet
subnet, err = netutil.SubnetFromReversedAddr(domain)
</s> add var subnet netip.Prefix
subnet, err = extractARPASubnet(domain) </s> remove log.Debug("dnsforward: request is not for arpa domain")
</s> add log.Debug("dnsforward: parsing reversed addr: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
return resultCodeSuccess | <mask> ip, err := netutil.IPFromReversedAddr(q.Name)
<mask> if err != nil {
<mask> log.Debug("dnsforward: parsing reversed addr: %s", err)
<mask>
<mask> // DNS-Based Service Discovery uses PTR records having not an ARPA
<mask> // format of the domain name in question. Those shouldn't be
<mask> // invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
<mask> // RFC 2782.
<mask> name := strings.TrimSuffix(q.Name, ".")
<mask> if err = netutil.ValidateSRVDomainName(name); err != nil {
<mask> log.Debug("dnsforward: validating service domain: %s", err)
<mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> log.Debug("dnsforward: request is not for arpa domain")
<mask>
<mask> return resultCodeSuccess
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove log.Debug("dnsforward: parsing reversed addr: %s", err)
</s> add if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") </s> remove ip, err := netutil.IPFromReversedAddr(q.Name)
</s> add subnet, err := extractARPASubnet(q.Name) </s> remove var subnet *net.IPNet
subnet, err = netutil.SubnetFromReversedAddr(domain)
</s> add var subnet netip.Prefix
subnet, err = extractARPASubnet(domain) </s> remove log.Debug("dnsforward: request is not for arpa domain")
</s> add log.Debug("dnsforward: parsing reversed addr: %s", err) </s> remove return resultCodeSuccess
</s> add return resultCodeError | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
log.Debug("dnsforward: parsing reversed addr: %s", err) | <mask>
<mask> return resultCodeError
<mask> }
<mask>
<mask> log.Debug("dnsforward: request is not for arpa domain")
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // Restrict an access to local addresses for external clients. We also
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove return resultCodeSuccess
</s> add return resultCodeError </s> remove if !s.privateNets.Contains(ip) {
</s> add subnetAddr := subnet.Addr()
addrData := subnetAddr.AsSlice()
if !s.privateNets.Contains(addrData) { </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove dctx.unreversedReqIP = ip
</s> add dctx.unreversedReqIP = addrData </s> remove log.Debug("dnsforward: parsing reversed addr: %s", err)
</s> add if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
return resultCodeError | <mask> }
<mask>
<mask> log.Debug("dnsforward: request is not for arpa domain")
<mask>
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> // Restrict an access to local addresses for external clients. We also
<mask> // assume that all the DHCP leases we give are locally served or at least
<mask> // shouldn't be accessible externally.
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove if !s.privateNets.Contains(ip) {
</s> add subnetAddr := subnet.Addr()
addrData := subnetAddr.AsSlice()
if !s.privateNets.Contains(addrData) { </s> remove log.Debug("dnsforward: request is not for arpa domain")
</s> add log.Debug("dnsforward: parsing reversed addr: %s", err) </s> remove dctx.unreversedReqIP = ip
</s> add dctx.unreversedReqIP = addrData </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove log.Debug("dnsforward: parsing reversed addr: %s", err)
</s> add if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
subnetAddr := subnet.Addr()
addrData := subnetAddr.AsSlice()
if !s.privateNets.Contains(addrData) { | <mask>
<mask> // Restrict an access to local addresses for external clients. We also
<mask> // assume that all the DHCP leases we give are locally served or at least
<mask> // shouldn't be accessible externally.
<mask> if !s.privateNets.Contains(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> log.Debug("dnsforward: addr %s is from locally served network", ip)
<mask>
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove return resultCodeSuccess
</s> add return resultCodeError </s> remove log.Debug("dnsforward: addr %s is from locally served network", ip)
</s> add log.Debug("dnsforward: addr %s is from locally served network", subnetAddr) </s> remove log.Debug("dnsforward: request is not for arpa domain")
</s> add log.Debug("dnsforward: parsing reversed addr: %s", err) </s> remove dctx.unreversedReqIP = ip
</s> add dctx.unreversedReqIP = addrData | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
log.Debug("dnsforward: addr %s is from locally served network", subnetAddr) | <mask> if !s.privateNets.Contains(ip) {
<mask> return resultCodeSuccess
<mask> }
<mask>
<mask> log.Debug("dnsforward: addr %s is from locally served network", ip)
<mask>
<mask> if !dctx.isLocalClient {
<mask> log.Debug("dnsforward: %q requests an internal ip", pctx.Addr)
<mask> pctx.Res = s.genNXDomain(req)
<mask>
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove if !s.privateNets.Contains(ip) {
</s> add subnetAddr := subnet.Addr()
addrData := subnetAddr.AsSlice()
if !s.privateNets.Contains(addrData) { </s> remove if !privateNets.Contains(subnet.IP) {
</s> add if !privateNets.Contains(subnet.Addr().AsSlice()) { </s> remove dctx.unreversedReqIP = ip
</s> add dctx.unreversedReqIP = addrData </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove return resultCodeSuccess
</s> add return resultCodeError | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
dctx.unreversedReqIP = addrData | <mask> return resultCodeFinish
<mask> }
<mask>
<mask> // Do not perform unreversing ever again.
<mask> dctx.unreversedReqIP = ip
<mask>
<mask> // There is no need to filter request from external addresses since this
<mask> // code is only executed when the request is for locally served ARPA
<mask> // hostname so disable redundant filters.
<mask> dctx.setts.ParentalEnabled = false
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove return resultCodeSuccess
</s> add return resultCodeError </s> remove log.Debug("dnsforward: request is not for arpa domain")
</s> add log.Debug("dnsforward: parsing reversed addr: %s", err) </s> remove if !s.privateNets.Contains(ip) {
</s> add subnetAddr := subnet.Addr()
addrData := subnetAddr.AsSlice()
if !s.privateNets.Contains(addrData) { </s> remove log.Debug("dnsforward: addr %s is from locally served network", ip)
</s> add log.Debug("dnsforward: addr %s is from locally served network", subnetAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/dns.go |
var subnet netip.Prefix
subnet, err = extractARPASubnet(domain) | <mask> slices.Sort(keys)
<mask>
<mask> var errs []error
<mask> for _, domain := range keys {
<mask> var subnet *net.IPNet
<mask> subnet, err = netutil.SubnetFromReversedAddr(domain)
<mask> if err != nil {
<mask> errs = append(errs, err)
<mask>
<mask> continue
<mask> }
</s> Pull request #1770: 5567-extract-subnet-arpa
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567.
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <[email protected]>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <[email protected]>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa </s> remove if !privateNets.Contains(subnet.IP) {
</s> add if !privateNets.Contains(subnet.Addr().AsSlice()) { </s> remove ip, err := netutil.IPFromReversedAddr(q.Name)
</s> add subnet, err := extractARPASubnet(q.Name) </s> remove // DNS-Based Service Discovery uses PTR records having not an ARPA
// format of the domain name in question. Those shouldn't be
// invalidated. See http://www.dns-sd.org/ServerStaticSetup.html and
// RFC 2782.
name := strings.TrimSuffix(q.Name, ".")
if err = netutil.ValidateSRVDomainName(name); err != nil {
log.Debug("dnsforward: validating service domain: %s", err)
return resultCodeError
</s> add return resultCodeSuccess </s> remove log.Debug("dnsforward: parsing reversed addr: %s", err)
</s> add if errors.Is(err, netutil.ErrNotAReversedSubnet) {
log.Debug("dnsforward: request is not for arpa domain") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/48431f8b86a1e4dde8aebb7539682eb8d043c556 | internal/dnsforward/http.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.