Dimitry Kolyshev
|
1511fabeec
|
Pull request: AG-28771 conf upstream mode
Squashed commit of the following:
commit afb5a0d8a499bccf7761baea40910f39c92b8a20
Merge: 09ac43c85 abf20c6de
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Dec 25 12:55:45 2023 +0200
Merge remote-tracking branch 'origin/master' into conf-ups-mode
commit 09ac43c859ef8cbd3bb0488d1a945589cd59ca19
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 14:36:07 2023 +0200
openapi: imp docs
commit d0fbd4349e4bddde73c6e92f75854acfc481ac0d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 11:47:10 2023 +0200
all: changelog
commit 105f9c50738733b0736a768fb9ee09d2e7fbf42e
Merge: 62a2cf12d 4bc5c346a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 11:27:21 2023 +0200
Merge remote-tracking branch 'origin/master' into conf-ups-mode
# Conflicts:
# openapi/CHANGELOG.md
commit 62a2cf12df694611888e840a5041a9c517cdfddb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Dec 22 10:52:59 2023 +0200
openapi: imp docs
commit 87956c49240da44b216489920feff69996e3502b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Dec 21 12:08:07 2023 +0200
dnsforward: imp code
commit bf74d67ad112735d557be3d8fac75964cd99e375
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 15:46:38 2023 +0200
dnsforward: imp code
commit 3a98dee88809a25118a14a1f07eeecbfccb14cd9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 15:41:06 2023 +0200
dnsforward: imp code
commit 1499da1fa0319ac3ad914171e807446f2c4d2fdb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 13:36:28 2023 +0200
dnsforward: imp code
commit 228c61a5a0f73cc13655cef8bdaa1995b3f7fced
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Dec 20 13:06:11 2023 +0200
dnsforward: imp code
commit 069ee22c6d904db4e983135ce87a9fe8d12b7e9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 19 12:39:25 2023 +0200
dnsforward: imp code
commit 90919f99a975862dcb07ac82fb740e4404e48bae
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 19 12:10:43 2023 +0200
confmigrate: fix
commit a8c329950423b59098d1f2b16d1da7100dd54f8d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Dec 19 12:08:05 2023 +0200
dnsforward: imp code
commit 58b53ccd97d353fab0df29f13425b5e341c8fdeb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Dec 18 15:10:01 2023 +0200
all: conf upstream mode
|
2023-12-25 14:16:48 +03:00 |
|
Ainar Garipov
|
73358263e8
|
Pull request 2076: 1660-disable-plain
Updates #1660.
Squashed commit of the following:
commit d928a00b7c77a33717fe3e77aace1f1b41a960d2
Merge: 38e401d78 0f5e8ca56
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 22 13:39:34 2023 +0300
Merge branch 'master' into 1660-disable-plain
commit 38e401d7827ce1ea190b5328cadb3bb0ff5a5cba
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 21 20:17:53 2023 +0300
dnsforward: imp validation
commit f9e99cec209078128fef1b147294c7abe3f6ae70
Merge: cb7529682 c8f1112d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 20 16:02:31 2023 +0300
Merge branch 'master' into 1660-disable-plain
commit cb75296821cae594e8c4d17dfdd8be2190aee7f7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 17 14:20:02 2023 +0300
all: add serve_plain_dns
|
2023-11-22 13:49:02 +03:00 |
|
Dimitry Kolyshev
|
a2ca8b5b4a
|
Pull request 1979: AG-25263 filtering config
Squashed commit of the following:
commit a5607f811ab4642a0e34d3042240e3a9aafc3d84
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 15:44:26 2023 +0300
home: upgrade yaml
commit 0593e4da17613b8770c4567fdd5fbfde31631e6f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 15:01:14 2023 +0300
home: upgrade yaml
commit 59ec4ba0bbe59fb2e95290f4f8101891ce4ff959
Merge: 6555941f5 a325c9b6b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 14:57:41 2023 +0300
Merge remote-tracking branch 'origin/master' into AG-25263-filtering-config
# Conflicts:
# internal/dnsforward/http.go
# internal/dnsforward/http_test.go
# internal/dnsforward/process.go
# internal/dnsforward/process_internal_test.go
commit 6555941f57e99aa8bc2473b8be9e4f096ce665e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 14:38:01 2023 +0300
docs: changelog
commit c66d14cecbb1f08869a90c46e58d08ec03e29de5
Merge: a50ff1622 aac36a2d2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 12:58:41 2023 +0300
Merge remote-tracking branch 'origin/master' into AG-25263-filtering-config
commit a50ff162291f7953912c1bb195bd7b5d802d0ab3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 11:22:12 2023 +0300
home: imp code
commit ef40d073e00d6acb164c0d680ed9971c4e75fbb7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 16:19:14 2023 +0300
home: imp code
commit 5fa09a95e901a72dc5d2a90ba47c96842152587b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 14:47:48 2023 +0300
home: imp code
commit 52bb295120f468faf94c953d0e795d1d58696ef1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 13:33:01 2023 +0300
home: imp code
commit 24cfccf071385d660aeba4ced744ebbacc819686
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 12:24:20 2023 +0300
filtering: imp code
commit 758242b69ee5f351b25407340f989ec6b90d3607
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Aug 29 10:32:51 2023 +0300
home: imp code
commit 906deaa3bf86af5038fb05a54c34cc9511500ac9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 14:46:01 2023 +0300
dnsforward: imp code
commit 978bb508349cd0b6a1a0bd3df5b879b6a4dd9e29
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 14:40:31 2023 +0300
home: imp code
commit d5b8dd5c930b0ccbe612f320a9908f2849370fd4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 12:34:32 2023 +0300
filtering: imp code
commit d3e5726df6bc93112329ec81bc83932ccf64b8de
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:57:33 2023 +0300
home: upgrade yaml
commit 75d701553595786d5695540c001e6d46153351a9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:46:55 2023 +0300
home: upgrade yaml
commit cd8cb623b0e6eb00fd05fb62b7445ca4315b94e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:29:16 2023 +0300
docs: changelog
commit 31c098d6f8d68a4afa30246c8d067a1ef4586de9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Aug 28 11:08:48 2023 +0300
docs: changelog
commit 24c88dd5d42b0168a13ea11b3f760eae1e804558
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Aug 27 19:12:55 2023 +0300
home: imp code
commit 94f2d386c9c1b6be5df06525078c90a3d068641f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Aug 27 16:15:05 2023 +0300
home: upgrade yaml
... and 10 more commits
|
2023-08-30 18:26:02 +03:00 |
|
Stanislav Chzhen
|
012e5beb51
|
Pull request 1744: 1472-edns-custom-ip
Merge in DNS/adguard-home from 1472-edns-custom-ip to master
Updates #1472.
Squashed commit of the following:
commit 07460c3adf7747fd9ec1b4a3d04fb459dec44280
Merge: 65455430 ae653f16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 15:38:46 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 65455430993e4a62c49e1f45def909b0a135af3b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 15:37:17 2023 +0300
dnsforward: add todo
commit e1978ad4b6051f29185ef32973d20bc70f2a6634
Merge: 6cd98f42 bb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 11:32:23 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 6cd98f4235b1b52d443c1950f2516af3cc4fb258
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 11:31:16 2023 +0300
all: fix chlog; fix field alignment
commit defdec623919c23ab446324828d08839469669e1
Merge: 1130ebd5 a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 12:17:23 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 1130ebd509bf4f7ec25fbb53717576e273dbfff2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 12:13:30 2023 +0300
all: add use_custom field
commit ec0cdc7af0f96f761ed85516bbcae2567fd6f7d2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 13:59:13 2023 +0300
all: fix chlog; imp code
commit f8450cfcd6054f32d6ea0a5e26c551fe153a0b21
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 11:28:16 2023 +0300
dnsforward: fix fmt
commit 54a344e5bb17aae7ca213ed66b85f06ef6585316
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 11:11:52 2023 +0300
all: fix chlog; add test case
commit 47b5476f6621c6ea31aa496d4113445a8e8bceb4
Merge: 8724f374 304f2ba2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 16:33:07 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 8724f3745ccc29849a4001f79b055c7ebeb19106
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 16:31:40 2023 +0300
all: fix comments
commit d2b1528ba333e7669795a3fb80355ff7d90cf4f5
Merge: 7898c23a 76a513cd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 11:53:25 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit 7898c23ab991bc516bcc2f41e47bed15582fd962
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Feb 22 11:52:37 2023 +0300
all: upd chlog
commit 8763261dcb4187a93104955e7cb440965e2b6739
Merge: d28394b3 ff9b24ad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 21 17:12:03 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip
commit d28394b3c980b10f28c6c38ce35f368edb11d314
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 21 17:11:29 2023 +0300
home: fix default value
commit 1a5da3f267706baa83eebe1923ea1b0b4e79fd6c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 21 13:37:04 2023 +0300
all: add custom ip for edns
|
2023-03-01 16:16:16 +03:00 |
|
Eugene Burkov
|
eb0d7d39d9
|
Pull request: Fix race
Merge in DNS/adguard-home from fix-race to master
Squashed commit of the following:
commit 77b85f7fad6e10b76119e401ed59050bc83d5d72
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 15 18:11:56 2023 +0300
scripts: upd timeout
commit 2e061f7b2c70eaf897506c69d71b5892451d964f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 15 17:15:49 2023 +0300
dnsforward: add workaround to avoid race
|
2023-02-15 19:23:15 +03:00 |
|
Eugene Burkov
|
b31bab591d
|
Pull request: 5117-backport-dns64
Merge in DNS/adguard-home from 5117-backport-dns64 to master
Updates #5117.
Squashed commit of the following:
commit 8ac88534b2da52f49facef6d623ea3504a3cd5ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Feb 6 16:44:16 2023 +0300
all: rm todos
commit 0aa66c5ecbadc3e372478ea4446f80fcc7457841
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Feb 6 15:40:38 2023 +0300
all: upd dnsproxy
commit 872a8efdd2759fd9dad61de9953bc87f734ca918
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 3 14:14:21 2023 +0300
dnsforward: imp docs
commit 8efeb42cac69bbe9b8dba8c91c33b14c95397ab9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 1 02:58:01 2023 +0300
all: rm dns64
|
2023-02-06 17:17:51 +03:00 |
|
Eugene Burkov
|
2ecf2a4c42
|
Pull request: 5117-dns64
Merge in DNS/adguard-home from 5117-dns64 to master
Updates #5117.
Squashed commit of the following:
commit 757d689134b85bdac9a6f5e43249866ec09ab7e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jan 23 19:06:18 2023 +0300
all: imp fmt
commit b7a73c68c0b40bd3bda520c045c8110975c1827a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jan 23 17:49:21 2023 +0300
all: rm unused, imp code
commit 548feb6bd27b9774a9453d0570d37cdf557d4c3a
Merge: de3e84b5 54a141ab
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jan 23 14:08:12 2023 +0300
Merge branch 'master' into 5117-dns64
commit de3e84b52b8dbff70df3ca0ac3315c3d33576334
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jan 23 12:04:48 2023 +0300
dnsforward: imp code
commit a580e92119e3dbadc8b1a6572dbecc679f69db40
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jan 20 18:24:33 2023 +0400
dnsforward: try again
commit 67b7a365194939fe15e4907a3dc2fee44b019d08
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jan 20 18:08:23 2023 +0400
dnsforward: fix test on linux
commit ca83e4178a3383e326bf528d209d8766fb3c60d3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jan 20 17:37:48 2023 +0400
dnsforward: imp naming
commit c4e477c7a12af4966cbcd4e5f003a72966dc5d61
Merge: 42aa42a8 6e803375
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jan 20 17:30:03 2023 +0400
Merge branch 'master' into 5117-dns64
commit 42aa42a8149b6bb42eb0da6e88ede4b5065bbf2f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jan 20 17:26:54 2023 +0400
dnsforward: imp test
commit 4e91c675703f1453456ef9eea08157009ce6237a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 18 12:32:55 2023 +0400
dnsforward: imp code, docs, add test
commit 766ef757f61e7a555b8151b4783fa7aba5f566f7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 17 16:36:35 2023 +0400
dnsforward: imp docs
commit 6825f372389988597d1879cf66342c410f3cfd47
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Jan 17 14:33:33 2023 +0400
internal: imp code, docs
commit 1215316a338496b5bea2b20d697c7451bfbcc84b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jan 13 21:24:50 2023 +0400
all: add dns64 support
|
2023-01-23 19:10:56 +03:00 |
|