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 2b5e4850d0 Pull request: 1163 safesearch vol.2 
Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master

Squashed commit of the following:

commit d3a5ebef35210019842145074e898129b42f1f2c
Merge: b85264ae c6706445
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 15 09:17:53 2023 +0700

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

    # Conflicts:
    #	CHANGELOG.md

commit b85264aefc5f191ac6cb194b519f03ba15829a4e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Mar 14 00:16:07 2023 +0700

    home: imp code

commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 23:02:06 2023 +0700

    all: changelog

commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 22:42:36 2023 +0700

    all: changelog

commit 37df29bf6372939644fb28e3d70365496e0cb4f6
Merge: b227b277 595484e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 22:38:57 2023 +0700

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

commit b227b2775b4866d69241ad87acf99700715552cb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 16:56:01 2023 +0700

    all: imp docs

commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 16:55:03 2023 +0700

    home: imp code

commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 12:16:53 2023 +0700

    home: imp docs

commit 5f573a56a9fd9942ad677fa0fae6b24228dab653
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 11:56:47 2023 +0700

    home: imp code

commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Mar 10 10:57:33 2023 +0700

    home: imp code

commit 643de2fca1b5917c61fe83e1e472222404f3cd21
Merge: dada6e63 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 9 21:03:08 2023 +0700

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

commit dada6e63ca5324d30775e2da1727da891743f654
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 9 17:09:03 2023 +0700

    all: imp docs

commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 9 15:12:43 2023 +0700

    all: imp code

commit fa84877bc777004d246d71d0a9ae0bd9ee568a91
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 9 10:53:05 2023 +0700

    all: imp code

commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 9 10:40:02 2023 +0700

    all: imp docs

commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Mar 7 22:00:52 2023 +0700

    safesearch: fix merge

commit 145c2222ba4cf7f8909b816d83829d2217c94243
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 2 11:41:48 2023 +0700

    safesearch: fix merge

commit 14c6a8005fe15b5d5a39f91b17c96d8670975811
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 1 12:50:09 2023 +0700

    all: docs

commit 2a85c8831866bf1c34c423a289461fc1e32667b5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Mar 1 12:47:00 2023 +0700

    all: use safesearch package
 		2023-03-15 14:31:07 +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 vol.2 2023-03-15 14:31:07 +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 1761: home: fix panic 2023-03-07 14:37:14 +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: 1163 safesearch vol.2 2023-03-15 14:31:07 +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: 1163 safesearch vol.2 2023-03-15 14:31:07 +03:00
upgrade_test.go Pull request: 1163 safesearch vol.2 2023-03-15 14:31:07 +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