Ainar Garipov
b01c10b73e
all: sync with master
2024-01-30 18:44:31 +03:00
Ainar Garipov
25918e56fa
Pull request 2100: v0.107.42-rc
...
Squashed commit of the following:
commit 284190f748345c7556e60b67f051ec5f6f080948
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 6 19:36:00 2023 +0300
all: sync with master; upd chlog
2023-12-07 17:23:00 +03:00
Ainar Garipov
7b93f5d7cf
all: sync with master; upd chlog
2023-09-07 17:13:48 +03:00
Ainar Garipov
48ee2f8a42
all: sync with master; upd chlog
2023-07-26 13:18:44 +03:00
Ainar Garipov
b22b16d98c
all: sync with master; upd chlog
2023-07-03 14:10:40 +03:00
Ainar Garipov
c65700923a
all: sync with master; upd chlog
2023-06-07 20:04:01 +03:00
Ainar Garipov
d9c57cdd9a
all: sync with master; upd chlog
2023-04-12 14:48:42 +03:00
Ainar Garipov
a21558f418
all: sync with master; upd chlog
2023-03-09 15:39:35 +03:00
Ainar Garipov
66b831072c
all: sync with master; upd chlog
2023-02-15 16:53:29 +03:00
Ainar Garipov
bd64b8b014
all: sync with master
2022-11-23 16:52:05 +03:00
Ainar Garipov
c9314610d4
all: sync with master
2022-11-02 16:18:02 +03:00
Ainar Garipov
73fcbd6ea2
all: sync with master
2022-10-03 18:52:20 +03:00
Ainar Garipov
77d04d44eb
all: sync with master
2022-09-14 16:36:29 +03:00
Eugene Burkov
39b404be19
cherry-pick: 4358 fix stats
...
Merge in DNS/adguard-home from 4358-fix-stats to master
Updates #4358 .
Updates #4342 .
Squashed commit of the following:
commit 5683cb304688ea639e5ba7f219a7bf12370211a4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 18:20:54 2022 +0300
stats: rm races test
commit 63dd67650ed64eaf9685b955a4fdf3c0067a7f8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 17:13:36 2022 +0300
stats: try to imp test
commit 59a0f249fc00566872db62e362c87bc0c201b333
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 16:38:57 2022 +0300
stats: fix nil ptr deref
commit 7fc3ff18a34a1d0e0fec3ca83a33f499ac752572
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Apr 7 16:02:51 2022 +0300
stats: fix races finally, imp tests
commit c63f5f4e7929819fe79b3a1e392f6b91cd630846
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 00:56:49 2022 +0300
aghhttp: add register func
commit 61adc7f0e95279c1b7f4a0c0af5ab387ee461411
Merge: edbdb2d4 9b3adac1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 4 00:36:01 2022 +0300
Merge branch 'master' into 4358-fix-stats
commit edbdb2d4c6a06dcbf8107a28c4c3a61ba394e907
Merge: a91e4d7a a481ff4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 21:00:42 2022 +0300
Merge branch 'master' into 4358-fix-stats
commit a91e4d7af13591eeef45cb7980d1ebc1650a5cb7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:46:19 2022 +0300
stats: imp code, docs
commit c5f3814c5c1a734ca8ff6726cc9ffc1177a055cf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:16:13 2022 +0300
all: log changes
commit 5e6caafc771dddc4c6be07c34658de359106fbe5
Merge: 091ba756 eb8e8166
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:09:10 2022 +0300
Merge branch 'master' into 4358-fix-stats
commit 091ba75618d3689b9c04f05431283417c8cc52f9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 3 18:07:39 2022 +0300
stats: imp docs, code
commit f2b2de77ce5f0448d6df9232a614a3710f1e2e8a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Aug 2 17:09:30 2022 +0300
all: refactor stats & add mutexes
commit b3f11c455ceaa3738ec20eefc46f866ff36ed046
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Apr 27 15:30:09 2022 +0300
WIP
2022-08-17 18:10:16 +03:00
Ainar Garipov
8166c4bc33
cherry-pick: upd-go
...
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 8edfb5cc3466c1e4ee2eacae5157bd93c135a284
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Aug 3 14:25:45 2022 +0300
all: imp docs; fmt
commit 080b8a85c02afbdaa079c0da47cb7b6311d50fbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Aug 2 20:51:20 2022 +0300
all: upd go, imp generic code
2022-08-03 16:01:02 +03:00
Ainar Garipov
33b58a42fe
cherry-pick: all: use canonical names for hosts file runtime clients
...
Updates #4683 .
Squashed commit of the following:
commit daa8fdaee574d4ac2171f6b13c5ce3f3fedd9801
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 7 19:13:29 2022 +0300
all: use canonical names for hosts file runtime clients
2022-07-13 15:13:06 +03:00
Ainar Garipov
4f5131f423
all: sync more
2022-06-02 17:55:48 +03:00
Eugene Burkov
ba0cf5739b
cherry-pick: 3142 swap arp and rdns priority
...
Merge in DNS/adguard-home from 3142-fix-clients to master
Updates #3142 .
Updates #3597 .
Squashed commit of the following:
commit 4dcabedbfb1a4e4a0aaba588f708e4625442fce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 15:13:15 2022 +0300
all: imp log of changes
commit 481088d05eecac1109daf378e0b4d5f6b2cf099b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 22 14:36:44 2022 +0300
all: swap arp and rdns priority
2022-06-02 17:11:09 +03:00
Eugene Burkov
86207e719d
cherry-pick: 4542 clientid case
...
Merge in DNS/adguard-home from 4542-clientid-case to master
Updates #4542 .
Squashed commit of the following:
commit 2a3111ebcef09460b407cd1c870cad2391cd5650
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed May 4 20:44:18 2022 +0300
all: fix changelog link
commit 3732def83e2a36eeff2d682149dc4dcef4e92a7d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed May 4 20:43:37 2022 +0300
all: log changes
commit 9fe1001cf586669ae238c9c4818070cf94e23ce8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed May 4 19:37:33 2022 +0300
dnsforward: lowercase clientid
2022-06-02 16:42:15 +03:00
Ainar Garipov
d9bde6425b
cherry-pick: all: use "ClientID" consistently
...
Closes #4242 .
Updates #4244 .
Squashed commit of the following:
commit 3a2296a7a70006cf6777e54ce1e2fc3559aec5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:23:43 2022 +0300
client: imp more
commit 3aacc8696ac694ff459fd33ba7beeeabd2569a55
Merge: b28a120f 2a5b5f19
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:21:59 2022 +0300
Merge branch 'master' into 4244-imp-i18n
commit b28a120fe9aa68507b173717059b7b259097d6a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 14:49:49 2022 +0300
client: imp texts more
commit c1fa6ca336f2d5bdcc67836f348be4843a0a8f79
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 8 21:12:15 2022 +0300
all: use "ClientID" consistently
2022-02-14 17:04:33 +03:00
Eugene Burkov
119100924c
cherry-pick: 4216 simpl hosts
...
Merge in DNS/adguard-home from 4216-hosts-explode to master
Updates #4216 .
Squashed commit of the following:
commit a6ed131923496d9bbd1d80c652d4584951528c4a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jan 27 19:11:23 2022 +0300
aghnet: imp docs
commit 25cca065c3c6dc227288cdd0803dc3ff8f9c3ca4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jan 27 18:53:16 2022 +0300
aghnet: simpl hosts container
2022-01-28 16:31:04 +03:00
Eugene Burkov
b9682c4f10
cherry-pick: 4079 fix hosts container aliases
...
Merge in DNS/adguard-home from 4079-hosts-again to master
Updates #4079 .
Squashed commit of the following:
commit 6aa8cbf32e8e47ba46bf5fba7681a10b68b4bc01
Merge: 19dba371 34c95f99
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 12 14:05:30 2022 +0500
Merge branch 'master' into 4079-hosts-again
commit 19dba371cc30ab8b75b0116833f4ecf0ef0f182f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 12 14:05:20 2022 +0500
aghnet: imp docs
commit 9f341eb8ee4ba8468240bc3eeeb4951a3f7f5e6d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Jan 10 18:44:17 2022 +0500
aghnet: fix races
commit fd66191c7637c8584711e5bb8186494327ce0f87
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jan 6 17:21:14 2022 +0500
aghnet: fix hosts container aliases
2022-01-21 16:48:17 +03:00
Ainar Garipov
2819d6cace
cherry-pick: filtering: fix rw to subdomain
...
Updates #4016 .
Squashed commit of the following:
commit 83bb15c5a5098103cd17e76b49f456fb4fa73408
Merge: 81905503 313555b1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 27 19:36:44 2021 +0300
Merge branch 'master' into 4016-rw-subdomain
commit 81905503c977c004d7ddca1d4e7537bf76443a6e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 27 19:35:51 2021 +0300
filtering: fix self reqs
commit b706f481f00232d28dade0bd747a7496753c7deb
Merge: 29cf83de 661f4ece
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 27 19:13:08 2021 +0300
Merge branch 'master' into 4016-rw-subdomain
commit 29cf83de8e3ff60ea1c471c2a161055b1377392d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 27 19:07:08 2021 +0300
all: fix docs
commit 9213fd8ec2b81e65b1198ab241400065f14684b1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 27 18:44:06 2021 +0300
filtering: fix rw to subdomain
2021-12-29 16:02:04 +03:00
Ainar Garipov
6a6f926bd0
all: imp hooks, opt
2021-12-13 15:28:12 +03:00
Ainar Garipov
39da2f9eaa
home: imp client handling
2021-12-13 15:18:21 +03:00
Ainar Garipov
0e1015a4ee
all: doc changes, imp names
2021-12-13 14:56:48 +03:00
Keith Collister
774937728b
Prevent spurious diffs in config file by sorting Client objects before writing
2021-12-12 11:46:13 +01:00
Eugene Burkov
4a4b4715ca
Pull request: 3815 fix hosts container rewrites
...
Merge in DNS/adguard-home from 3815-weird-rewrites to master
Updates #3815 .
Squashed commit of the following:
commit d217db9f5632a3fba5a37fc6ac7b90b8d97fe1cf
Merge: 006b67b9 9c8e0875
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 16:08:41 2021 +0300
Merge branch 'master' into 3815-weird-rewrites
commit 006b67b93199f3818396ad782d90aba32da74092
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 15:49:50 2021 +0300
filtering: fix doc
commit 7ffafcedc7275b007977a539bd63ab20a758eecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 16 14:17:41 2021 +0300
all: imp hosts container more
commit b60deddec988762c61060cabad1340a37b154dbb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Nov 14 19:06:16 2021 +0300
all: log changes
commit 37c76f478e0db90b3840a931d79465eefeea7945
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Nov 14 18:14:21 2021 +0300
aghnet: imp hosts container
commit 187251c364f6d23ba7166906b5394a0299657b76
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Nov 14 16:16:41 2021 +0300
all: merge hosts container more
2021-11-16 16:16:38 +03:00
Eugene Burkov
2796e65468
Pull request: 2499 merge rewrites vol.1
...
Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master
Updates #2499 .
Squashed commit of the following:
commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3
Merge: f49e9186 2b635bf6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 19:23:07 2021 +0300
Merge branch 'master' into 2499-merge-rewrites-vol.1
commit f49e9186ffc8b7074d03c6721ee56cdb09243684
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 18:50:49 2021 +0300
aghos: fix fs events filtering
commit 567dd646556606212af5dab60e3ecbb8fff22c25
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 14 16:50:37 2021 +0300
all: imp code, docs, fix windows
commit 140c8bf519345eb54d0e7500a996fcf465353d71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:41:53 2021 +0300
aghnet: use const
commit bebf3f76bd394a498ccad812c57d4507c69529ba
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 19:32:37 2021 +0300
all: imp tests, docs
commit 9bfdbb6eb454833135d616e208e82699f98e2562
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 18:42:20 2021 +0300
all: imp path more, imp docs
commit ee9ea4c132a6b17787d150bf2bee703abaa57be3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 13 16:09:46 2021 +0300
all: fix windows, imp paths
commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 19:53:35 2021 +0300
all: imp code, docs
commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 11 18:22:50 2021 +0300
aghnet: fix windows tests
commit d29de359ed68118d71efb226a8433fac15ff5c66
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 21:02:14 2021 +0300
all: repl & imp
commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 8 01:41:19 2021 +0300
all: add tests, mv logic, added tmpfs
commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 7 14:26:30 2021 +0300
all: imp filewalker, refactor hosts container
2021-10-14 19:39:21 +03:00
Ainar Garipov
9a1d3ec694
Pull request: querylog: fix panic
...
Merge in DNS/adguard-home from querylog-panic to master
Squashed commit of the following:
commit b7f2edd1d7dd91c0102b9cb4ea50c34d8d9ceb58
Merge: 1b355a2d fac574d3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 20:06:07 2021 +0300
Merge branch 'master' into querylog-panic
commit 1b355a2df6bd96431a70111607470b873b742562
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Sep 13 19:41:58 2021 +0300
querylog: fix panic
2021-09-13 20:16:06 +03:00
Dmitry Seregin
8fdd789474
Pull request: 3419 client allowlist collision
...
Updates #3419 .
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client
2021-09-10 17:57:09 +03:00
Ainar Garipov
9bd7294fad
Pull request: all: mv some utilities to netutil
...
Merge in DNS/adguard-home from mv-netutil to master
Squashed commit of the following:
commit 5698fceed656dca7f8644e7dbd7e1a7fc57a68ce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 9 15:44:17 2021 +0300
dnsforward: add todos
commit 122fb6e3de658b296931e0f608cf24ef85547666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Aug 9 14:27:46 2021 +0300
all: mv some utilities to netutil
2021-08-09 16:03:37 +03:00
Ainar Garipov
63ee95dfbe
Pull request: all: replace aghstrings with stringutil
...
Merge in DNS/adguard-home from add-stringutil to master
Squashed commit of the following:
commit 4ca9b29356de7d0a162b1e5a6496c691e9751f15
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jul 29 17:29:25 2021 +0300
all: replace aghstrings with stringutil
2021-07-29 17:40:31 +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
Eugene Burkov
4fd7fad2e5
Pull request: 2280 dns timeout
...
Updates #2280 .
Squashed commit of the following:
commit d8c6aacb664361a13dde8522de2470dd137bed00
Merge: 84df492b 12f1e4ed
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 15 17:21:41 2021 +0300
Merge branch 'master' into 2280-dns-timeout
commit 84df492b0134e88e031f586333437f503b90b7ae
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 15 16:49:41 2021 +0300
home: fix docs & naming
commit af44a86a60ea815ca7100edc34db8acbdcc2cccf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 15 15:55:12 2021 +0300
all: imp docs & tests
commit 6ed6599fa0024cc7d14dc7c75ddda62e5179fe00
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 15 15:26:22 2021 +0300
home: imp duration tests
commit 8fe7cb099dccfce3f9329d7207ef48f488f07e83
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jun 15 15:04:16 2021 +0300
all: imp code, docs & tests
commit a989e8a5a6acede0063141cdbfc103b150b33d97
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Jun 12 19:02:23 2021 +0300
WIP
commit b0362e22040a1d38f81dcc775c5ef6f7d1e94eee
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Jun 12 18:58:09 2021 +0300
all: imp docs & tests
commit 64b00fd0854f3ddcb0189f3c93f3ffa2a31a98be
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Jun 12 03:44:29 2021 +0300
home: introduce marshalable duration
commit bfb1a5706c37fcd27bccce4a5aec37dca3cf238b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Jun 12 01:56:10 2021 +0300
all: add upstream timeout setting
2021-06-15 17:36:49 +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
Eugene Burkov
557bbcbf37
Pull request: 3184 disable private ptr
...
Merge in DNS/adguard-home from 3184-disable-ptr to master
Updates #3184 .
Squashed commit of the following:
commit b78ac2eeb1b408586808ddbd1c87107f373b11b0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed May 26 17:20:34 2021 +0300
all: rename dns config field
commit 36512134822a5f6b8b296ccbd7e7d5a9b8e87f26
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed May 26 15:55:44 2021 +0300
client: handle local ips rdns
commit 9a691830d45db93e078332d85bc0efa7dc7b6ac6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed May 26 14:43:13 2021 +0300
all: imp naming
commit 771b7a3d5d25f91408dd97ba3287efb641028ccf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed May 26 14:24:38 2021 +0300
all: imp docs, code
commit be960893e8bbb7375a944ca0345b50c857a2d7cf
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed May 26 13:23:56 2021 +0300
all: imp docs & log changes
commit 4e645a520f6bb584ef951435ee833ad30769af98
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed May 26 12:49:44 2021 +0300
all: add the field into structs
commit 22b5b6163f086560a3189234532ba877be7ba940
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue May 25 15:10:31 2021 +0300
dnsforward: entitle lock, imp code
2021-05-26 17:55:19 +03:00
Ainar Garipov
03a828ef51
Pull request: replace agherr with golibs' errors
...
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
commit 5aba278a31c5a213bd9e08273ce7277c57713b22
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 24 17:05:18 2021 +0300
all: imp code
commit f447eb875b81779fa9e391d98c31c1eeba7ef323
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 24 15:33:45 2021 +0300
replace agherr with golibs' errors
2021-05-24 17:28:11 +03:00
Ainar Garipov
7f2f8de922
Pull request: all: less annoying pkg names
...
Merge in DNS/adguard-home from imp-naming to master
Squashed commit of the following:
commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 13 15:52:14 2021 +0300
all: less annoying pkg names
2021-05-21 16:15:47 +03:00
Ainar Garipov
460aa1a5ba
Pull request: home: imp client http api, docs
...
Updates #3075 .
Squashed commit of the following:
commit c88fd2e24a19474bce736e5b6af7e094b43be390
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 6 16:09:49 2021 +0300
home: imp code, docs
commit 8ae7d9001927d56394d2177c22fe114d98f01732
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu May 6 15:35:49 2021 +0300
home: imp client http api, docs
2021-05-06 16:41:33 +03:00
Ainar Garipov
93638a1936
Pull request: all: add string set
...
Merge in DNS/adguard-home from add-strset to master
Squashed commit of the following:
commit 2500df1805dee425eafd0503983ec631de02af0b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 20 15:09:59 2021 +0300
all: add string set
2021-04-20 16:26:19 +03:00
Ainar Garipov
a1450c5595
Pull request: all: do not use dhcp clients when server is off
...
Closes #2934 .
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off
2021-04-15 17:52:53 +03:00
Eugene Burkov
69f526b13d
Pull request: 2956 fix clients disabling
...
Merge in DNS/adguard-home from 2956-fix-flag to master
Closes #2956 .
Updates #1947 .
Squashed commit of the following:
commit ffb98f752f6d4c40ea166ff1e482edcd7f028513
Merge: 800d67db 7be2fc37
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Apr 14 19:01:34 2021 +0300
Merge branch 'master' into 2956-fix-flag
commit 800d67db84786c8fe93d38b6aa932aa4dd4dd345
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Apr 14 18:54:26 2021 +0300
home: fix clients disabling
2021-04-14 19:18:48 +03:00
Ainar Garipov
48d702f76a
Pull request: all: fix client custom upstream comments
...
Updates #2947 .
Squashed commit of the following:
commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 13 13:40:29 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 13 13:34:28 2021 +0300
all: imp code, tests
commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Apr 13 13:17:09 2021 +0300
Merge branch 'master' into 2947-cli-ups-comment
commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 12 22:13:41 2021 +0300
all: fix client custom upstream comments
2021-04-13 13:44:29 +03:00
Eugene Burkov
e671f43a2f
Pull request: 1947 disable autohosts option
...
Merge in DNS/adguard-home from 1947-hosts-opt to master
Updates #1947 .
Updates #2829 .
Squashed commit of the following:
commit d09285c3dbfa7816469eec223b88c320c255c8fe
Merge: cff8c4cd 7c6557b0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 18:23:20 2021 +0300
Merge branch 'master' into 1947-hosts-opt
commit cff8c4cdbf4bcd1f5f413c541d7f4a9e42b8b05b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:46:19 2021 +0300
home: fix help
commit 1fa01d5b30f5adeda564dcc85a7064e2921d5981
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:40:48 2021 +0300
home: fix option order
commit 9d83cb604aaddcc8cbe99bafa544636f8f0b7e54
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:28:30 2021 +0300
aghnet: add important todo
commit 7f1386ff5c3081e07e975b640164a7a05e1319c9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 17:17:17 2021 +0300
all: correct naming
commit cbe2b2e4b21d5bceb3ee88e09cad154ba62b5cef
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 15:55:46 2021 +0300
all: mv functionality from util
commit e82ad53862682d903dd0dd10844db65997a758bc
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 15:41:35 2021 +0300
home: imp code, docs
commit 9058977f3ff99648fabaebbd7c1c354c71671327
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 12 15:02:34 2021 +0300
home: add an option to disable autohosts
2021-04-12 18:31:45 +03:00
Eugene Burkov
80ed8be145
Pull request: 2704 local addresses vol.3
...
Merge in DNS/adguard-home from 2704-local-addresses-vol.3 to master
Updates #2704 .
Updates #2829 .
Updates #2928 .
Squashed commit of the following:
commit 8c42355c0093a3ac6951f79a5211e7891800f93a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Apr 7 18:07:41 2021 +0300
dnsforward: rm errors pkg
commit 7594a21a620239951039454dd5686a872e6f41a8
Merge: 830b0834 908452f8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Apr 7 18:00:03 2021 +0300
Merge branch 'master' into 2704-local-addresses-vol.3
commit 830b0834090510096061fed20b600195ab3773b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Apr 7 17:47:51 2021 +0300
dnsforward: reduce local upstream timeout
commit 493e81d9e8bacdc690f88af29a38d211b9733c7e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Apr 6 19:11:00 2021 +0300
client: private_upstream test
commit a0194ac28f15114578359b8c2460cd9af621e912
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 6 18:36:23 2021 +0300
all: expand api, fix conflicts
commit 0f4e06836fed958391aa597c8b02453564980ca3
Merge: 89cf93ad 8746005d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 6 18:35:04 2021 +0300
Merge branch 'master' into 2704-local-addresses-vol.3
commit 89cf93ad4f26c2bf4f1b18ecaa4d3a1e169f9b06
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Apr 6 18:02:40 2021 +0300
client: add local ptr upstreams to upstream test
commit e6dd869dddd4888474d625cbb005bad6390e4760
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Apr 6 15:24:22 2021 +0300
client: add private DNS form
commit b858057b9a957a416117f22b8bd0025f90e8c758
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 6 13:05:28 2021 +0300
aghstrings: mk cloning correct
commit 8009ba60a6a7d6ceb7b6483a29f4e68d533af243
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Apr 6 12:37:46 2021 +0300
aghstrings: fix lil bug
commit 0dd19f2e7cc7c0de21517c37abd8336a907e1c0d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 5 20:45:01 2021 +0300
all: log changes
commit eb5558d96fffa6e7bca7e14d3740d26e47382e23
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 5 20:18:53 2021 +0300
dnsforward: keep the style
commit d6d5fcbde40a633129c0e04887b81cf0b1ce6875
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 5 20:02:52 2021 +0300
dnsforward: disable redundant filtering for local ptr
commit 4f864c32027d10db9bcb4a264d2338df8c20afac
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 5 17:53:17 2021 +0300
dnsforward: imp tests
commit 7848e6f2341868f8ba0bb839956a0b7444cf02ca
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Apr 5 14:52:12 2021 +0300
all: imp code
commit 19ac30653800eebf8aaee499f65560ae2d458a5a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sun Apr 4 16:28:05 2021 +0300
all: mv more logic to aghstrings
commit fac892ec5f0d2e30d6d64def0609267bbae4a202
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 2 20:23:23 2021 +0300
dnsforward: use filepath
commit 05a3aeef1181b914788d14c7519287d467ab301f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 2 20:17:54 2021 +0300
aghstrings: introduce the pkg
commit f24e1b63d6e1bf266a4ed063f46f86d7abf65663
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 2 20:01:23 2021 +0300
all: imp code
commit 0217a0ebb341f99a90c9b68013bebf6ff73d08ae
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Apr 2 18:04:13 2021 +0300
openapi: log changes
... and 3 more commits
2021-04-07 20:16:06 +03:00
Ainar Garipov
908452f883
Pull request: all: fix names of runtime clients on query log page
...
Updates #2929 .
Squashed commit of the following:
commit f02111aac1e9d63732589b65b224613aa3240677
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 7 17:40:16 2021 +0300
all: fix names of runtime clients on query log page
2021-04-07 17:49:37 +03:00
Ainar Garipov
c133b01ef7
Pull request: all: add idna handling, imp domain validation
...
Updates #2915 .
Squashed commit of the following:
commit b907324426c87ee7334edbd61e43c44444ad27a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 7 16:26:41 2021 +0300
all: imp docs, upd
commit c022f75cac006e077095cad283fea0a91d3a0eea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 7 15:51:30 2021 +0300
all: add idna handling, imp domain validation
2021-04-07 16:36:38 +03:00