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
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 668d4f62fd2c5b2e168025bf0b6bb36d7b617c80
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 0020006e89f336dc58db1a2ca3ce90d2e7a5ca16
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Mar 22 15:08:58 2023 +0300
all: imp code
commit 9a77f79869cdbde6de760734c0d8cf504e0464ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 18:13:35 2023 +0300
dhcpd: add todo
commit 638c4ce2af72235bf065a6492d58f3f1b1e7644a
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 c82b18f1408d9e353aec517f4283e2f3eb260890
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Mar 20 13:56:31 2023 +0300
all: imp code
commit 27e518120024103c292ac1cf134c6801fffc967e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 12:14:02 2023 +0300
dhcpd: imp tests
commit 8e919b0ceb0b20d1935587e717c7965cd8a33ad9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Mar 17 11:02:50 2023 +0300
dhcpd: add tests
commit 78ddefa73a255509af1c788147d6b1c332bb66ba
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 c68e85c40947b6c83516424a2bd7af89b99447b4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Mar 16 14:14:43 2023 +0300
all: add tests
commit f338086309a68c4b71036fa14f757e39358702d4
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
2b5e4850d0
Pull request: 1163 safesearch vol.2
...
Merge in DNS/adguard-home from 1163-safesearch-1-2-1 to master
Squashed commit of the following:
commit d3a5ebef35210019842145074e898129b42f1f2c
Merge: b85264ae c6706445
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 15 09:17:53 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1
# Conflicts:
# CHANGELOG.md
commit b85264aefc5f191ac6cb194b519f03ba15829a4e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 14 00:16:07 2023 +0700
home: imp code
commit ac2ed7a5ce8db40628e7d4d1c8634641e5f38b0b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 23:02:06 2023 +0700
all: changelog
commit f0fccafcb01f50c7051df53bbe9b02cab75aa71e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 22:42:36 2023 +0700
all: changelog
commit 37df29bf6372939644fb28e3d70365496e0cb4f6
Merge: b227b277 595484e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 22:38:57 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1
commit b227b2775b4866d69241ad87acf99700715552cb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 16:56:01 2023 +0700
all: imp docs
commit 6fd39fc3565c3f4bc7a7113d17733c20dfe24d8d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 16:55:03 2023 +0700
home: imp code
commit 3bb3bb7c7dcf97b2a5602a7d2b6770c08b4d863d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 12:16:53 2023 +0700
home: imp docs
commit 5f573a56a9fd9942ad677fa0fae6b24228dab653
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 13 11:56:47 2023 +0700
home: imp code
commit 23eeb5552cf2510596b2311cc3eda53ac678ffcc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 10 10:57:33 2023 +0700
home: imp code
commit 643de2fca1b5917c61fe83e1e472222404f3cd21
Merge: dada6e63 a2053526
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 21:03:08 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-2-1
commit dada6e63ca5324d30775e2da1727da891743f654
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 17:09:03 2023 +0700
all: imp docs
commit 81a180d99dd9a995440d5f4e2ebca34678e7d0c7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 15:12:43 2023 +0700
all: imp code
commit fa84877bc777004d246d71d0a9ae0bd9ee568a91
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 10:53:05 2023 +0700
all: imp code
commit 6d7e02e745d72921a693d4f09eec7ce21c2aefd4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 9 10:40:02 2023 +0700
all: imp docs
commit 0a4332997070fb8d2fb3a34d32b92f57a325ff06
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Mar 7 22:00:52 2023 +0700
safesearch: fix merge
commit 145c2222ba4cf7f8909b816d83829d2217c94243
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 2 11:41:48 2023 +0700
safesearch: fix merge
commit 14c6a8005fe15b5d5a39f91b17c96d8670975811
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 12:50:09 2023 +0700
all: docs
commit 2a85c8831866bf1c34c423a289461fc1e32667b5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 1 12:47:00 2023 +0700
all: use safesearch package
2023-03-15 14:31:07 +03:00
Eugene Burkov
ec19a85ed0
Pull request: 4939 Client update
...
Merge in DNS/adguard-home from 4939-client-upd to master
Updates #4939 .
Squashed commit of the following:
commit 34f35822afcc8020a674cd023a5907b5b3edcb65
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 10 14:01:57 2023 +0300
all: imp code, docs
commit 1cd8767a38f6494c92fb5ceff26abe228fcca638
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 17:20:56 2023 +0300
all: different ttls
commit 66d951ba3dd72cb698b89b432cbbbdd65cb421a2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 9 14:24:47 2023 +0300
all: imp code
commit 3fb8d08310296dad90783f13ba46a1d0ea11da2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Feb 8 19:35:29 2023 +0300
home: fix rdns check logic
2023-02-10 16:40:36 +03:00
Ainar Garipov
167b112511
Pull request: 5035-more-clients-netip-addr
...
Updates #5035 .
Squashed commit of the following:
commit 1934ea14299921760e9fcf6dd9053bd3155cb40e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 9 14:19:54 2022 +0300
all: move more client code to netip.Addr
2022-11-09 14:37:07 +03:00
Ainar Garipov
04c8e3b288
Pull request: 5035-netip-arp-hosts
...
Updates #5035 .
Squashed commit of the following:
commit d1c4493ee4e28d05670c20532ebae1aa809d18da
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 14:26:52 2022 +0300
aghnet: imp hosts rec equal
commit 0a7f40a64a819245fba20d3b481b0fc34e0c60e6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Oct 24 18:10:09 2022 +0300
aghnet: move arp and hosts to netip.Addr
2022-10-25 15:08:12 +03:00
Ainar Garipov
cebbb69a4c
Pull request: 5035-netip-maps-clients
...
Updates #5035 .
Squashed commit of the following:
commit c2d38fe75b8aa2f00b19892724984ed3bb843db5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Oct 24 16:50:14 2022 +0300
home: move clients to netip.Addr
2022-10-24 17:49:52 +03:00
Eugene Burkov
4582b1c919
Pull request: Migrate to netip.Addr vol.1
...
Merge in DNS/adguard-home from 2926-lla-v6 to master
Updates #2926 .
Updates #5035 .
Squashed commit of the following:
commit 2e770d4b6d4e1ec3f7762f2f2466662983bf146c
Merge: 25c1afc5 893358ea
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 14 15:14:56 2022 +0300
Merge branch 'master' into 2926-lla-v6
commit 25c1afc5f0a5027fafac9dee77618886aefee29c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 13 18:24:20 2022 +0300
all: imp code, docs
commit 59549c4f74ee17b10eae542d1f1828d4e59894c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 11 18:49:09 2022 +0300
dhcpd: use netip initially
commit 1af623096b0517d07752385540f2f750f7f5b3bb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Sep 30 18:03:52 2022 +0300
all: imp docs, code
commit e9faeb71dbc0e887b25a7f3d5b33a401805f2ae7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 29 14:56:37 2022 +0300
all: use netip for web
commit 38305e555a6884c3bd1b0839330b942ce0e59093
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 28 19:13:58 2022 +0300
add basic lla
2022-10-14 15:29:44 +03:00
Eugene Burkov
fffa656758
Pull request: 4722 dhcp http panic
...
Merge in DNS/adguard-home from 4722-dhcp-http-panic to master
Updates #4722 .
Squashed commit of the following:
commit 8a8db48c3bd4f6bb7fabe65b5b7b162f0986fc76
Merge: 39b344f9 b74b92fc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 20:11:23 2022 +0300
Merge branch 'master' into 4722-dhcp-http-panic
commit 39b344f97180af17ab22041e5655a27bcc99c29e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 18:33:56 2022 +0300
dhcpd: imp code, fmt
commit a36d70d2c25791b2e657e21d6f4681b33497f0cd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 17:38:17 2022 +0300
dhcpd: imp names, docs
commit 600d63da7af62de5cb52fc7670ef28c9f4fe95a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 17:36:17 2022 +0300
dhcpd: rename files, imp tags
commit 44f5507649db8536a07c4c21c8ad6e4a60ba3f43
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 16:40:26 2022 +0300
dhcpd: add mock
commit cfc3cfb714705067d3aa71a7cb5df4245e091cfd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 16:15:27 2022 +0300
all: use ptr instead of value
commit ec526c2cf22df3470641296cfc402113c23c3f9b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 14:57:10 2022 +0300
all: log changes
commit 0eca09f4c72bbdc73a2334c839d7781847ba3962
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 14:50:32 2022 +0300
dhcpd: let v4 be unconfigured
commit 59636e9ff48aea989d7bdfd216b37899b57137d2
Merge: 9238ca0a bc1503af
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 13 14:50:17 2022 +0300
Merge branch 'master' into 4722-dhcp-http-panic
commit 9238ca0a1e190ddc344f01959f474932809f086a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 7 18:28:56 2022 +0300
dhcpd: imp conf
commit 5f801c9be96c2fa735a50373495d8c6ca2914f32
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 6 16:31:13 2022 +0300
dhcpd: hide behind iface
commit a95c2741a7e3e5bfe8775bf937a3709217b76da0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 31 16:24:02 2022 +0300
dhcpd: separate os files
2022-09-13 23:45:35 +03:00
Eugene Burkov
573cbafe3f
Pull request: 3597 arpdb
...
Merge in DNS/adguard-home from 3597-wrt-netlink to master
Updates #3597 .
Squashed commit of the following:
commit 1709582cd204bb80c84775feabae8723ed3340f6
Merge: 0507b6ed e7b3c996
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 15 20:25:18 2022 +0300
Merge branch 'master' into 3597-wrt-netlink
commit 0507b6ede1162554ca8ac7399d827264aca64f98
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 15 20:21:29 2022 +0300
all: imp code
commit 71f9758d854b3e2cf90cbd3655ae4818cfbcf528
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 9 18:03:48 2022 +0500
aghnet: imp naming
commit c949e765104f130aa3e5ba465bdebc3286bebe44
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 9 17:26:30 2022 +0500
all: imp code, docs
commit cf605ddb401b6e7b0a7a4bb1b175a4dc588d253a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 8 15:33:52 2022 +0500
all: imp code, docs
commit 2960c6549a7e4944cc0072ca47a0cd4e82ec850e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Mar 6 21:34:58 2022 +0500
all: imp code & docs, fix tests
commit 29c049f3aee91a826c3416961686396d562a7066
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Mar 2 20:45:34 2022 +0300
all: add arpdb
2022-03-15 20:57:46 +03:00
Ainar Garipov
90c17c79de
Pull request: home: mv local domain name to dhcp setts
...
Closes #3367 .
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts
2022-01-25 19:47:02 +03:00
Eugene Burkov
ea8950a80d
Pull request: use testutil
...
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil
2021-10-22 11:58:18 +03:00
Ainar Garipov
e08a64ebe4
Pull request: all: allow clientid in access settings
...
Updates #2624 .
Updates #3162 .
Squashed commit of the following:
commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:41:33 2021 +0300
all: imp types, names
commit ebd4ec26636853d0d58c4e331e6a78feede20813
Merge: 239eb721 16e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:14:33 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 239eb7215abc47e99a0300a0f4cf56002689b1a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:13:10 2021 +0300
all: fix client blocking check
commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13
Merge: 9935f2a3 9d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 13:12:28 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 29 11:26:51 2021 +0300
client: show block button for client id
commit ed786a6a74a081cd89e9d67df3537a4fadd54831
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:56:23 2021 +0300
client: imp i18n
commit 4fed21c68473ad408960c08a7d87624cabce1911
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:34:09 2021 +0300
all: imp i18n, docs
commit 55e65c0d6b939560c53dcb834a4557eb3853d194
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 13:34:01 2021 +0300
all: fix cache, imp code, docs, tests
commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 24 19:27:12 2021 +0300
all: allow clientid in access settings
2021-06-29 15:53:28 +03:00
Ainar Garipov
dab7b439d1
Pull request: all: imp docs, names
...
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names
2021-06-18 18:13:36 +03:00
Ainar Garipov
84e71e912e
Pull request: dhcpd: add purge, imp code
...
Updates #1691 .
Squashed commit of the following:
commit 2ce6cc005d09ac7d63e4e575705d86e92046697f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:42:57 2021 +0300
dhcp: imp code
commit 8f2bd7048d864e10aaed9e7338c0bbe852699a31
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 16:27:06 2021 +0300
dhcpd: add purge, imp code
2021-06-16 16:48:46 +03:00
Eugene Burkov
8a62785e62
Pull request: 3166 fix dhcp
...
Updates #3166 .
Squashed commit of the following:
commit cac62f842886f06a70fb50d251938e0feaa06846
Author: Ildar Kamalov <ik@adguard.com>
Date: Thu Jun 10 14:35:40 2021 +0300
client: get dhcp status on static lease submit
commit 2ae4e3ab40041fbc0f53f4902a00263425409a6a
Merge: 1e0f9c15 299ea88c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jun 10 14:09:05 2021 +0300
Merge branch 'master' into 3166-fix-dhcp
commit 1e0f9c15d98f40a499c75b74bca48fe58512e300
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jun 10 14:03:58 2021 +0300
dhcpd: imp code
commit e4b9626b60a11cd2491c675a297f527f7e12f9b4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jun 10 13:03:47 2021 +0300
dhcpd: fix static lease load
commit dc449f21986a8ea300d07c081f1e416b2f08bc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 1 17:21:10 2021 +0300
home: change clients sources priority
2021-06-10 14:54:47 +03:00
Ainar Garipov
3be783bd34
Pull request: all: fix client upstreams, imp code
...
Updates #3186 .
Squashed commit of the following:
commit a8dd0e2cda3039839d069fe71a5bd0f9635ec064
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri May 28 12:54:07 2021 +0300
all: imp code, names
commit 98f86c21ae23b665095075feb4a59dcfcc622bc7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 27 21:11:37 2021 +0300
all: fix client upstreams, imp code
2021-05-28 13:02:59 +03:00
Ainar Garipov
7c35d208b1
Pull request: querylog: search clients by name, enrich http resp
...
Updates #1273 .
Squashed commit of the following:
commit 55b78153b1b775c855e759011141bbbe6d4b962c
Author: Artem Baskal <a.baskal@adguard.com>
Date: Fri Apr 2 16:55:39 2021 +0300
Update client_info in case of null
commit 5c80c1438ed9d961af11617831b704d6ae15cc34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 16:24:14 2021 +0300
querylog: always set client_info
commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6
Merge: 4ed7eab5 23c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 16:22:08 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b
Merge: dbf990eb 70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 12:57:17 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit dbf990eb881116754554270e7b691b5db8e9ee34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 12:56:13 2021 +0300
home: imp names
commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 19:26:04 2021 +0300
Rename to whois
commit e3cc4a68ee576770b1922680155308e33bed31e8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 19:03:42 2021 +0300
home: imp whois more
commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 18:51:14 2021 +0300
home: imp whois resp
commit fb97e0d74976723a512d6ff4c69e830fe59c8df8
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 18:00:03 2021 +0300
Fix client_info ids prop types
commit 298005189e372651ceff453e88aca19ee925a138
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 17:58:14 2021 +0300
Adapt changes on client
commit aa1769f64197d865478a66271da483babfc5dfd0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 17:18:36 2021 +0300
all: add more fields to querylog client
commit 4b2a2dbd380ec410f3068d15ea16430912e03e33
Merge: cda92c3f 2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 16:57:26 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit cda92c3f0331cbac252f3163d31457f716bc7f2c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 18:03:51 2021 +0300
querylog: fix windows tests
commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2
Merge: 627e4958 e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 17:45:53 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit 627e495828e82d44cc77aa393536479f23cc68b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 17:44:49 2021 +0300
querylog: add tests, imp code, docs
commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 26 16:10:47 2021 +0300
querylog: search clients by name, enrich http resp
2021-04-02 17:30:39 +03:00
Ainar Garipov
9736123483
Pull request: dhcpd: fix ip ranges
...
Updates #2541 .
Squashed commit of the following:
commit c81299991876f48836d24872d9145331a0bc9e6e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 16 18:10:07 2021 +0300
agherr: imp docs
commit f43a5f5cde0ea16dd38dd533e16e415a1d306cb2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 16 17:35:59 2021 +0300
all: imp err handling, fix code
commit ed26ad0ff53882725f7747264f8094e6fb9b0423
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Mar 16 12:24:17 2021 +0300
dhcpd: fix ip ranges
2021-03-16 19:11:32 +03:00
Eugene Burkov
dfdbfee4fd
Pull request: 2639 use testify require vol.4
...
Merge in DNS/adguard-home from 2639-testify-require-4 to master
Closes #2639 .
Squashed commit of the following:
commit 0bb9125f42ab6d2511c1b8e481112aa5edd581d9
Merge: 0e9e9ed1 2c9992e0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 11 15:47:21 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 0e9e9ed16ae13ce648b5e1da6ffd123df911c2d7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:43:15 2021 +0300
home: rm deletion error check
commit 6bfbbcd2b7f9197a06856f9e6b959c2e1c4b8353
Merge: c8ebe541 8811c881
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:30:07 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit c8ebe54142bba780226f76ddb72e33664ed28f30
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Mar 10 12:28:43 2021 +0300
home: imp tests
commit f0e1db456f02df5f5f56ca93e7bd40a48475b38c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 14:06:41 2021 +0300
dnsforward: imp tests
commit 4528246105ed06471a8778abbe8e5c30fc5483d5
Merge: 54b08d9c 90ebc4d8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 18:17:52 2021 +0300
Merge branch 'master' into 2639-testify-require-4
commit 54b08d9c980b8d69d019a1a1b3931aa048275691
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Feb 11 13:17:05 2021 +0300
dnsfilter: imp tests
2021-03-11 17:32:58 +03:00
Eugene Burkov
5aa0ca9319
Pull request: 2582 invalid hostname vol.2
...
Merge in DNS/adguard-home from 2582-invalid-hostname-2 to master
Updates #2582 .
Squashed commit of the following:
commit 9d3ceb289e3869b2c3d12e91ec104fb25d7931ee
Merge: 91c68e46 90054974
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 19:11:49 2021 +0300
Merge branch 'master' into 2582-invalid-hostname-2
commit 91c68e468c5f5b12a2fb509ff391133483c9d915
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 18:28:14 2021 +0300
all: mv trimming from home to dhcpd
commit f51faf35288577b6f610f172b26e7ac13aa24f72
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Mar 5 16:28:00 2021 +0300
home: add more host sanitizings
2021-03-05 19:20:36 +03:00
Eugene Burkov
90ebc4d8c9
Pull request: 2582 invalid hostname
...
Merge in DNS/adguard-home from 2582-invalid-hostname to master
Updates #2582 .
Squashed commit of the following:
commit 909598dae00588792b092f89c272c4487ba55dd1
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 17:32:58 2021 +0300
all: imp code quality, log changes
commit b3b970803709030c48cfe343b88d73524a043de3
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Mar 4 16:56:28 2021 +0300
home: add host processing logic
2021-03-04 17:49:34 +03:00
Ainar Garipov
fc9ddcf941
Pull request: all: client id support
...
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383 .
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits
2021-01-27 18:32:13 +03:00
Eugene Burkov
7fab31beae
Pull request: 2508 ip conversion vol.2
...
Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master
Closes #2508 .
Squashed commit of the following:
commit 5b9d33f9cd352756831f63e34c4aea48674628c1
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 20 17:15:17 2021 +0300
util: replace net.IPNet with pointer
commit 680126de7d59464077f9edf1bbaa925dd3fcee19
Merge: d3ba6a6c 5a50efad
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 20 17:02:41 2021 +0300
Merge branch 'master' into 2508-ip-conversion-vol2
commit d3ba6a6cdd01c0aa736418fdb86ed40120169fe9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 19 18:29:54 2021 +0300
all: remove last conversion
commit 88b63f11a6c3f8705d7fa0c448c50dd646cc9214
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 19 14:12:45 2021 +0300
all: improve code quality
commit 71af60c70a0dbaf55e2221023d6d2e4993c9e9a7
Merge: 98af3784 9f75725d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 18 17:13:27 2021 +0300
Merge branch 'master' into 2508-ip-conversion-vol2
commit 98af3784ce44d0993d171653c13d6e83bb8d1e6a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 18 16:32:53 2021 +0300
all: log changes
commit e99595a172bae1e844019d344544be84ddd65e4e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 18 16:06:49 2021 +0300
all: fix or remove remaining net.IP <-> string conversions
commit 7fd0634ce945f7e4c9b856684c5199f8a84a543e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Jan 15 15:36:17 2021 +0300
all: remove redundant net.IP <-> string converions
commit 5df8af030421237d41b67ed659f83526cc258199
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jan 14 16:35:25 2021 +0300
stats: remove redundant net.IP <-> string conversion
commit fbe4e3fc015e6898063543a90c04401d76dbb18f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jan 14 16:20:35 2021 +0300
querylog: remove redundant net.IP <-> string conversion
2021-01-20 17:27:53 +03:00
Eugene Burkov
e8c1f5c8d3
Pull request: 2508 ip conversion vol.1
...
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508 .
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion
2021-01-13 16:56:05 +03:00
Ainar Garipov
9b963fc777
Pull request: all: fix lint and naming issues vol. 3
...
Merge in DNS/adguard-home from 2276-fix-lint-3 to master
Updates #2276 .
Squashed commit of the following:
commit 6ee94cc6ed2a9762b70ef395b58b496434244b80
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 15:55:45 2020 +0300
all: fix lint and naming issues vol. 3
2020-12-07 16:04:53 +03:00
Ainar Garipov
ae8de95d89
Pull request: * all: move internal Go packages to internal/
...
Merge in DNS/adguard-home from 2234-move-to-internal to master
Squashed commit of the following:
commit d26a288cabeac86f9483fab307677b1027c78524
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Oct 30 12:44:18 2020 +0300
* all: move internal Go packages to internal/
Closes #2234 .
2020-10-30 13:32:02 +03:00