mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
AdGuardHome/internal/home
History
Dimitry Kolyshev df61741f60 Pull request: 1163 safesearch http api vol.3 
Merge in DNS/adguard-home from 1163-safesearch-1-3 to master

Squashed commit of the following:

commit f26c5fb4f7a27dc61b10c28d6672d5307796784c
Merge: e7a1b885 143616ca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 23 18:45:25 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3

    # Conflicts:
    #	CHANGELOG.md

commit e7a1b885d6
Merge: 01b73d76 eb5d8a49
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date:   Wed Mar 22 13:55:23 2023 +0200

    Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3

commit 01b73d763c
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date:   Wed Mar 22 13:52:02 2023 +0200

    client: add safe search extended settings to clients

commit eb5d8a499a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 22 18:50:23 2023 +0700

    all: docs

commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 22 09:42:50 2023 +0700

    all: docs

commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda
Merge: 95f9fd3d c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 22 09:42:00 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3

commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date:   Tue Mar 21 15:25:39 2023 +0200

    client: move to new safe search api

commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 22:40:29 2023 +0700

    all: docs

commit aaa287b125c7c7a775b821e0dd272199229a7538
Merge: 16fa7031 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 22:39:14 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3

commit 16fa7031ab2aec31139ace54ffa0155cde8e9135
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 22:39:03 2023 +0700

    all: docs

commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 18:59:47 2023 +0700

    filtering: imp code

commit aab7b70e2355ba86577e5156c1d5569b21b4b358
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 18:40:18 2023 +0700

    filtering: imp code

commit d2870a18ffdb1d293993487073912168d6b75a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Mar 17 21:57:58 2023 +0700

    filtering: imp code

commit 868f5d1ed29c3af702114079e7ffe46e136eb901
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Mar 17 19:06:36 2023 +0700

    all: imp docs

commit f6d70b06ed873684501ce17f647ccf07a85dd50b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Mar 17 19:05:40 2023 +0700

    filtering: imp code

commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 16 14:56:51 2023 +0700

    home: imp code

commit 84d8817512e47a517ed2880ffa9dde5ffda1d288
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 16 09:39:41 2023 +0700

    all: safesearch http api
 		2023-03-23 15:25:58 +03:00
..
auth.go Pull request: HOFTIX-csrf 2022-09-29 19:04:26 +03:00
auth_test.go Pull request: refactor-opts 2022-10-05 17:07:08 +03:00
authglinet.go Pull request: replace agherr with golibs' errors 2021-05-24 17:28:11 +03:00
authglinet_test.go Pull request: use testutil 2021-10-22 11:58:18 +03:00
authratelimiter.go Pull request: use mathutil 2023-01-24 19:50:19 +03:00
authratelimiter_test.go Pull request: 2826 auth block 2021-04-27 18:56:32 +03:00
client.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
clients.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
clients_test.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
clientshttp.go Pull request: 1163 safesearch http api vol.3 2023-03-23 15:25:58 +03:00
clientstags.go Pull request: all: fix lint and naming issues vol. 3 2020-12-07 16:04:53 +03:00
config.go Pull request 1736: 4299-querylog-stats-api 2023-03-23 13:46:57 +03:00
control.go Pull request: 613-dark-theme vol.1 2023-01-13 19:24:17 +03:00
controlinstall.go Pull request 1729: upd-go 2023-02-08 13:39:04 +03:00
controlupdate.go Pull request 1752: 5373-mips-autoupdate 2023-02-27 17:07:31 +03:00
dns.go Pull request 1736: 4299-querylog-stats-api 2023-03-23 13:46:57 +03:00
home.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
home_test.go Pull request: imp-tests 2022-10-27 16:11:36 +03:00
i18n.go Pull request: 613-dark-theme vol.1 2023-01-13 19:24:17 +03:00
middlewares.go Pull request 1717: remove-client2 2023-01-23 12:47:59 +03:00
middlewares_test.go Pull request: use testutil 2021-10-22 11:58:18 +03:00
mobileconfig.go Pull request: 4871 imp filtering 2022-09-23 13:23:35 +03:00
mobileconfig_test.go Pull request: 4925-refactor-tls-vol-2 2022-10-14 19:37:14 +03:00
options.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
options_test.go Pull request: 4223 home: cmd update 2022-11-15 17:44:50 +03:00
profilehttp.go Pull request: 613-dark-theme vol.1 2023-01-13 19:24:17 +03:00
rdns.go Pull request: 4939 Client update 2023-02-10 16:40:36 +03:00
rdns_test.go Pull request: 4939 Client update 2023-02-10 16:40:36 +03:00
service.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
service_linux.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
service_openbsd.go Pull request: 5191-update-flag 2023-01-09 13:38:31 +03:00
service_others.go Pull request: Improve build tags 2022-09-13 20:06:23 +03:00
tls.go Pull request 1717: remove-client2 2023-01-23 12:47:59 +03:00
tls_internal_test.go Pull request: 4898-redirect-https 2022-11-01 13:09:52 +03:00
upgrade.go Pull request 1736: 4299-querylog-stats-api 2023-03-23 13:46:57 +03:00
upgrade_test.go Pull request 1736: 4299-querylog-stats-api 2023-03-23 13:46:57 +03:00
web.go Pull request 1729: upd-go 2023-02-08 13:39:04 +03:00
whois.go Pull request: 5035-more-clients-netip-addr 2022-11-09 14:37:07 +03:00
whois_test.go Pull request: all: imp docs, names 2021-06-18 18:13:36 +03:00