Eugene Burkov
|
28a6b9f303
|
Pull request 2159: Upd proxy
Squashed commit of the following:
commit 4468e826bcf8e856014059cac7cd83aa6d754ab0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 11 13:50:36 2024 +0300
all: upd dnsproxy
commit 7887f521799b75ea43aac8eca0586d26a1287c94
Merge: 9120da6ab 36f9fecae
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 11 13:50:09 2024 +0300
Merge branch 'master' into upd-proxy
commit 9120da6ab841fc8f9090c16f0cfe6a103073c772
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 5 11:50:16 2024 +0300
all: upd proxy
|
2024-03-11 18:17:04 +03:00 |
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
|
f84ff2bd05
|
Pull request: AG-25263 dns config
Merge in DNS/adguard-home from AG-25263-dns-config to master
Squashed commit of the following:
commit 478b607526391af65de67d6d7f1d904198610cdf
Merge: b944d12fa 51340adb3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Sep 4 18:04:56 2023 +0400
Merge remote-tracking branch 'origin/master' into AG-25263-dns-config
commit b944d12fa812b05b9d9f22d2287425ca36630329
Merge: b474f712f 0182b9ec1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Sep 1 09:13:36 2023 +0400
Merge remote-tracking branch 'origin/master' into AG-25263-dns-config
# Conflicts:
# internal/dnsforward/dnsforward.go
commit b474f712f64daa1a7d7e32d89edc901d2f273c9a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Sep 1 09:11:17 2023 +0400
all: imp code
commit 635a316b8244f13d90a8fe2209f1673c0765aaa9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 16:18:25 2023 +0300
all: dnsfilter rm config embed
commit 5aa6212e89bc38e3d283b8d6b1a78726d10b3f3a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Aug 30 12:45:01 2023 +0300
all: dnsfilter rm config embed
|
2023-09-04 17:18:43 +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 906deaa3bf86af5038fb05a54c34cc |