Skip to content

Commit d6f1687

Browse files
committed
Merge branch 'master' into AGDNS-2750-find-client
2 parents 58236fd + 6d282ae commit d6f1687

32 files changed

+1004
-2066
lines changed

CHANGELOG.md

+45-9
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,52 @@ The format is based on [*Keep a Changelog*](https://keepachangelog.com/en/1.0.0/
99
<!--
1010
## [v0.108.0] – TBA
1111

12-
## [v0.107.59] - 2025-04-01 (APPROX.)
12+
## [v0.107.60] - 2025-04-01 (APPROX.)
1313

14-
See also the [v0.107.59 GitHub milestone][ms-v0.107.59].
14+
See also the [v0.107.60 GitHub milestone][ms-v0.107.60].
1515

16-
[ms-v0.107.59]: https://github.com/AdguardTeam/AdGuardHome/milestone/94?closed=1
16+
[ms-v0.107.60]: https://github.com/AdguardTeam/AdGuardHome/milestone/95?closed=1
1717

1818
NOTE: Add new changes BELOW THIS COMMENT.
1919
-->
2020

21+
### Security
22+
23+
- Go version has been updated to prevent the possibility of exploiting the Go vulnerabilities fixed in [1.24.2][go-1.24.2].
24+
25+
### Changed
26+
27+
- Alpine Linux version in `Dockerfile` has been updated to 3.21 ([#7588]).
28+
29+
### Deprecated
30+
31+
- Node 20 support, Node 22 will be required in future releases.
32+
33+
**NOTE:** `npm` may be replaced with a different tool, such as `pnpm` or `yarn`, in a future release.
34+
35+
### Fixed
36+
37+
- Filtering for DHCP clients ([#7734]).
38+
39+
- Validation process for the HTTPS port on the *Encryption Settings* page.
40+
41+
### Removed
42+
43+
- Node 18 support.
44+
45+
[#7588]: https://github.com/AdguardTeam/AdGuardHome/issues/7588
46+
[#7734]: https://github.com/AdguardTeam/AdGuardHome/issues/7734
47+
48+
[go-1.24.2]: https://groups.google.com/g/golang-announce/c/Y2uBTVKjBQk
49+
50+
<!--
51+
NOTE: Add new changes ABOVE THIS COMMENT.
52+
-->
53+
54+
## [v0.107.59] - 2025-03-21
55+
56+
See also the [v0.107.59 GitHub milestone][ms-v0.107.59].
57+
2158
### Fixed
2259

2360
- Searching for persistent clients using an exact match for CIDR in the `POST /clients/search HTTP API`.
@@ -29,9 +66,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
2966
[#7704]: https://github.com/AdguardTeam/AdGuardHome/issues/7704
3067
[#7708]: https://github.com/AdguardTeam/AdGuardHome/issues/7708
3168

32-
<!--
33-
NOTE: Add new changes ABOVE THIS COMMENT.
34-
-->
69+
[ms-v0.107.59]: https://github.com/AdguardTeam/AdGuardHome/milestone/94?closed=1
3570

3671
## [v0.107.58] - 2025-03-19
3772

@@ -3064,11 +3099,12 @@ See also the [v0.104.2 GitHub milestone][ms-v0.104.2].
30643099
[ms-v0.104.2]: https://github.com/AdguardTeam/AdGuardHome/milestone/28?closed=1
30653100

30663101
<!--
3067-
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.59...HEAD
3068-
[v0.107.59]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.58...v0.107.59
3102+
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.60...HEAD
3103+
[v0.107.60]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.59...v0.107.60
30693104
-->
30703105

3071-
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.58...HEAD
3106+
[Unreleased]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.59...HEAD
3107+
[v0.107.59]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.58...v0.107.59
30723108
[v0.107.58]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.57...v0.107.58
30733109
[v0.107.57]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.56...v0.107.57
30743110
[v0.107.56]: https://github.com/AdguardTeam/AdGuardHome/compare/v0.107.55...v0.107.56

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ REVISION = $${REVISION:-$$(git rev-parse --short HEAD)}
3838
SIGN = 1
3939
SIGNER_API_KEY = not-a-real-key
4040
VERSION = v0.0.0
41-
YARN = yarn
4241

4342
NEXTAPI = 0
4443

@@ -139,5 +138,4 @@ txt-lint: ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh
139138
md-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/md-lint.sh
140139
sh-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/sh-lint.sh
141140

142-
openapi-lint: ; cd ./openapi/ && $(YARN) test
143-
openapi-show: ; cd ./openapi/ && $(YARN) start
141+
# TODO(a.garipov): Re-add openapi-lint.

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -205,9 +205,9 @@ Run `make init` to prepare the development environment.
205205

206206
You will need this to build AdGuard Home:
207207

208-
- [Go](https://golang.org/dl/) v1.23 or later;
209-
- [Node.js](https://nodejs.org/en/download/) v18.18 or later;
210-
- [npm](https://www.npmjs.com/) v8 or later;
208+
- [Go](https://golang.org/dl/) v1.24 or later;
209+
- [Node.js](https://nodejs.org/en/download/) v20.19 or later;
210+
- [npm](https://www.npmjs.com/) v10.8 or later;
211211

212212
### <a href="#building" id="building" name="building">Building</a>
213213

client/src/__locales/de.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@
9797
"settings": "Einstellungen",
9898
"filters": "Filter",
9999
"filter": "Filter",
100-
"query_log": "Anfragenprotokoll",
100+
"query_log": "Abfrageprotokoll",
101101
"compact": "Kompakt",
102-
"nothing_found": "Nichts gefunden\n",
102+
"nothing_found": "Nichts gefunden",
103103
"faq": "FAQ",
104104
"version": "Version",
105105
"address": "Adresse",
@@ -199,7 +199,7 @@
199199
"cancel_btn": "Abbrechen",
200200
"enter_name_hint": "Name eingeben",
201201
"enter_url_or_path_hint": "URL oder absoluten Pfad der Liste eingeben",
202-
"check_updates_btn": "Nach Aktualisierungen suchen",
202+
"check_updates_btn": "Nach Updates suchen",
203203
"new_blocklist": "Neue Sperrliste",
204204
"new_allowlist": "Neue Positivliste",
205205
"edit_blocklist": "Sperrliste bearbeiten",
@@ -566,7 +566,7 @@
566566
"ignore_domains": "Ignorierte Domains (durch Zeilenumbruch getrennt)",
567567
"ignore_domains_title": "Ignorierte Domains",
568568
"ignore_domains_desc_stats": "Abfragen, die diesen Regeln entsprechen, werden nicht in die Statistik aufgenommen",
569-
"ignore_domains_desc_query": "Abfragen, die diesen Regeln entsprechen, werden nicht in das Anfragenprotokoll aufgenommen",
569+
"ignore_domains_desc_query": "Abfragen, die diesen Regeln entsprechen, werden nicht in das Abfrageprotokoll aufgenommen",
570570
"interval_hours": "{{count}} Stunde",
571571
"interval_hours_plural": "{{count}} Stunden",
572572
"filters_configuration": "Filterkonfiguration",

0 commit comments

Comments
 (0)