Stanislav Chzhen
b72a3d01b8
Pull request 1845: AG-21324-update-dhcp
...
Merge in DNS/adguard-home from AG-21324-update-dhcp to master
Squashed commit of the following:
commit 20499d71ffe62f34576f9328db5dc6fb5c929c28
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 17 14:23:09 2023 +0300
dhcpd: imp tests
commit fa6add1410a98d1b9dfd833bcb20ef9fb7ff57ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 16 09:52:38 2023 +0100
all: update dhcp
2023-05-17 15:16:02 +03:00
Dimitry Kolyshev
0393e41096
Pull request: 1577: rewrite edit http api
...
Merge in DNS/adguard-home from 1577-rewrite-edit to master
Squashed commit of the following:
commit d03bee2a14337d169eea950b3df18a447c02b422
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 12 12:54:15 2023 +0300
filtering: imp tests
commit bd68320df6dc057d922d91551cd00c74ebfaad6c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 12 10:38:12 2023 +0300
filtering: rewrite http tests
commit 0d8bbcd0194c0db89a6d4b45927669423c9bbb59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 11 12:06:30 2023 +0300
filtering: rewrite http tests
commit 29080384dd8fa80d5286d2fac1a4429d712bbafa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 17:24:00 2023 +0300
filtering: imp code
commit 96c6b1c98debfae565c5e6254746959a4307744e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:56:32 2023 +0300
filtering: imp code
commit b5d0c50ea11f9d829ba9d2b188fcc471a965e012
Merge: 5fa9e1c37 c77b2a0ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:37:19 2023 +0300
Merge remote-tracking branch 'origin/master' into 1577-rewrite-edit
commit 5fa9e1c3714e107f893c03efa72227f3ed88691c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 16:35:19 2023 +0300
filtering: imp code
commit dd9dce8fbf0ce4bd200f2fc2fbf580e025920cd5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 13:06:43 2023 +0300
docs: rewrite http update
commit 0c67b040e80787b084c4669bb20db8d6d145fc1b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 13:04:31 2023 +0300
filtering: rewrite http update
2023-05-12 13:04:19 +03:00
Dimitry Kolyshev
c77b2a0ce5
Pull request: home: imp code
...
Merge in DNS/adguard-home from home-imp-code to master
Squashed commit of the following:
commit 459297e189c55393bf0340dd51ec9608d3475e55
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 11:42:34 2023 +0300
home: imp code
commit ab38e1e80fed7b24fe57d4afdc57b70608f65d73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 11:01:23 2023 +0300
all: lint script
commit 7df68b128bf32172ef2e3bf7116f4f72a97baa2b
Merge: bcb482714 db52f7a3a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 10 10:59:40 2023 +0300
Merge remote-tracking branch 'origin/master' into home-imp-code
commit bcb482714780da882e69c261be08511ea4f36f3b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:48:27 2023 +0300
all: lint script
commit 1c017f27715202ec1f40881f069a96f11f9822e8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:45:25 2023 +0300
all: lint script
commit ee3d427a7d6ee7e377e67c5eb99eebc7fb1e6acc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:44:53 2023 +0300
home: imp code
commit bc50430469123415216e60e178bd8e30fc229300
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 13:12:10 2023 +0300
home: imp code
commit fc07e416aeab2612e68cf0e3f933aaed95931115
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 11:42:32 2023 +0300
aghos: service precheck
commit a68480fd9c4cd6f3c89210bee6917c53074f7a82
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu May 4 11:07:05 2023 +0300
home: imp code
commit 61b743a340ac1564c48212452c7a9acd1808d352
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 17:17:21 2023 +0300
all: lint script
commit c6fe620510c4af5b65456e90cb3424831334e004
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 17:16:37 2023 +0300
home: imp code
commit 4b2fb47ea9c932054ccc72b1fd1d11793c93e39c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 16:55:44 2023 +0300
home: imp code
commit 63df3e2ab58482920a074cfd5f4188e49a0f8448
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 16:25:38 2023 +0300
home: imp code
commit c7f1502f976482c2891e0c64426218b549585e83
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 15:54:30 2023 +0300
home: imp code
commit c64cdaf1c82495bb70d9cdcaf7be9eeee9a7c773
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:35:04 2023 +0300
home: imp code
commit a50436e040b3a064ef51d5f936b879fe8de72d41
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:24:02 2023 +0300
home: imp code
commit 2b66464f472df732ea27cbbe5ac5c673a13bc14b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:11:53 2023 +0300
home: imp code
commit 713ce2963c210887faa0a06e41e01e4ebbf96894
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 3 14:10:54 2023 +0300
home: imp code
2023-05-10 16:30:03 +03:00
Stanislav Chzhen
db52f7a3ac
Pull request 1841: AG-21462-safebrowsing-parental-http-tests
...
Merge in DNS/adguard-home from AG-21462-safebrowsing-parental-http-tests to master
Squashed commit of the following:
commit 22a83ebad08a27939a443530137a7c195f512ee4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 17:39:46 2023 +0300
filtering: fix test
commit c3ca8b4987245cdd552f6f09759804e716bcae80
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 16:43:35 2023 +0300
filtering: imp tests even more
commit 7643bfae350373b5b6dfb61b64e57da66c6ab952
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 16:17:42 2023 +0300
filtering: imp tests more
commit 399c05ee4d479a727b61378b7a07158a568d0181
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 3 14:45:41 2023 +0300
filtering: imp tests
commit f361df39e784ec9c5191666736a6c64b332928e8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 2 12:49:26 2023 +0300
filtering: add tests
2023-05-03 19:52:06 +03:00
Stanislav Chzhen
381f2f651d
Pull request 1837: AG-21462-imp-safebrowsing-parental
...
Merge in DNS/adguard-home from AG-21462-imp-safebrowsing-parental to master
Squashed commit of the following:
commit 85016d4f1105e21a407efade0bd45b8362808061
Merge: 0e61edade 620b51e3e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 16:36:30 2023 +0300
Merge branch 'master' into AG-21462-imp-safebrowsing-parental
commit 0e61edadeff34f6305e941c1db94575c82f238d9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 14:51:37 2023 +0300
filtering: imp tests
commit 994255514cc0f67dfe33d5a0892432e8924d1e36
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 11:13:19 2023 +0300
filtering: fix typo
commit 96d1069573171538333330d6af94ef0f4208a9c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 27 11:00:18 2023 +0300
filtering: imp code more
commit c2a5620b04c4a529eea69983f1520cd2bc82ea9b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 26 19:13:26 2023 +0300
all: add todo
commit e5dcc2e9701f8bccfde6ef8c01a4a2e7eb31599e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 26 14:36:08 2023 +0300
all: imp code more
commit b6e734ccbeda82669023f6578481260b7c1f7161
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 25 15:01:56 2023 +0300
filtering: imp code
commit 530648dadf836c1a4bd9917e0d3b47256fa8ff52
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 24 20:06:36 2023 +0300
all: imp code
commit 49fa6e587052a40bb431fea457701ee860493527
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 24 14:57:19 2023 +0300
all: rm safe browsing ctx
commit bbcb66cb03e18fa875e3c33cf16295892739e507
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 21 17:54:18 2023 +0300
filtering: add cache item
commit cb7c9fffe8c4ff5e7a21ca912c223c799f61385f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 20 18:43:02 2023 +0300
filtering: fix hashes
commit 153fec46270212af03f3631bfb42c5d680c4e142
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 20 16:15:15 2023 +0300
filtering: add test cases
commit 09372f92bbb1fc082f1b1283594ee589100209c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 20 15:38:05 2023 +0300
filtering: imp code
commit 466bc26d524ea6d1c3efb33692a7785d39e491ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 19 18:38:40 2023 +0300
filtering: add tests
commit 24365ecf8c60512fdac65833ee603c80864ae018
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 19 11:38:57 2023 +0300
filtering: add hashprefix
2023-04-27 16:39:35 +03:00
Eugene Burkov
620b51e3ea
Pull request 1840: 5752-unspec-ipv6
...
Merge in DNS/adguard-home from 5752-unspec-ipv6 to master
Closes #5752 .
Squashed commit of the following:
commit 654b808d17c6d2374b6be919515113b361fc5ff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 21 18:11:34 2023 +0300
home: imp docs
commit 28b4c36df790f1eaa05b11a1f0a7b986894d37dc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 21 16:50:16 2023 +0300
all: fix empty bind host
2023-04-21 18:57:53 +03:00
Ainar Garipov
757ddb06f8
Pull request 1839: 5716-write-json
...
Updates #5716 .
Squashed commit of the following:
commit 8cf7c4f404fffb646c9df8643924eb8dc1d8f49d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 19 18:09:35 2023 +0300
aghhttp: write json properly
2023-04-19 18:15:17 +03:00
Ainar Garipov
d6043e2352
Pull request 1838: 5716-content-type
...
Updates #5716 .
Squashed commit of the following:
commit 584e6771c82b92857e3c13232e942cad5c183682
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 19 14:54:43 2023 +0300
all: fix content types
2023-04-19 14:58:56 +03:00
Eugene Burkov
584182e264
Pull request 1835: bootstrap-plain
...
Merge in DNS/adguard-home from bootstrap-plain to master
Updates AdguardTeam/dnsproxy#324 .
Squashed commit of the following:
commit bd5d569dc26154985857977e81650eb0a51559a5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Apr 18 17:41:53 2023 +0300
querylog: rm proxyutil dep
commit 9db4053555e06eba264f7d3e6c75c747f8d73b56
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Apr 18 17:34:29 2023 +0300
all: upd proxy
2023-04-18 17:52:22 +03:00
Ainar Garipov
11898a3f73
Pull request 1833: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e5acaddd5cec1a53f2aa1f48d16af53052341d31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 18 15:43:36 2023 +0300
all: upd i18n, svcs, tools
2023-04-18 15:49:03 +03:00
Stanislav Chzhen
a91a257b15
Pull request 1817: AG-20352-imp-leases-db
...
Merge in DNS/adguard-home from AG-20352-imp-leases-db to master
Squashed commit of the following:
commit 2235fb4671bb3f80c933847362cd35b5704dd18d
Merge: 0c4d76d4f 76a74b271
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 18 15:09:34 2023 +0300
Merge branch 'master' into AG-20352-imp-leases-db
commit 0c4d76d4f6222ae06c568864d366df866dc55a54
Merge: e586b82c7 4afd39b22
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 18 11:07:27 2023 +0300
Merge branch 'master' into AG-20352-imp-leases-db
commit e586b82c700c4d432e34f36400519eb08b2653ad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 18 11:06:40 2023 +0300
dhcpd: imp docs
commit 411d4e6f6e36051bf6a66c709380ed268c161c41
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 17 16:56:56 2023 +0300
dhcpd: imp code
commit e457dc2c385ab62b36df7f96c949e6b90ed2034a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 17 14:29:29 2023 +0300
all: imp code more
commit c2df20d0125d368d0155af0808af979921763e1f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 14 15:07:53 2023 +0300
all: imp code
commit a4e9ffb9ae769c828c22d62ddf231f7bcfea14db
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 19:19:35 2023 +0300
dhcpd: fix test more
commit 138d89414f1a89558b23962acb7174dce28346d9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 18:08:29 2023 +0300
dhcpd: fix test
commit e07e7a23e7c913951c8ecb38c12a3345ebe473be
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 17:22:27 2023 +0300
all: upd chlog
commit 1b6a76e79cf4beed9ca980766ce97930b375bfde
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 12 13:24:11 2023 +0300
all: migrate leases db
2023-04-18 15:12:11 +03:00
Ainar Garipov
1842f7d888
Pull request 1831: home: imp depr option doc
...
Merge in DNS/adguard-home from imp-option-doc to master
Squashed commit of the following:
commit 267410fcc2c9e757c7d8fb7d9059a709932dda9d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 17 14:30:12 2023 +0300
home: imp depr option doc
2023-04-18 14:18:28 +03:00
Eugene Burkov
6d402dc86c
Pull request 1830: 5712-rollback-dhcp
...
Merge in DNS/adguard-home from 5712-rollback-dhcp to master
Updates #5712 .
Squashed commit of the following:
commit 3d53a6385ad08dfad0b7ac28bb057cf25608554d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 14 16:30:18 2023 +0300
dhcpd: imp import
commit 86bd55b0225b5d9067bd0bf9e6def1e52dd27124
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 14 16:26:41 2023 +0300
all: return todo
commit 629c548989a464a9cf461fffc0815b99a00c4851
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 14 16:24:10 2023 +0300
all: log changes
commit e4c369e55cbcc7c73d73d8df333996862e1e146a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Apr 14 16:03:03 2023 +0300
dhcpd: revert raw for darwin
2023-04-14 16:58:07 +03:00
Stanislav Chzhen
18acdf9b09
Pull request 1809: 4299-querylog-stats-clients-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-clients-api to master
Squashed commit of the following:
commit 066100a7869d7572c4ae65b3c7b1487ac50baf15
Merge: 95bc00c0 5da77514
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 14 13:57:30 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 95bc00c0b3d05b262ee0b90be9757e61cac0778c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:48:39 2023 +0300
all: fix typo
commit 4b868da48f0c976d204346e40ba948803be6397f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:42:52 2023 +0300
all: fix text label
commit 7a3ba5c7f688bd53cf761b5e8e614fbe251bd006
Merge: 315256e3 6c8d89a4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:34:59 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 315256e3f3861b5116962f7c47384b7c72e41813
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 11 19:07:18 2023 +0300
all: ignore search, unit
commit 28c6ffec9558e7c38d7bd12055eabddb8f5675c2
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 15:08:35 2023 +0300
Added 'Protection' and 'Query Log and statistics' sections to client settings. Added checkboxes to ignore client in (query log/statistics)
commit 2657bd2b820d8b2b3d71d23e4545c867b9ae6cdf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 17:28:59 2023 +0300
all: add todo
commit e151fcbc0c36d8e6a5c091fbf374bf0e35804699
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 15:15:46 2023 +0300
openapi: imp docs
commit 31875cbbd1bd09a73baa3636d0cc242b5ac35059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 13:02:31 2023 +0300
all: add querylog stats client ignore api
2023-04-14 15:25:04 +03:00
Ainar Garipov
5da7751463
Pull request 1829: 5725-querylog-orig-ans
...
Closes #5725 .
Squashed commit of the following:
commit a9e5fc47fc0a752f427e006ab1c59e260239ee5a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 13 20:25:12 2023 +0300
querylog: fix orig ans assignment
2023-04-13 20:51:57 +03:00
Ainar Garipov
7631ca4ab3
Pull request 1828: AG-21377-default-safe-search
...
Merge in DNS/adguard-home from AG-21377-default-safe-search to master
Squashed commit of the following:
commit 35c66b97c787d02fe6f2ffb6902dcd9b6f9b9569
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 13 20:05:13 2023 +0300
home: fix default safe search svcs
2023-04-13 20:17:59 +03:00
Ainar Garipov
f082312e49
Pull request 1822: upd-deps
...
Merge in DNS/adguard-home from upd-deps to master
Squashed commit of the following:
commit 7ce7532d4a914c678557a6cd9e31c707da8a1a66
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 12 17:14:58 2023 +0300
all: upd deps
2023-04-12 17:20:29 +03:00
Ainar Garipov
67d8b7df90
Pull request 1820: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 88aee29c6685816eaef8ff63af380d609f308ead
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 12 14:25:19 2023 +0300
all: upd i18n, svcs
2023-04-12 14:29:56 +03:00
Ainar Garipov
b23ea0a690
Pull request 1816: 5704-rm-endian
...
Updates #5704 .
Squashed commit of the following:
commit 927faf8c3ae0a5deea651ea4249a90ffc80a21c9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 20:02:52 2023 +0300
all: rm our copy of endian
2023-04-11 20:07:39 +03:00
Ainar Garipov
a186b5c436
Pull request 1815: 5701-log-ip
...
Updates #5701 .
Squashed commit of the following:
commit 332530cbae602e9b0e4c89351bde6b0da017fc67
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 18:56:27 2023 +0300
home: imp docs
commit 35a649ffed9ca736e63842f077411c5f5cbb57f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 18:27:25 2023 +0300
home: fix login attempt logging
2023-04-11 19:43:38 +03:00
Ainar Garipov
0376afb38e
Pull request 1814: AG-21291-web-races
...
Merge in DNS/adguard-home from AG-21291-web-races to master
Squashed commit of the following:
commit 1134013f928aa5e186db3b6d0450e425cb053e9c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 16:52:52 2023 +0300
home: fix web api races
2023-04-11 17:22:51 +03:00
Ainar Garipov
950ecb1f5e
Pull request 1812: AG-21286
...
Merge in DNS/adguard-home from AG-21286 to master
Squashed commit of the following:
commit 587b4a3704fd63aa3da6c1be83f8a49bf4e27b00
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 11 14:15:05 2023 +0300
all: fix negative pause duration
2023-04-11 15:02:29 +03:00
Stanislav Chzhen
89bf3721b5
Pull request 1800: AG-20352-dhcpd-lease-is-static
...
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-is-static to master
Squashed commit of the following:
commit e4f4278a7ffa0f084ed41472dd3e7de4466c9f50
Merge: b6e3b62e
15bba281
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 11:13:05 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-is-static
commit b6e3b62ed4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 15:20:42 2023 +0300
dhcpd: imp naming
commit e2d9ed0832
Merge: ecd244a6
10bffd89
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 16:53:55 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-is-static
commit ecd244a608
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 16:53:15 2023 +0300
dhcpd: add lease json form
commit 9ebc246ed4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 13:11:25 2023 +0300
dhcpd: imp code
commit fc3d0cdaeb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 13:00:59 2023 +0300
all: fix json
commit d722578543
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Apr 5 12:23:34 2023 +0300
dhcpd: add lease is static
2023-04-10 11:17:05 +03:00
Ainar Garipov
15bba281ee
Pull request 1807: upd-golibs
...
Merge in DNS/adguard-home from upd-golibs to master
Squashed commit of the following:
commit cde42a72c2140245f345681cbb936ed3bc4645a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 7 13:57:02 2023 +0300
all: upd golibs, use hdrs
2023-04-07 14:21:37 +03:00
Stanislav Chzhen
f9fe3172c4
Pull request 1791: 4299-querylog-stats-clients
...
Merge in DNS/adguard-home from 4299-querylog-stats-clients to master
Squashed commit of the following:
commit 33b80b67224f7c1a15bee8e6a23d9d5bab6ac629
Merge: 61964fdd 5d5a7295
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 7 12:43:22 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients
commit 61964fdd02221abbddedf2d6d02bb0bce6845362
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 7 12:42:01 2023 +0300
dnsforward: imp code
commit 7382168500bab6ca7494d39aabfc2d7bfceb5d24
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 7 11:13:07 2023 +0300
all: imp code, chlog
commit c7852902f6
Merge: aa4dc0a5
a55cbbe7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 14:34:24 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients
commit aa4dc0a54e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 6 12:54:02 2023 +0300
all: imp code
commit dd541f0cd7ecbf0afcf10ccbd130fd1d1fa4c1c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 31 13:01:53 2023 +0300
querylog: fix typo
commit d2c8fdb35b04d27c8957fa027882fde704cc07be
Merge: 83d0baa1 2eb3bf6e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 31 12:36:49 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients
commit 83d0baa1f1202f9c62d4be2041d7aed12ee9ab2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 31 12:35:15 2023 +0300
all: add tests
commit a459f19f25cf9646d145813fe7834b2d9979c516
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 29 16:51:53 2023 +0300
all: add clients querylog stats ignore
2023-04-07 13:17:40 +03:00
Ainar Garipov
5d5a729569
Pull request 1806: 5661-fix-protection-update-lock
...
Updates #5661 .
Squashed commit of the following:
commit 02e83c75c8f44f084c0cb8d33b7d6a524c8c1b0e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 19:28:17 2023 +0300
dnsforward: imp logs
commit 0f27265fc94f0e3b8e2dee79dbf9ab5344416c61
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 19:18:19 2023 +0300
dnsforward: imp locks
2023-04-06 19:33:25 +03:00
Ainar Garipov
b1120221c7
Pull request 1805: imp-pprof
...
Merge in DNS/adguard-home from imp-pprof to master
Squashed commit of the following:
commit 2d56e0820fd26720c87978d0096405257100f3f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 15:10:12 2023 +0300
home: imp rate
commit 97611a26e224f354d42ea16f3193c6cb72de3a48
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 15:03:33 2023 +0300
home: imp pprof block, mutex profiles
2023-04-06 15:14:30 +03:00
Ainar Garipov
f553eee842
Pull request 1804: newline-lint
...
Merge in DNS/adguard-home from newline-lint to master
Squashed commit of the following:
commit 2fc0b662b9ac9d954275c5ebe8c140be4cd365be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 14:16:14 2023 +0300
client: rm line
commit 10246727179a84094edd17fad5cd6f0a5c38b821
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 13:51:06 2023 +0300
all: add newline lint
2023-04-06 14:21:46 +03:00
Ainar Garipov
61b4043775
Pull request 1803: 5685-fix-safe-search
...
Updates #5685 .
Squashed commit of the following:
commit 5312147abfa0914c896acbf1e88f8c8f1af90f2b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 14:09:44 2023 +0300
safesearch: imp tests, logs
commit 298b5d24ce292c5f83ebe33d1e92329e4b3c1acc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:36:16 2023 +0300
safesearch: fix filters, logging
commit 63d6ca5d694d45705473f2f0410e9e0b49cf7346
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:24:47 2023 +0300
all: dry; fix logs
commit fdbf2f364fd0484b47b3161bf6f4581856fdf47b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:01:08 2023 +0300
all: fix safe search update
2023-04-06 14:12:50 +03:00
Ainar Garipov
10bffd89c9
Pull request 1801: upd-go
...
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n
2023-04-05 16:12:09 +03:00
Ainar Garipov
91ecbede7d
Pull request 1799: AG-21072-stats-conf-race
...
Merge in DNS/adguard-home from AG-21072-stats-conf-race to master
Squashed commit of the following:
commit 26843b70ab8bfe0fa110c4156f2fd3f53ec5ee74
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 4 20:30:22 2023 +0300
all: imp docs, locks
commit 942a5baa9606376dd06a3ef3284c17133014f768
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 4 19:15:18 2023 +0300
stats: fix conf races
2023-04-05 15:50:14 +03:00
Ainar Garipov
27dbb427a1
Pull request 1798: 4262-ipv6-pref
...
Updates #4262 .
Squashed commit of the following:
commit de64f9c40c00317dbb5dbdda900d9b4c574a0a32
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 19:23:15 2023 +0300
all: add ipv6 boostrap pref
2023-04-04 13:28:21 +03:00
Ainar Garipov
2a0d062947
Pull request 1797: AG-21072-querylog-conf-race
...
Merge in DNS/adguard-home from AG-21072-querylog-conf-race to master
Squashed commit of the following:
commit fcb14353ee63f582986e18affebf5ed965c3bfc7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 15:04:03 2023 +0300
querylog: imp code, docs
commit 9070bc1d4eee5efc5795466b2c2a40c6ab495e68
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 3 13:58:56 2023 +0300
querylog: fix races
2023-04-03 16:29:07 +03:00
Ainar Garipov
3575aa0570
Pull request 1796: 5661-opt-more-lock
...
Updates #5661 .
Squashed commit of the following:
commit 0a1425df0ea1278c73ac88cbee053897d3daaf1b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 18:31:19 2023 +0300
querylog: opt locks more
2023-03-31 18:44:51 +03:00
Ainar Garipov
1731ce9c63
Pull request 1795: 5661-imp-querylog-logging
...
Updates #5661 .
Squashed commit of the following:
commit 3fac63fb4ac906e61f6bb2d2af5408771d93a206
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:24:00 2023 +0300
querylog: imp locks even more
commit bf14ab9a5ea1be83ac156dc5f3d7f3717d50767b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:09:25 2023 +0300
querylog: imp locks more
commit 40e885f39b4c38dcd387d4799529b0fa150ed520
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 16:26:15 2023 +0300
querylog: imp locks, logs
2023-03-31 17:39:04 +03:00
Ainar Garipov
2eb3bf6ea5
Pull request 1793: upd-all
...
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit 19535409f54360618e1239bddd7ce495d19e0ca4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 30 16:06:49 2023 +0300
all: upd deps, i18n, filters, services, tools
2023-03-30 16:13:19 +03:00
Eugene Burkov
da9008aba3
Pull request 1790: 5624-fix-filter-add
...
Merge in DNS/adguard-home from 5624-fix-filter-add to master
Updates #5624 .
Squashed commit of the following:
commit 211100409d2c711a5ccb5aeafbe16115388aaff7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 20:46:48 2023 +0500
filtering: imp names
commit b42ed3748e5d4310a9f8a6a37cee5bf56104917f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 29 17:41:49 2023 +0500
filtering: imp logging, lock properly
2023-03-29 19:09:54 +03:00
Ainar Garipov
487675b9ad
Pull request 1786: rm-context-fields
...
Merge in DNS/adguard-home from rm-context-fields to master
Squashed commit of the following:
commit 402bbba6a68f163cd6a3751a50ecd544eebc875f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:07:11 2023 +0300
aghnet: names
commit 209a2bb7878ee9110595f1fcf09df7f83777b80f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:03:33 2023 +0300
home: typo
commit 61684815c260d5d7a34be612e06714456399a833
Merge: 7adfcf15 132ec556
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 28 13:02:18 2023 +0300
Merge branch 'master' into rm-context-fields
commit 7adfcf1576b52f80137aa9044355bfbec6243e28
Merge: 0d5b85f5 0df32601
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 14:25:27 2023 +0300
Merge branch 'master' into rm-context-fields
commit 0d5b85f51b3eb72c3e905d5ad82c17cd932b246b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 13:21:26 2023 +0300
all: rm unnecessary home context fields
2023-03-28 13:27:46 +03:00
Eugene Burkov
d58772f177
Pull request 1779: 3290-docker-healthcheck
...
Merge in DNS/adguard-home from 3290-docker-healthcheck to master
Updates #3290 .
Squashed commit of the following:
commit 3ac8f26c1c22855d973910fd13c096776aa8dfa6
Merge: bc17565f 0df32601
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Mar 27 01:09:03 2023 +0500
Merge branch 'master' into 3290-docker-healthcheck
commit bc17565fcb5acba68129734450fb08b4fe341771
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 18:04:08 2023 +0500
all: fix script
commit e150fee8025dacdc5aa1d12916d1f42e89216156
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 17:18:12 2023 +0500
all: imp naming
commit 26b6448d10af39f8363eadd962af228a9d4ae51d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 26 03:13:47 2023 +0500
all: support https web
commit b5c09ce8b2ac52d6e47a00f76125bee229f616a0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sat Mar 25 20:03:45 2023 +0500
all: imp scripts fmt, naming
commit 8c3798c46974e48cc0c379c2ecc46a6d8d54164b
Merge: e33b0c5c fb7b8bba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sat Mar 25 00:25:38 2023 +0500
Merge branch 'master' into 3290-docker-healthcheck
commit e33b0c5cbfe5a28b29734c9ceee046b0f82a0efe
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:47:26 2023 +0500
all: fix docs
commit 57bfd898b9c468b2b72eba06294ed5e5e0226c20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:44:40 2023 +0500
dnsforward: add special-use domain handling
commit f04ae13f441a25d0b4dc1359b328552f7507fc23
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 16:05:10 2023 +0500
all: imp code
commit 32f150f88390320d2da85b54e27f6c751eccb851
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 04:19:10 2023 +0500
all: mv Dockerfile, log changes
commit a094a44ccfa26988f0e71f19288e08b26e255e2b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 04:04:27 2023 +0500
all: finish scripts, imp names
commit 4db0d0e7cb7ed69030994bc1b579534dd2c3395d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 23 18:33:47 2023 +0500
docker: add script and awk program
2023-03-26 23:12:24 +03:00
Ainar Garipov
0df32601bb
Pull request 1787: 5639-querylog-filter-fix
...
Fixes #5639 .
Squashed commit of the following:
commit 1aa02c8fa2b858f9c9a41c5dd6746d4d2e3de654
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sun Mar 26 13:39:29 2023 +0300
querylog: fix filtered log filter
2023-03-26 14:19:19 +03:00
Eugene Burkov
fb7b8bba6a
Pull request 1784: 5631-lookup-panic
...
Merge in DNS/adguard-home from 5631-lookup-panic to master
Updates #5631 .
Squashed commit of the following:
commit 0ec578485bd955146d9119b6b8dafda33bfcefad
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:42:26 2023 +0500
all: imp code, log changes
commit fc43c39418640af4864ec3b5bc92ec31ec9cd018
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 24 20:15:27 2023 +0500
home: handle error, upd proxy
2023-03-24 18:47:53 +03:00
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
Ainar Garipov
0bc3ef89ea
Pull request 1781: 5627-fix-migration
...
Updates #5627 .
Squashed commit of the following:
commit 018ead11959efeaace5312b5990ad82b6fa1f72d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:48:25 2023 +0300
home: fix more
commit 4bc57a07412bfb7fb7e6c88c14037c567c94d373
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 24 12:32:57 2023 +0300
home: fix statistics migration
2023-03-24 13:17:57 +03:00
Ainar Garipov
59a8265e31
Merge branch 'master' into 5615-rm-raw
2023-03-23 17:39:03 +03:00
Stanislav Chzhen
bea39934bd
Pull request 1771: AG-20352-dhcpd-lease-netip-addr
...
Merge in DNS/adguard-home from AG-20352-dhcpd-lease-netip-addr to master
Squashed commit of the following:
commit 4acd094e2d6ed972bac99cdb671670f6d8e61721
Merge: 51f61c19 df61741f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 23 16:44:17 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 51f61c193fdd31ee675be5598fc361228e407eb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 18:25:30 2023 +0300
dhcpd: fix typo
commit 2e64ad55475957925d2a3010c649e0adc5f18c4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 17:20:31 2023 +0300
dhcpd: add todo
commit 668d4f62fd
Merge: 0020006e
306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:09:38 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit 0020006e89
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af
Merge: c82b18f1
48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:57:19 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c82b18f140
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e5181200
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a
Merge: c68e85c4
9f7a582d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:15:24 2023 +0300
Merge branch 'master' into AG-20352-dhcpd-lease-netip-addr
commit c68e85c409
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 15 12:44:06 2023 +0300
all: dhcpd lease netip addr
2023-03-23 16:52:01 +03:00
Dimitry Kolyshev
df61741f60
Pull request: 1163 safesearch http api vol.3
...
Merge in DNS/adguard-home from 1163-safesearch-1-3 to master
Squashed commit of the following:
commit f26c5fb4f7a27dc61b10c28d6672d5307796784c
Merge: e7a1b885
143616ca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 18:45:25 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
# Conflicts:
# CHANGELOG.md
commit e7a1b885d6
Merge: 01b73d76
eb5d8a49
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:55:23 2023 +0200
Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3
commit 01b73d763c
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:52:02 2023 +0200
client: add safe search extended settings to clients
commit eb5d8a499a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 18:50:23 2023 +0700
all: docs
commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:50 2023 +0700
all: docs
commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda
Merge: 95f9fd3d c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:00 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 15:25:39 2023 +0200
client: move to new safe search api
commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:40:29 2023 +0700
all: docs
commit aaa287b125c7c7a775b821e0dd272199229a7538
Merge: 16fa7031 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:14 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 16fa7031ab2aec31139ace54ffa0155cde8e9135
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:03 2023 +0700
all: docs
commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:59:47 2023 +0700
filtering: imp code
commit aab7b70e2355ba86577e5156c1d5569b21b4b358
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:40:18 2023 +0700
filtering: imp code
commit d2870a18ffdb1d293993487073912168d6b75a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 21:57:58 2023 +0700
filtering: imp code
commit 868f5d1ed29c3af702114079e7ffe46e136eb901
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:06:36 2023 +0700
all: imp docs
commit f6d70b06ed873684501ce17f647ccf07a85dd50b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:05:40 2023 +0700
filtering: imp code
commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 14:56:51 2023 +0700
home: imp code
commit 84d8817512e47a517ed2880ffa9dde5ffda1d288
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 09:39:41 2023 +0700
all: safesearch http api
2023-03-23 15:25:58 +03:00
Stanislav Chzhen
143616ca6e
Pull request 1736: 4299-querylog-stats-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-api to master
Updates #1717 .
Updates #4299 .
Squashed commit of the following:
commit 5b706b7997
Merge: 48b62b0f
306c1983
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 13:53:09 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 48b62b0f18
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 12:25:04 2023 +0200
client: fix styles, add titles and descrs
commit 97e31cff70
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 18:38:12 2023 +0200
client: add ignored domains for querylog
commit 24d75c4376
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 18:21:13 2023 +0200
client: add ignore domains for stats
commit eefc3891d0
Merge: 978675ea
1daabb97
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 10:53:35 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 978675ea2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 10:53:11 2023 +0300
openapi: fix chlog
commit 2ed33007aa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:49:07 2023 +0300
home: fix tests
commit 6af11520c1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:40:16 2023 +0300
home: fix typo
commit 56acdfde5b
Merge: 319da34d
48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:32:58 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 319da34de4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 17:34:38 2023 +0300
querylog: fix docs
commit d5a8f24d5b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 11:42:00 2023 +0300
stats: fix docs
commit e0cbfc1c40
Merge: 4743c810
012e5beb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 18:45:17 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 4743c81038
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 18:14:16 2023 +0300
all: imp code; fix time conversion
commit 34310cffd7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:34:11 2023 +0300
chlog: restore order
commit cadd864a66
Merge: 2f3e25be
bb226434
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:26:06 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit 2f3e25bee5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 1 12:25:14 2023 +0300
all: fix fmt
commit d54022baa6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 28 16:16:40 2023 +0300
all: imp code; fix chlog
commit df22de91f5
Merge: e1ea4797
a772212d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:24:09 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit e1ea4797af
Merge: d7db0a5a
bb80a7c2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:23:20 2023 +0300
Merge branch 'master' into 4299-querylog-stats-api
commit d7db0a5af1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 27 17:12:20 2023 +0300
all: imp docs
... and 15 more commits
2023-03-23 13:46:57 +03:00
Stanislav Chzhen
306c1983a2
Pull request 1758: 1472-edns-custom-ip-api
...
Merge in DNS/adguard-home from 1472-edns-custom-ip-api to master
Updates #1472
Squashed commit of the following:
commit 7605ec5bd5467ddd28a650385193eb2332653bb6
Merge: 8b2ac227 194ead34
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 13:39:25 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 8b2ac22793a51d2555d32c1f5b5c118118807d1f
Merge: d5ca8b6e c3edab43
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 18:26:55 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit d5ca8b6e1d87480d4ee4afd346e6bf04907fca95
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 18:26:24 2023 +0300
dnsforward: imp tests
commit 1302586d22812c22755ea1c7e7fcd32330d707c5
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 16:47:56 2023 +0200
client: change validation for custom edns ip
commit 44e4dc6d1e47de6597ed9ee328db9639e38b4868
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 16:31:42 2023 +0200
client: implement edns custom ip
commit 8a3e7ad8ebf16262818821340da23baa5f004bff
Merge: 04ac1112 f736d85e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 15:04:40 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 04ac1112dda2e778243555b2f54819e5ba586e05
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 21 15:03:39 2023 +0300
dnsforward: imp tests
commit b44f6d0ccb3ba7b7a5be07c9cf293dad9c83c794
Merge: 19c6851e 48431f8b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 17:55:49 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 19c6851e30f30b0572334822e8639e03760de986
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 10 10:40:15 2023 +0300
all: fix chlog
commit 6dcdcbd666ebf3a56a38251e8ead09c605068ce3
Merge: a7f1bf71 a2053526
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 10 10:23:37 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit a7f1bf715e3557c710b700b9bd923868eb07715b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:24:18 2023 +0300
home: fix default value
commit 0311a9bb6571975963d747ef4ef427b59dca03bc
Merge: 7e0bb3df 1011b8f9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:04:18 2023 +0300
Merge branch 'master' into 1472-edns-custom-ip-api
commit 7e0bb3df78f10f4b4ae0fd49681d1aa0040521c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 19:03:24 2023 +0300
all: fix chlog
commit 202d7ccf4721ccf39726da01d237e07317bfaa58
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 11:35:41 2023 +0300
dnsforward: fix typo
commit fe95e003a0c3b316a44b5ec0b848a60ddd4c85cf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 11:28:21 2023 +0300
all: fix docs
commit 66835a9aa22b3015f9238c1d6f5aa9bd6067db8a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Mar 7 10:48:08 2023 +0300
dnsforward: add todo
commit b58255e1e6660a8229bb9c40f2acddebb3dbdc66
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 6 15:40:02 2023 +0300
all: upd chlog
commit 9b2be7facba30c815144e08a7835353cad14c405
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 3 11:22:19 2023 +0300
dnsforward: edns custom ip api
2023-03-22 13:42:20 +03:00
Brian Kemper
a0205a54ec
Remove direct dep on mdlayher/raw package
2023-03-19 17:29:04 -06:00
Eugene Burkov
48431f8b86
Pull request #1770 : 5567-extract-subnet-arpa
...
Merge in DNS/adguard-home from 5567-extract-subnet-arpa to master
Updates #5567 .
Squashed commit of the following:
commit 288fb405b82eff2a95d75f8c557100908a998a08
Merge: e16b3ce5 9f7a582d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 17 14:01:39 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit e16b3ce57ba41a9f4a7743dbdb93c2320e650140
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Mar 17 13:58:58 2023 +0300
dnsforward: use netip
commit 265b08c5f82f8df555ab1a5f01c2e9ef8caef64a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 16 19:11:49 2023 +0300
dnsforward: imp tests more
commit 53a839cb6dd924cabf0552386f76aa8775c88983
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 16 19:09:15 2023 +0300
dnsforward: imp naming in tests
commit 74dcccbdda217422260579e331289003a024695e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Mar 16 18:59:12 2023 +0300
dnsforward: imp code & tests more
commit da8badfaa75a0a67c10ce6f347e551dcfd4c0589
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 15 14:52:48 2023 +0300
all: log changes
commit c491cbfb3fd8d716303224c1f73329a47087753a
Merge: 74a93179 2b5e4850
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 15 14:44:31 2023 +0300
Merge branch 'master' into 5567-extract-subnet-arpa
commit 74a93179d7fb7f005455ce02f7f0c16b796c3914
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 15 14:42:55 2023 +0300
dnsforward: imp code, docs
commit 17df1a0ce461335649c6dab65c984eb0cce0bdf0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 14 19:49:10 2023 +0300
dnsforward: extract subnet from arpa
2023-03-17 17:10:33 +03:00