From c346216424d6571f96d80f47a9224da4c47dbbf9 Mon Sep 17 00:00:00 2001 From: bakito Date: Sat, 12 Mar 2022 12:46:15 +0100 Subject: [PATCH 01/28] correct openapi schema --- internal/home/controlfiltering.go | 2 +- openapi/openapi.yaml | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/internal/home/controlfiltering.go b/internal/home/controlfiltering.go index 639403d8..51d86146 100644 --- a/internal/home/controlfiltering.go +++ b/internal/home/controlfiltering.go @@ -316,7 +316,7 @@ type filterJSON struct { URL string `json:"url"` Name string `json:"name"` RulesCount uint32 `json:"rules_count"` - LastUpdated string `json:"last_updated"` + LastUpdated string `json:"last_updated,omitempty"` } type filteringConfig struct { diff --git a/openapi/openapi.yaml b/openapi/openapi.yaml index 8b21a01f..bb3bfe09 100644 --- a/openapi/openapi.yaml +++ b/openapi/openapi.yaml @@ -1396,7 +1396,6 @@ 'required': - 'enabled' - 'id' - - 'last_updated' - 'name' - 'rules_count' - 'url' @@ -1434,6 +1433,10 @@ 'type': 'array' 'items': '$ref': '#/components/schemas/Filter' + 'whitelist_filters': + 'type': 'array' + 'items': + '$ref': '#/components/schemas/Filter' 'user_rules': 'type': 'array' 'items': @@ -1451,14 +1454,7 @@ 'description': 'Filtering URL settings' 'properties': 'data': - 'properties': - 'enabled': - 'type': 'boolean' - 'name': - 'type': 'string' - 'url': - 'type': 'string' - 'type': 'object' + '$ref': '#/components/schemas/Filter' 'url': 'type': 'string' 'whitelist': @@ -1860,6 +1856,8 @@ 'description': 'Previously added URL containing filtering rules' 'type': 'string' 'example': 'https://filters.adtidy.org/windows/filters/15.txt' + 'whitelist': + 'type': 'boolean' 'QueryLogItem': 'type': 'object' 'description': 'Query log item' From 047970e5eef1f054441b3ca50becdbe137fb41e4 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Wed, 30 Mar 2022 18:02:50 +0800 Subject: [PATCH 02/28] Enable code block syntax hightlight in README.md It'll make it just a little bit easier to read it --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 00664365..7044eece 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ It operates as a DNS server that re-routes tracking domains to a "black hole", t ### Automated install (Linux and Mac) Run the following command in your terminal: -``` +```sh curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -v ``` @@ -212,11 +212,11 @@ Check the [`Makefile`](https://github.com/AdguardTeam/AdGuardHome/blob/master/Ma In order to do this, specify `GOOS` and `GOARCH` env variables before running make. For example: -``` +```sh env GOOS='linux' GOARCH='arm64' make ``` Or: -``` +```sh make GOOS='linux' GOARCH='arm64' ``` @@ -228,7 +228,7 @@ You'll need this to prepare a release build: Commands: -``` +```sh make build-release CHANNEL='...' VERSION='...' ``` @@ -271,12 +271,12 @@ There are three options how you can install an unstable version: 3. Standalone builds. Use the automated installation script or look for the available builds below. Beta: -``` +```sh curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c beta ``` Edge: -``` +```sh curl -s -S -L https://raw.githubusercontent.com/AdguardTeam/AdGuardHome/master/scripts/install.sh | sh -s -- -c edge ``` From 41f081d8da037596a13161d5f7f793752eb917cd Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Mon, 1 Aug 2022 14:15:50 +0300 Subject: [PATCH 03/28] Pull request: 4517 warning wording Merge in DNS/adguard-home from 4517-warning-label to master Updates #4517. Squashed commit of the following: commit 4987f63937253da2954cf20c7b99a3b8a0adf112 Author: Eugene Burkov Date: Mon Aug 1 13:59:28 2022 +0300 client: imp wording --- client/src/__locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/__locales/en.json b/client/src/__locales/en.json index 46e75fe6..af748038 100644 --- a/client/src/__locales/en.json +++ b/client/src/__locales/en.json @@ -222,7 +222,7 @@ "updated_upstream_dns_toast": "Upstream servers successfully saved", "dns_test_ok_toast": "Specified DNS servers are working correctly", "dns_test_not_ok_toast": "Server \"{{key}}\": could not be used, please check that you've written it correctly", - "dns_test_warning_toast": "Server \"{{key}}\" does not respond to test requests and may not work properly", + "dns_test_warning_toast": "Upstream \"{{key}}\" does not respond to test requests and may not work properly", "unblock": "Unblock", "block": "Block", "disallow_this_client": "Disallow this client", From 053bb72a004df5f0eaaef827ee08c78af312fbf8 Mon Sep 17 00:00:00 2001 From: Ildar Kamalov Date: Tue, 2 Aug 2022 11:51:49 +0300 Subject: [PATCH 04/28] Pull request: 4775 fix query log issue on tablet devices Updates #4775 Squashed commit of the following: commit 9ad85d2306b68227e11c7b1dd792e3fe6389939d Merge: 95aa29d6 41f081d8 Author: Ildar Kamalov Date: Tue Aug 2 11:44:04 2022 +0300 Merge branch 'master' into 4775-popup commit 95aa29d68bdf5e9c4e7aa59f42d04328b1872115 Author: Ildar Kamalov Date: Mon Aug 1 16:21:23 2022 +0300 client: fix query log issue on tablet devices --- client/src/components/Logs/Cells/index.js | 22 ++++++++++--- client/src/components/Logs/Logs.css | 40 +++++++++++++++++++---- client/src/components/Logs/index.js | 6 ++-- client/src/helpers/constants.js | 2 +- 4 files changed, 55 insertions(+), 15 deletions(-) diff --git a/client/src/components/Logs/Cells/index.js b/client/src/components/Logs/Cells/index.js index 273d9495..05c8bf03 100644 --- a/client/src/components/Logs/Cells/index.js +++ b/client/src/components/Logs/Cells/index.js @@ -139,11 +139,23 @@ const Row = memo(({ } }; - const blockButton = ; + const blockButton = ( + <> +
+ + + ); const blockForClientButton =