mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
AdGuardHome/internal/dnsforward
History
Dimitry Kolyshev 9c48e96939 Pull request: 1333-protection-pause vol.1 
Merge in DNS/adguard-home from 1333-protection-pause-1 to master

Squashed commit of the following:

commit 5ff98385bc5ff66e214d80782eb4dc41e344aa38
Merge: 97f94a54 0bc3ef89
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Mar 24 19:08:21 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

commit 97f94a5498ac221f88f2f7dfef4b255f4945329e
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Fri Mar 24 13:03:20 2023 +0200

    Fix protection timer bugs

commit 1cc61af1996bd803f3fa638cb9e2388470072bf0
Merge: 5a144ea3 235ce458
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 23 22:27:47 2023 +0700

    Merge remote-tracking branch 'origin/1333-protection-pause-1' into 1333-protection-pause-1

commit 5a144ea3a48c3d0d5e57dd14232ab7a8e77a8c1e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 23 22:25:08 2023 +0700

    dnsforward: imp code

commit 235ce458a62b3152f36e32580ed0226a56580ec6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Mar 23 17:35:06 2023 +0300

    dnsforward: imp locks

commit 0ea3a0a176b810a2b3f0b307aa406fe1670c9219
Merge: 52f66810 df61741f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 23 19:30:41 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	CHANGELOG.md
    #	openapi/CHANGELOG.md

commit 52f668109673286a50909c042e6352cd803e8eed
Merge: 9a7eb7b3 306c1983
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Mar 23 11:23:50 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	CHANGELOG.md
    #	internal/dnsforward/http.go

commit 9a7eb7b3ab2b5f6ad321aa3245d33839c3aa6fbd
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Wed Mar 22 06:56:55 2023 +0200

    Review fix

commit 5612d51252ba91842bd6811baec1c91136bb3bf2
Merge: c0a918a5 c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Mar 21 22:00:39 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	client/src/__locales/en.json

commit c0a918a518ad9b37041aed159d215516258bc987
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Tue Mar 21 12:13:18 2023 +0200

    Review fix

commit 34faa61cc1e6210a612e7a2f4895a1504df37680
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Tue Mar 21 10:43:37 2023 +0200

    Fix props to new api

commit 158e582373863495f0e0ca177d7b365cc66ad671
Author: Arseny Lisin <a.lisin@adguard.com>
Date:   Mon Mar 20 18:44:34 2023 +0200

    Review fix

commit 9e8b8c3778b8e1dfad0d39e44f70886dfd3aeb9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 22:31:28 2023 +0700

    all: docs

commit 761a203f53b535ca235cfe62f289bd0e02b90be2
Merge: d0b07231 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 20 22:26:13 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

commit d0b07231b6f29b534930f1fcfc82b4934c295ff8
Merge: ea448760 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Mar 13 13:00:52 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	CHANGELOG.md
    #	client/src/components/App/index.css
    #	internal/dnsforward/config.go

commit ea4487608a9c81d25f155ff63fee7c9dcf21f448
Merge: dfd0f33f a556ce8f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Feb 21 11:54:27 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	CHANGELOG.md

commit dfd0f33fb474d497cbc9237ee466276728eea397
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Feb 21 11:51:40 2023 +0700

    all: docs

commit d36df96fba8c6d923faef85c198b6bd0743b7ee8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Feb 20 12:41:49 2023 +0700

    all: safesearch

commit 60f2ceec563221337f34bb60baa96aa2b2429c40
Merge: 7c514427 6f6ced33
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Feb 20 12:30:42 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	CHANGELOG.md

commit 7c514427e77c5b09d8e148c78220a71046e68cd1
Merge: 0fa4ff99 4d295a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Feb 16 11:55:21 2023 +0700

    Merge remote-tracking branch 'origin/master' into 1333-protection-pause-1

    # Conflicts:
    #	CHANGELOG.md

... and 26 more commits
 		2023-03-24 15:11:47 +03:00
..
testdata Pull request: 1333-protection-pause vol.1 2023-03-24 15:11:47 +03:00
access.go Pull request 1750: 5468-disallowed-dnstype 2023-02-27 16:48:32 +03:00
access_test.go Pull request 1750: 5468-disallowed-dnstype 2023-02-27 16:48:32 +03:00
clientid.go Pull request: Pull request: 4884 Update golibs 2023-02-21 16:52:33 +03:00
clientid_test.go Pull request: Pull request: 4884 Update golibs 2023-02-21 16:52:33 +03:00
config.go Pull request: 1333-protection-pause vol.1 2023-03-24 15:11:47 +03:00
config_test.go Pull request: Pull request: 4884 Update golibs 2023-02-21 16:52:33 +03:00
dns.go Pull request: 1333-protection-pause vol.1 2023-03-24 15:11:47 +03:00
dns64.go Pull request: 5117-backport-dns64 2023-02-06 17:17:51 +03:00
dns64_test.go Pull request 1744: 1472-edns-custom-ip 2023-03-01 16:16:16 +03:00
dns_test.go Pull request #1770: 5567-extract-subnet-arpa 2023-03-17 17:10:33 +03:00
dnsforward.go Pull request: 4939 Client update 2023-02-10 16:40:36 +03:00
dnsforward_test.go Pull request 1771: AG-20352-dhcpd-lease-netip-addr 2023-03-23 16:52:01 +03:00
dnsrewrite.go Pull request: upd-pkgs-tools 2022-10-28 17:42:45 +03:00
dnsrewrite_test.go Pull request: 4865-refactor-dns-handlers 2022-09-02 14:52:19 +03:00
filter.go Pull request 1750: 5468-disallowed-dnstype 2023-02-27 16:48:32 +03:00
filter_test.go Pull request 1744: 1472-edns-custom-ip 2023-03-01 16:16:16 +03:00
http.go Pull request: 1333-protection-pause vol.1 2023-03-24 15:11:47 +03:00
http_test.go Pull request 1758: 1472-edns-custom-ip-api 2023-03-22 13:42:20 +03:00
ipset.go Pull request: aghnet: fix ipset init errors 2021-12-27 20:54:00 +03:00
ipset_test.go Pull request: aghnet: fix adding entry into multiple ipsets 2021-09-22 14:37:40 +03:00
msg.go Pull request: 4890-panic-internal-proxy 2022-09-06 17:09:54 +03:00
recursiondetector.go Pull request: filtering: fix rw to subdomain 2021-12-27 19:40:39 +03:00
recursiondetector_test.go Pull request: 3157 excessive ptrs 2022-04-19 15:01:49 +03:00
stats.go Pull request 1731: 4299-stats-ignore 2023-02-13 18:15:33 +03:00
stats_test.go Pull request 1731: 4299-stats-ignore 2023-02-13 18:15:33 +03:00
svcbmsg.go dnsforward: imp code, fmt 2022-08-29 15:54:41 +03:00
svcbmsg_test.go Pull request #1473: svcb dohpath support 2022-04-12 15:45:18 +03:00