Skip to content

[pull] master from AdguardTeam:master #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1,118 commits into
base: master
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Dec 22, 2021

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Dec 22, 2021
@adguard adguard force-pushed the master branch 2 times, most recently from 1cbbb6d to 9fda7bf Compare June 12, 2023 10:53
schzhn and others added 27 commits March 20, 2024 19:25
Updates #5829.

Squashed commit of the following:

commit 8a93b30
Merge: 8e4429c 54f77c0
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Mar 20 19:15:07 2024 +0300

    Merge branch 'master' into 5829-trusted-ip

commit 8e4429c
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Mar 20 18:37:26 2024 +0300

    all: upd chlog

commit b598a8d
Merge: 1f58bf8 0542339
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Mar 20 18:34:13 2024 +0300

    Merge branch 'master' into 5829-trusted-ip

commit 1f58bf8
Merge: ffb4b9a c64a36c
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Mar 20 17:09:09 2024 +0300

    Merge branch 'master' into 5829-trusted-ip

commit ffb4b9a
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Mar 14 17:40:07 2024 +0300

    home: fix alignment

commit 7f11807
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Mar 14 17:35:13 2024 +0300

    all: imp code

commit 2aee9a6
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Mar 11 18:17:58 2024 +0300

    home: real ip in logs
Squashed commit of the following:

commit 8713a08
Merge: 7eed5e8 3b12ff2
Author: Ainar Garipov <[email protected]>
Date:   Wed Mar 20 20:26:11 2024 +0300

    Merge branch 'master' into fix-docker-build

commit 7eed5e8
Author: Ainar Garipov <[email protected]>
Date:   Wed Mar 20 20:12:16 2024 +0300

    bamboo-specs: fix docker build
Squashed commit of the following:

commit 1f7be03
Author: Ainar Garipov <[email protected]>
Date:   Thu Mar 21 13:35:37 2024 +0300

    all: use standard md style in some docs
Squashed commit of the following:

commit 87bad8c
Author: Ainar Garipov <[email protected]>
Date:   Thu Mar 21 16:39:12 2024 +0300

    all: imp lint, names, tests

commit 284f8c7
Author: Ainar Garipov <[email protected]>
Date:   Thu Mar 21 15:37:54 2024 +0300

    filtering: imp id handling
Updates #6851.

Squashed commit of the following:

commit ffc50da
Author: Eugene Burkov <[email protected]>
Date:   Mon Mar 25 17:55:39 2024 +0300

    all: fix changelog

commit cdc2193
Author: Eugene Burkov <[email protected]>
Date:   Mon Mar 25 17:28:06 2024 +0300

    dnsforward: fix upstream mode set
Updates #6717.

Squashed commit of the following:

commit d17a6de
Merge: 806ff9b 9305c45
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 1 09:22:33 2024 +0800

    Merge remote-tracking branch 'origin/master' into 6717-fix-conf-symlink

    # Conflicts:
    #	CHANGELOG.md

commit 806ff9b
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Mar 28 09:00:00 2024 +0800

    home: imp code

commit 06dbcfe
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Mar 27 13:55:30 2024 +0800

    all: changelog

commit 5476625
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Mar 27 13:43:17 2024 +0800

    home: fix conf symlink usage
Squashed commit of the following:

commit 1abd78a
Author: Ainar Garipov <[email protected]>
Date:   Mon Apr 1 17:53:50 2024 +0300

    all: imp readme; add projects
Closes #6758.

Squashed commit of the following:

commit d62b427
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 2 18:25:34 2024 +0300

    all: add docs

commit bb129d7
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 2 17:04:42 2024 +0300

    all: upd chlog

commit 59573d9
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 2 15:38:42 2024 +0300

    all: embed tzdata
Squashed commit of the following:

commit 63c14cf
Author: Ainar Garipov <[email protected]>
Date:   Tue Apr 2 20:10:10 2024 +0300

    all: imp code, docs

commit 185ccdd
Merge: b6ca80a d4fff41
Author: Ainar Garipov <[email protected]>
Date:   Tue Apr 2 20:04:23 2024 +0300

    Merge branch 'master' into upd-golibs

commit b6ca80a
Author: Ainar Garipov <[email protected]>
Date:   Tue Apr 2 20:01:10 2024 +0300

    all: upd to tags

commit 474f623
Author: Ainar Garipov <[email protected]>
Date:   Tue Mar 26 16:33:45 2024 +0300

    all: upd golibs
Squashed commit of the following:

commit 483b77a
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 3 20:41:12 2024 +0300

    all: upd docker

commit 6fff1f8
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 3 20:25:07 2024 +0300

    all: upd go, i18n, flts, svcs
Squashed commit of the following:

commit a1bd3c2
Author: Ainar Garipov <[email protected]>
Date:   Thu Apr 4 14:59:37 2024 +0300

    all: upd more

commit 9e55bbb
Author: Ainar Garipov <[email protected]>
Date:   Thu Apr 4 14:12:45 2024 +0300

    all: upd go code
Squashed commit of the following:

commit d0b37e3
Merge: 025c29b ee619b2
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 4 18:58:08 2024 +0300

    Merge branch 'master' into AG-27492-client-runtime-index

commit 025c29b
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 1 17:20:15 2024 +0300

    client: imp code

commit 548a15c
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Mar 28 13:43:17 2024 +0300

    all: add tests

commit c9015e7
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Mar 25 16:33:30 2024 +0300

    all: imp docs

commit 81e8b94
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Mar 25 15:33:17 2024 +0300

    all: imp code

commit 1428d60
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Mar 25 14:45:01 2024 +0300

    all: client runtime index
Squashed commit of the following:

commit 85deb72
Author: Ainar Garipov <[email protected]>
Date:   Fri Apr 5 18:30:40 2024 +0300

    all: upd chlog
Updates #5345.

Squashed commit of the following:

commit 66ceac9
Merge: 8be4dce 82247d7
Author: Stanislav Chzhen <[email protected]>
Date:   Fri Apr 5 19:05:48 2024 +0300

    Merge branch 'master' into 5345-ipset-file-comments

commit 8be4dce
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 2 14:56:21 2024 +0300

    all: upd chlog

commit 53c7213
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 2 14:48:56 2024 +0300

    dnsforward: ipset file comments
Closes #6854.Updates #6875.

Squashed commit of the following:

commit b98adbc
Author: Eugene Burkov <[email protected]>
Date:   Wed Apr 10 19:21:44 2024 +0300

    dnsforward: upd proxy, imp code, docs

commit 4de1eb2
Author: Eugene Burkov <[email protected]>
Date:   Wed Apr 10 16:09:58 2024 +0300

    WIP

commit afa9d61
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 9 19:24:09 2024 +0300

    all: log changes

commit c834067
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 9 19:06:10 2024 +0300

    dnsforward: move code

commit 08bb7d4
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 9 18:09:46 2024 +0300

    dnsforward: imp code

commit b27547e
Merge: b7efca7 6f36ebc
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 9 17:33:19 2024 +0300

    Merge branch 'master' into AGDNS-1982-upd-proxy

commit b7efca7
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 9 17:27:14 2024 +0300

    all: upd proxy finally

commit 3e16fa8
Author: Eugene Burkov <[email protected]>
Date:   Fri Apr 5 18:20:13 2024 +0300

    dnsforward: upd proxy

commit f3cdfc8
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 4 20:37:32 2024 +0300

    all: upd proxy, golibs

commit a79298d
Merge: 9feeba5 fd25dca
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 4 20:34:01 2024 +0300

    Merge branch 'master' into AGDNS-1982-upd-proxy

commit 9feeba5
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 4 20:25:57 2024 +0300

    all: imp code, docs

commit 6c68d46
Merge: d8108e6 ee619b2
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 4 18:46:11 2024 +0300

    Merge branch 'master' into AGDNS-1982-upd-proxy

commit d8108e6
Author: Eugene Burkov <[email protected]>
Date:   Wed Apr 3 19:25:27 2024 +0300

    all: imp code

commit 2046156
Author: Eugene Burkov <[email protected]>
Date:   Wed Apr 3 17:10:33 2024 +0300

    all: remove private rdns logic
Squashed commit of the following:

commit bb94329
Author: Ainar Garipov <[email protected]>
Date:   Mon Apr 15 13:53:23 2024 +0300

    all: upd golibs
Updates #5812.

Squashed commit of the following:

commit 43aa147
Merge: 97ab712 36986a8
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 15 15:00:36 2024 +0300

    Merge branch 'master' into 5812-query-log-client-id

commit 97ab712
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 11 14:22:58 2024 +0300

    all: upd chlog

commit 525ac91
Merge: 5d4db3f ff7c715
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 11 14:15:28 2024 +0300

    Merge branch 'master' into 5812-query-log-client-id

commit 5d4db3f
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 10 16:19:11 2024 +0300

    dnsforward: client id priority
Squashed commit of the following:

commit a7d5023
Merge: 0be18b9 df7f19e
Author: Eugene Burkov <[email protected]>
Date:   Mon Apr 15 15:11:51 2024 +0300

    Merge branch 'master' into AGDNS-1982-fix-rdns-http

commit 0be18b9
Merge: 54c1017 36986a8
Author: Eugene Burkov <[email protected]>
Date:   Mon Apr 15 15:04:42 2024 +0300

    Merge branch 'master' into AGDNS-1982-fix-rdns-http

commit 54c1017
Author: Eugene Burkov <[email protected]>
Date:   Mon Apr 15 14:00:14 2024 +0300

    all: log changes

commit 851a1a3
Author: Eugene Burkov <[email protected]>
Date:   Mon Apr 15 13:44:13 2024 +0300

    dnsforward: fix http private rdns
Squashed commit of the following:

commit 5507401
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 16 17:16:41 2024 +0300

    all: rm replace

commit 983f8d1
Merge: d9fc69d 201ac73
Author: Eugene Burkov <[email protected]>
Date:   Tue Apr 16 16:06:28 2024 +0300

    Merge branch 'master' into fix-access-error

commit d9fc69d
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 11 19:18:24 2024 +0300

    all: fix before request, upd golibs
Updates #6192.

Squashed commit of the following:

commit e98c2f0
Merge: 4dd9218 6f7d5cc
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 16 17:24:38 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit 4dd9218
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 16 16:12:24 2024 +0300

    all: upd chlog

commit e126e12
Merge: d57c34c 201ac73
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 16 14:34:45 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit d57c34c
Merge: decb768 df7f19e
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 15 16:26:57 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit decb768
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 11 17:06:54 2024 +0300

    all: upd chlog

commit c8184be
Merge: 5e0059b ff7c715
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 11 16:52:10 2024 +0300

    Merge branch 'master' into 6192-access-ipv6-zone

commit 5e0059b
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 10 16:59:37 2024 +0300

    dnsforward: access ipv6 zone
Squashed commit of the following:

commit 85ea3d9
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Apr 18 15:19:38 2024 +0200

    all: imp docs

commit b0695da
Merge: a79f98f 48c6242
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 17 11:06:49 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https

    # Conflicts:
    #	CHANGELOG.md

commit a79f98f
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 17 11:05:34 2024 +0200

    dnsforward: imp code

commit b901a11
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 16 11:03:52 2024 +0200

    dnsforward: imp code

commit fb6e669
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 16 10:08:51 2024 +0200

    all: safesearch rewrites

commit 88add21
Merge: b78ad8f 201ac73
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 16 09:43:20 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https

    # Conflicts:
    #	CHANGELOG.md

commit b78ad8f
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Apr 12 13:34:39 2024 +0200

    all: safesearch rewrites

commit fb3efbb
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Apr 11 13:15:37 2024 +0200

    safesearch: imp code

commit 1193c70
Merge: 14e823d ff7c715
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Apr 11 13:13:44 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https

    # Conflicts:
    #	CHANGELOG.md

commit 14e823d
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Apr 11 13:11:43 2024 +0200

    all: safesearch https

commit cd403a2
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Apr 11 12:09:27 2024 +0200

    Revert "all: safesearch https"

    This reverts commit 1c9564b.

commit 1c9564b
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 10 12:41:47 2024 +0200

    all: safesearch https

commit 5f42688
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 10 09:22:30 2024 +0200

    filtering: imp code

commit eb9bd9f
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 10 09:19:22 2024 +0200

    all: changelog

commit 0c77c70
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 10 08:55:22 2024 +0200

    safesearch: imp tests

commit 492a93f
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 9 14:45:16 2024 +0200

    all: changelog

commit a665e72
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 9 14:41:24 2024 +0200

    safesearch: https req
Updates #6882.

Squashed commit of the following:

commit 80fa6d6
Merge: c0fdf1a 762ef4a
Author: Eugene Burkov <[email protected]>
Date:   Mon Apr 22 18:53:18 2024 +0300

    Merge branch 'master' into 6882-extend-private-rdns

commit c0fdf1a
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 18 18:19:36 2024 +0300

    client: imp ui text

commit f07a509
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 18 16:22:11 2024 +0300

    all: imp docs, upd proxy

commit 0d33079
Author: Eugene Burkov <[email protected]>
Date:   Thu Apr 18 12:48:50 2024 +0300

    all: upd proxy
Updates #6717.

Squashed commit of the following:

commit ae80a77
Merge: 73bd061 f85d048
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 23 13:26:05 2024 +0200

    Merge remote-tracking branch 'origin/master' into 6717-freebsd-daemon

commit 73bd061
Author: Dimitry Kolyshev <[email protected]>
Date:   Sun Apr 14 10:23:14 2024 +0200

    home: imp freebsd daemon
Merge in DNS/adguard-home from AG-31863-dnsforward-tests to master

Squashed commit of the following:

commit cbdad62
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 24 15:00:15 2024 +0200

    dnsforward: imp tests

commit b71304a
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 24 12:53:51 2024 +0200

    dnsforward: imp tests

commit 3c42fca
Merge: 50888df 60f48e2
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 24 08:41:19 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit 50888df
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 24 08:39:37 2024 +0200

    dnsforward: imp code

commit dcd5e41
Merge: af2507b f85d048
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 23 10:02:45 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit af2507b
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 23 10:01:30 2024 +0200

    dnsforward: imp tests

commit 67fc9d3
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 22 10:37:45 2024 +0200

    dnsforward: imp tests

commit e7f7df2
Merge: c610a6c 762ef4a
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 22 09:51:04 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit c610a6c
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Apr 19 12:28:49 2024 +0200

    dnsforward: imp tests

commit ca252e8
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Apr 19 11:58:49 2024 +0200

    dnsforward: imp tests

commit 9d4de18
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Apr 19 11:38:15 2024 +0200

    dnsforward: imp tests

commit a349374
Merge: 2243770 48c6242
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 17 11:02:56 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit 2243770
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 16 10:56:40 2024 +0200

    dnsforward: imp tests

commit 4c4b565
Merge: f1e4b72 201ac73
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Apr 16 10:53:48 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests

commit f1e4b72
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 15 12:36:21 2024 +0200

    dnsforward: imp tests

commit 6ee6cc9
Author: Dimitry Kolyshev <[email protected]>
Date:   Sun Apr 14 13:55:09 2024 +0200

    dnsforward: add test
Updates #6422.

Squashed commit of the following:

commit 6baf47e
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 24 16:37:15 2024 +0300

    all: upd again

commit 2ad480a
Merge: 5b260d0 0cff3db
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 24 16:37:02 2024 +0300

    Merge branch 'master' into 6422-upd-quic-go

commit 5b260d0
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 24 14:39:35 2024 +0300

    all: upd quic-go
Updates #6312.

Squashed commit of the following:

commit bd9146e
Merge: 58d2fd9 856cc40
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 24 18:09:19 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit 58d2fd9
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 24 18:00:56 2024 +0300

    client: imp naming

commit 922a14b
Merge: 6f4d58f 60f48e2
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 24 14:29:00 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit 6f4d58f
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 24 14:27:55 2024 +0300

    client: imp docs

commit fa292ee
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 22 19:20:28 2024 +0300

    client: fix typo

commit 599414b
Merge: 5025717 762ef4a
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 22 18:42:06 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit 5025717
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 22 18:39:22 2024 +0300

    all: imp code; add tests

commit 155b2fe
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 16 19:56:00 2024 +0300

    all: upd chlog; imp code

commit 7a4426c
Merge: e9c1cbb 48c6242
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 16 19:52:00 2024 +0300

    Merge branch 'master' into 6312-client-ipv6-zone

commit e9c1cbb
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Apr 10 16:23:07 2024 +0300

    client: client ipv6 zone
schzhn and others added 30 commits April 25, 2025 21:33
Merge in DNS/adguard-home from AGDNS-2686-fix-custom-upstream-cache to master

Squashed commit of the following:

commit 11ad20a
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 24 18:51:35 2025 +0300

    client: imp docs

commit e6d73f2
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 24 17:36:05 2025 +0300

    all: imp chlog

commit b8fdd88
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 24 17:05:11 2025 +0300

    client: fix dhcp clients cache

commit 1760699
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 24 15:37:50 2025 +0300

    all: upd chlog

commit c6f049c
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 24 15:33:53 2025 +0300

    client: imp tests

commit 7432de7
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Apr 24 15:32:26 2025 +0300

    client: fix custom upstream cache
Closes #7790.

Squashed commit of the following:

commit 9e871bc
Author: Ainar Garipov <[email protected]>
Date:   Tue Apr 29 14:48:58 2025 +0300

    client: fix cache label
Merge in DNS/adguard-home from AGDNS-2817-fix-tls-test to master

Squashed commit of the following:

commit 8cd435e
Merge: b9544ba af7c2e3
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 29 19:54:17 2025 +0300

    Merge branch 'master' into AGDNS-2817-fix-tls-test

commit b9544ba
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 28 15:28:05 2025 +0300

    home: fix tls test
Merge in DNS/adguard-home from AG-40703-fix-custom-cache to master

Squashed commit of the following:

commit e9b9aa3
Merge: b8ec40b e5d0f0b
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 6 16:58:37 2025 +0300

    Merge branch 'master' into AG-40703-fix-custom-cache

commit b8ec40b
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 6 16:20:48 2025 +0300

    all: upd proxy

commit 0266245
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Apr 28 15:46:28 2025 +0300

    all: fix custom cache
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit cb4a237
Author: Eugene Burkov <[email protected]>
Date:   Tue May 6 17:25:50 2025 +0300

    client: upd i18n
Merge in DNS/adguard-home from AGDNS-2818-upd-golibs to master

Squashed commit of the following:

commit f2a41b8
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed May 7 09:52:32 2025 +0300

    client: imp code

commit b4b668f
Merge: c6f89e0 b5c4705
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed May 7 09:47:54 2025 +0300

    Merge remote-tracking branch 'origin/master' into AGDNS-2818-upd-golibs
    
    # Conflicts:
    #	go.mod
    #	go.sum

commit c6f89e0
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 30 14:10:33 2025 +0300

    client: imp code

commit cf07b18
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 30 10:31:44 2025 +0300

    client: imp code

commit a10d4b1
Merge: 447a79c e5d0f0b
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Apr 30 10:24:00 2025 +0300

    Merge remote-tracking branch 'origin/master' into AGDNS-2818-upd-golibs

commit 447a79c
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 28 13:02:40 2025 +0300

    all: upd golibs

commit 693ef4f
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 28 12:47:39 2025 +0300

    all: upd golibs

commit a4f90ea
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Apr 28 10:25:33 2025 +0300

    all: upd golibs
Closes #7801.

Squashed commit of the following:

commit f6e924e
Merge: 9caa549 8c8323a
Author: Stanislav Chzhen <[email protected]>
Date:   Wed May 7 16:22:09 2025 +0300

    Merge branch 'master' into 7801-fix-cmd-update

commit 9caa549
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 29 20:52:09 2025 +0300

    home: imp code

commit 765ea00
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Apr 29 20:16:55 2025 +0300

    all: fix cmd update
Squashed commit of the following:

commit 89c3df4
Author: Ainar Garipov <[email protected]>
Date:   Mon May 12 18:59:39 2025 +0300

    updater: imp log

commit d78ba43
Merge: 6841095 187b759
Author: Ainar Garipov <[email protected]>
Date:   Mon May 12 18:53:33 2025 +0300

    Merge branch 'master' into AGDNS-2374-updater-slog

commit 6841095
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 30 15:54:30 2025 +0300

    updater: imp docs

commit 99a7052
Author: Ainar Garipov <[email protected]>
Date:   Wed Apr 30 15:40:30 2025 +0300

    updater: imp docs, logs

commit 2a83ee3
Author: Ainar Garipov <[email protected]>
Date:   Tue Apr 29 21:01:02 2025 +0300

    updater: use slog
Merge in DNS/adguard-home from upd-proxy to master

Squashed commit of the following:

commit 2d9f5f1
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 13 17:51:14 2025 +0300

    all: upd proxy
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit 2bdbf9a
Author: Eugene Burkov <[email protected]>
Date:   Wed May 14 17:19:01 2025 +0300

    all: upd go, tools

commit a07ff5f
Author: Eugene Burkov <[email protected]>
Date:   Wed May 14 17:14:03 2025 +0300

    client: upd i18n
Merge in DNS/adguard-home from AGDNS-2743-auth-tests to master

Squashed commit of the following:

commit 86fed98
Merge: aa25b02 5f8f067
Author: Stanislav Chzhen <[email protected]>
Date:   Fri May 16 21:58:08 2025 +0300

    Merge branch 'master' into AGDNS-2743-auth-tests

commit aa25b02
Author: Stanislav Chzhen <[email protected]>
Date:   Fri May 16 17:02:54 2025 +0300

    home: imp tests

commit a16c1fb
Author: Stanislav Chzhen <[email protected]>
Date:   Wed May 14 22:32:45 2025 +0300

    home: add tests

commit 6109e35
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 13 22:23:41 2025 +0300

    home: add tests

commit 88706e9
Author: Stanislav Chzhen <[email protected]>
Date:   Wed May 7 15:46:22 2025 +0300

    home: auth tests
Merge in DNS/adguard-home from AGDNS-2743-auth-fix-tests to master

Squashed commit of the following:

commit 954dce8
Author: Stanislav Chzhen <[email protected]>
Date:   Mon May 19 17:43:02 2025 +0300

    home: auth fix tests
Updates #2945.

Squashed commit of the following:

commit 305026d
Author: Ainar Garipov <[email protected]>
Date:   Wed May 21 14:37:58 2025 +0300

    all: upd chlog

commit bb8288c
Author: Ainar Garipov <[email protected]>
Date:   Wed May 21 14:31:04 2025 +0300

    client: fix types in helper
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit 9bf9d07
Author: Eugene Burkov <[email protected]>
Date:   Mon May 26 13:57:52 2025 +0300

    client: upd i18n

commit 1614ecb
Author: Eugene Burkov <[email protected]>
Date:   Mon May 26 13:43:30 2025 +0300

    filtering: upd blocked services
Merge in DNS/adguard-home from fix-specs to master

Squashed commit of the following:

commit 023af84
Author: Eugene Burkov <[email protected]>
Date:   Mon May 26 14:18:27 2025 +0300

    bamboo-specs: fix container name
Merge in DNS/adguard-home from upd-deps to master

Squashed commit of the following:

commit 1daffa8
Author: Eugene Burkov <[email protected]>
Date:   Mon May 26 15:51:48 2025 +0300

    all: upd deps
Merge in DNS/adguard-home from upd-chlog to master

Squashed commit of the following:

commit f85a755
Author: Eugene Burkov <[email protected]>
Date:   Tue May 27 15:43:35 2025 +0300

    all: fix order

commit 6d1daa0
Author: Eugene Burkov <[email protected]>
Date:   Tue May 27 15:25:23 2025 +0300

    all: upd chlog
Merge in DNS/adguard-home from AGDNS-2743-auth-middleware to master

Squashed commit of the following:

commit 3d0621f
Merge: 320581b 57dc791
Author: Stanislav Chzhen <[email protected]>
Date:   Fri May 30 16:38:22 2025 +0300

    Merge branch 'master' into AGDNS-2743-auth-middleware

commit 320581b
Author: Stanislav Chzhen <[email protected]>
Date:   Thu May 29 21:39:13 2025 +0300

    all: imp code

commit 4de3e7e
Author: Stanislav Chzhen <[email protected]>
Date:   Thu May 29 17:46:51 2025 +0300

    home: imp tests

commit 6556aa4
Author: Stanislav Chzhen <[email protected]>
Date:   Wed May 28 22:53:01 2025 +0300

    all: add tests

commit 338eea6
Author: Stanislav Chzhen <[email protected]>
Date:   Tue May 27 15:53:31 2025 +0300

    home: ctx key web user

commit 0453e5a
Author: Stanislav Chzhen <[email protected]>
Date:   Thu May 22 14:28:09 2025 +0300

    home: auth mw
Merge in DNS/adguard-home from AGDNS-2929-systemd-service-status to master

Squashed commit of the following:

commit 89ec40c
Merge: 8fe6f2f 21834ee
Author: Eugene Burkov <[email protected]>
Date:   Mon Jun 2 13:55:34 2025 +0300

    Merge branch 'master' into AGDNS-2929-systemd-service-status

commit 8fe6f2f
Author: Eugene Burkov <[email protected]>
Date:   Fri May 30 16:59:11 2025 +0300

    home: fix doc

commit cb947ed
Author: Eugene Burkov <[email protected]>
Date:   Thu May 29 22:29:54 2025 +0300

    home: imp docs

commit 3edfffd
Author: Eugene Burkov <[email protected]>
Date:   Thu May 29 15:21:26 2025 +0300

    home: reimpl status on systemd
Merge in DNS/adguard-home from AGNDS-2949-fix-dhcp-name-resolve to master

Squashed commit of the following:

commit f766313
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 3 17:39:19 2025 +0300

    dnsforward: fix test

commit a181c98
Author: Eugene Burkov <[email protected]>
Date:   Mon Jun 2 17:37:38 2025 +0300

    dnsforward: add tests, imp docs

commit 81cee6f
Author: Eugene Burkov <[email protected]>
Date:   Mon Jun 2 17:20:49 2025 +0300

    dnsforward: match whole subdomain for dhcp names
Merge in DNS/adguard-home from AGDNS-2743-auth-middleware-glinet to master

Squashed commit of the following:

commit 66b6b3d
Merge: 7adae7e e1f87ac
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 5 16:08:23 2025 +0300

    Merge branch 'master' into AGDNS-2743-auth-middleware-glinet

commit 7adae7e
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 5 15:02:21 2025 +0300

    all: imp code

commit fbdc43c
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Jun 4 21:50:38 2025 +0300

    home: add todo

commit 891db07
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Jun 4 20:36:29 2025 +0300

    home: imp docs

commit c706ab6
Author: Stanislav Chzhen <[email protected]>
Date:   Tue Jun 3 22:40:07 2025 +0300

    home: imp code

commit 5c75efd
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Jun 2 21:06:30 2025 +0300

    home: auth middleware glinet config

commit f537365
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Jun 2 15:46:26 2025 +0300

    home: auth middleware glinet
Merge in DNS/adguard-home from 4923-gopacket-dhcp-vol.10 to master

Squashed commit of the following:

commit ef2106a
Merge: f14e687 f69da06
Author: Eugene Burkov <[email protected]>
Date:   Mon Jun 9 16:13:52 2025 +0300

    Merge branch 'master' into 4923-gopacket-dhcp-vol.10

commit f14e687
Author: Eugene Burkov <[email protected]>
Date:   Fri Jun 6 18:36:32 2025 +0300

    dhcpsvc: imp code, docs

commit c94b428
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 5 13:21:37 2025 +0300

    dhcpsvc: imp code

commit 57eaea0
Author: Eugene Burkov <[email protected]>
Date:   Wed Jun 4 19:48:03 2025 +0300

    dhcpsvc: add methods

commit b322188
Author: Eugene Burkov <[email protected]>
Date:   Wed Apr 30 15:57:53 2025 +0300

    dhcpsvc: add handlers

commit 615f124
Author: Eugene Burkov <[email protected]>
Date:   Tue Jan 14 16:10:01 2025 +0300

    dhcpsvc: multiplex dhcpv4
Merge in DNS/adguard-home from AGDNS-2744-close-listeners-on-err to master

Squashed commit of the following:

commit c85f722
Merge: 862a5e9 d4ee146
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 10 15:47:23 2025 +0300

    Merge branch 'master' into AGDNS-2744-close-listeners-on-err

commit 862a5e9
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 10 15:08:58 2025 +0300

    all: upd proxy

commit 45e08fc
Author: Eugene Burkov <[email protected]>
Date:   Fri Jun 6 18:39:40 2025 +0300

    dhcpsvc: revert changes

commit b6ff4d5
Author: Eugene Burkov <[email protected]>
Date:   Fri Jun 6 15:21:20 2025 +0300

    dhcpsvc: imp code, docs

commit 25f9650
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 5 20:24:38 2025 +0300

    all: go mod tidy

commit 1e18195
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 5 20:19:43 2025 +0300

    all: upd proxy
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit 7e0b443
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 10 15:52:49 2025 +0300

    client: upd i18n

commit 5c17d66
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 10 15:45:09 2025 +0300

    filtering: upd blocked services

commit 6a1d473
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 10 15:38:03 2025 +0300

    all: upd go & tools
Merge in DNS/adguard-home from AGDNS-2965-next-use-signal-handler to master

Squashed commit of the following:

commit dcf089a
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Jun 20 11:20:45 2025 +0300

    next/cmd: fix

commit aff109c
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 19 11:35:33 2025 +0300

    all: upd golibs

commit 17ed979
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 19 08:13:02 2025 +0300

    next/cmd: imp code

commit 6da81fe
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Jun 18 11:49:55 2025 +0300

    next/cmd: move pid file logic to serviceMgr

commit 470a29d
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Jun 18 11:36:47 2025 +0300

    next/cmd: imp code, renaming

commit 6c71890
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Jun 17 15:28:19 2025 +0300

    next/cmd: service manager
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit e5a4928
Author: Ainar Garipov <[email protected]>
Date:   Thu Jun 26 19:08:24 2025 +0300

    all: upd dnsproxy

commit c9d224f
Author: Ainar Garipov <[email protected]>
Date:   Thu Jun 26 19:01:51 2025 +0300

    all: upd chlog, deps
Merge in DNS/adguard-home from next-fix-ups-logger to master

Squashed commit of the following:

commit 94a0c35
Author: Ainar Garipov <[email protected]>
Date:   Fri Jun 27 18:11:12 2025 +0300

    next: typos

commit 6358dc1
Author: Ainar Garipov <[email protected]>
Date:   Fri Jun 27 17:32:03 2025 +0300

    next: imp upstream; add more settings
Updates #7856.

Squashed commit of the following:

commit cc4406f
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Jun 30 19:08:55 2025 +0300

    all: fix chlog

commit 6045a09
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Jun 30 19:07:43 2025 +0300

    all: fix chlog

commit 34a3193
Merge: 4c43bd9 5e44582
Author: Stanislav Chzhen <[email protected]>
Date:   Mon Jun 30 19:06:03 2025 +0300

    Merge branch 'master' into 7856-fix-dnscrypt-config

commit 4c43bd9
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 26 13:57:49 2025 +0300

    dnsforward: imp docs

commit af87eb8
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Jun 25 20:07:47 2025 +0300

    all: fix dnscrypt config
Updates #7903.

Squashed commit of the following:

commit c1147c7
Author: Ainar Garipov <[email protected]>
Date:   Tue Jul 1 14:49:32 2025 +0300

    all: upd dnsproxy

commit 3bbb606
Author: Ainar Garipov <[email protected]>
Date:   Tue Jul 1 14:18:30 2025 +0300

    all: fix ttl override
Merge in DNS/adguard-home from AGDNS-2374-imp-filtering-slog to master

Squashed commit of the following:

commit 6040411
Merge: 880c024 3c05f77
Author: Dimitry Kolyshev <[email protected]>
Date:   Wed Jul 9 09:32:45 2025 +0400

    Merge remote-tracking branch 'origin/master' into AGDNS-2374-imp-filtering-slog

commit 880c024
Author: Dimitry Kolyshev <[email protected]>
Date:   Tue Jul 1 16:54:08 2025 +0400

    all: imp code

commit de62c55
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Jun 30 15:16:58 2025 +0400

    filtering: slog

commit 9bc1abf
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Jun 30 15:13:24 2025 +0400

    filtering: slog

commit 88b251e
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Jun 30 14:13:37 2025 +0400

    filtering: slog

commit 2a69398
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Jun 30 12:29:48 2025 +0400

    all: init filtering logger

commit 9460944
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Jun 30 11:43:51 2025 +0400

    filtering: imp rewrite

commit 84544cc
Author: Dimitry Kolyshev <[email protected]>
Date:   Mon Jun 30 11:39:58 2025 +0400

    filtering: imp hashprefix

commit b88d879
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Jun 27 13:07:09 2025 +0400

    filtering: imp hashprefix

commit 904a847
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Jun 27 12:57:14 2025 +0400

    filtering: rewrite slog

commit 2669388
Author: Dimitry Kolyshev <[email protected]>
Date:   Fri Jun 27 12:36:34 2025 +0400

    filtering: hashprefix slog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.