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
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
Ainar Garipov
bb226434f8
Pull request 1753: imp-filtering-cyclo
...
Merge in DNS/adguard-home from imp-filtering-cyclo to master
Squashed commit of the following:
commit ca97d7acc9893c489800bbbc41e71ccf686c8f07
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 28 15:16:34 2023 +0300
filtering: imp cyclo
2023-02-28 16:34:11 +03:00
Eugene Burkov
6aa93f4ae7
Pull request: safebrowsing races
...
Merge in DNS/adguard-home from safebrowsing-races to master
Squashed commit of the following:
commit c7f4932d1ed8ea4fea99e04487ac77c23fb5f386
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Jan 26 16:36:32 2023 +0300
filtering: imp code, naming
commit af83cf2e689d199c8280022c9ffb84775b74c4e4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 25 19:47:30 2023 +0300
filtering: DRY
commit 8bfe6b2bb397058af3b7de4d255ed13287e250c9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Jan 25 18:48:19 2023 +0300
filtering: fix possible races
2023-01-26 17:13:18 +03:00
Eugene Burkov
48cbc7bdf0
Pull request: 5258-good-old-filters
...
Merge in DNS/adguard-home from 5258-good-old-filters to master
Updates #5258 .
Squashed commit of the following:
commit 8555e685a104713e552f017de63281749f41b6b2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 20 16:07:52 2022 +0400
filtering: imp tests, docs
commit 2ecfc18fc69850a06461620a24527158603cd7b8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Dec 20 11:00:59 2022 +0400
filtering: fix docs
commit 1ea8d45a85f3fb6794b44134e8fdcbe2044d2199
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 19 23:19:37 2022 +0400
filtering: imp naming, docs
commit c52a3bba48738c002111c234fb4c312380e49cfc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 19 23:13:37 2022 +0400
filtering: imp logic
commit 3ad4276ace40f05db47b49fb033d1b0fa208ec4e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 19 17:49:15 2022 +0400
filtering: imp docs
commit 1bc3cc443bc8ec988532effaaf5f50474a1a69ab
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 19 17:45:37 2022 +0400
filtering: imp more
commit 7908339a0c9fcc29e8fe12b6c5d8c14bbfa51364
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 19 16:57:42 2022 +0400
filtering: imp code
commit 21bbd18b4ded83f354210ac32010d8fd1073452f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Dec 19 12:11:21 2022 +0400
filtering: imp src reading
2022-12-20 16:40:42 +03:00
Dimitry Kolyshev
e6f8aeeebe
Pull request: 2499 rewrite: storage vol.1
...
Merge in DNS/adguard-home from 2499-rewrites to master
Squashed commit of the following:
commit 3f5f8e1354cbfa2de2bea69b1caa5dfbcb84ddb1
Merge: c84a86fb fafd7a1e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 28 13:13:31 2022 +0200
Merge remote-tracking branch 'origin/master' into 2499-rewrites
commit c84a86fba1c9cd77c5893e056cd85f8aa6597afc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 28 12:50:26 2022 +0200
rewrite: todos
commit 3b33a79bea65650ee7dc920554773d1d1d2c67f5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 28 11:45:05 2022 +0200
rewrite: todos
commit 15022994e7af8e5ee5929edff8ce98356a1cb27b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 12:15:27 2022 +0200
rewrite: imp code
commit b3c1949a585a8ff83c046921288ce2fdb5b36cee
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 11:33:25 2022 +0200
rewrite: imp code
commit 80fe50a86fc6e5ed5cf5b0d2e0be667b1b9221a8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 11:13:39 2022 +0200
rewrite: imp code
commit 5288ede0e8df5ca1d12c9e1e8341db703729c71a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 11:04:11 2022 +0200
Revert "all: rewrite"
This reverts commit 32ad8d76861bd9919da61635e6f871adcc36c999.
commit cff6494fde44646f5ac54173380719557e0c0e02
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 11:04:11 2022 +0200
Revert "all: rewrite"
This reverts commit 65e44e92b009c561ddb2c68f56e04d57b83ba247.
commit e0fe877da4ee820838acc1ac6111809e7d0bc72e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 11:04:11 2022 +0200
Revert "filtering: imp code"
This reverts commit c882da3309297f44ccaf38274ec4ef0ef2fec7b3.
commit 8e3f9d4a7ac2e5b114064e77ec009a2457b28a73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 11:04:11 2022 +0200
Revert "rewrite: imp code"
This reverts commit ce2332932bef46186c0addf5e7a1ca648cdd9f22.
commit ce2332932bef46186c0addf5e7a1ca648cdd9f22
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 25 10:56:48 2022 +0200
rewrite: imp code
commit c882da3309297f44ccaf38274ec4ef0ef2fec7b3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 24 13:39:26 2022 +0200
filtering: imp code
commit 65e44e92b009c561ddb2c68f56e04d57b83ba247
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 24 13:25:10 2022 +0200
all: rewrite
commit 32ad8d76861bd9919da61635e6f871adcc36c999
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 24 13:19:55 2022 +0200
all: rewrite
commit 941538abfe517e70e469cb5b121fa13f1a3b79f3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Nov 22 12:54:55 2022 +0200
rewrite: storage tests
commit 0a1ad86ea766bc1e6015d06c872b08ecc0510aea
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Nov 22 12:46:56 2022 +0200
rewrite: imp code
commit f10a45361c343042d6348e0fa8049c9eb0299af8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 21 14:29:44 2022 +0200
rewrite: storage
commit ff91bb81a607737dd6845b0a4b13c2c75a4ad57d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Nov 20 13:25:05 2022 +0200
rewrite: storage
2022-11-28 14:19:56 +03:00
Eugene Burkov
a149d816d9
Pull request: 4916 Editing filter
...
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916 .
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit
2022-10-21 20:14:43 +03:00
Eugene Burkov
47c9c946a3
Pull request: 4871 imp filtering
...
Merge in DNS/adguard-home from 4871-imp-filtering to master
Closes #4871 .
Squashed commit of the following:
commit 618e7c558447703c114332708c94ef1b34362cf9
Merge: 41ff8ab7 11e4f091
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 22 19:27:08 2022 +0300
Merge branch 'master' into 4871-imp-filtering
commit 41ff8ab755a87170e7334dedcae00f01dcca238a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 22 19:26:11 2022 +0300
filtering: imp code, log
commit e4ae1d1788406ffd7ef0fcc6df896a22b0c2db37
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Sep 22 14:11:07 2022 +0300
filtering: move handlers into single func
commit f7a340b4c10980f512ae935a156f02b0133a1627
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 21 19:21:09 2022 +0300
all: imp code
commit e064bf4d3de0283e4bda2aaf5b9822bb8a08f4a6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 20:12:16 2022 +0300
all: imp name
commit e7eda3905762f0821e1be1ac3cf77e0ecbedeff4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 17:51:23 2022 +0300
all: finally get rid of filtering
commit 188550d873e625cc2951583bb3a2eaad036745f5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 17:36:03 2022 +0300
filtering: merge refresh
commit e54ed9c7952b17e66b790c835269b28fbc26f9ca
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 17:16:23 2022 +0300
filtering: merge filters
commit 32da31b754a319487d5f9d5e81e607d349b90180
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 14:48:13 2022 +0300
filtering: imp docs
commit 43b0cafa7a27bb9b620c2ba50ccdddcf32cfcecc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Sep 20 14:38:04 2022 +0300
all: imp code
commit 253a2ea6c92815d364546e34d631e406dd604644
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 19 20:43:15 2022 +0300
filtering: rm important flag
commit 1b87f08f946389d410f13412c7e486290d5e752d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 19 17:05:40 2022 +0300
all: move filtering to the package
commit daa13499f1dd4fe475c4b75769e34f1eb0915bdf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Sep 19 15:13:55 2022 +0300
all: finish merging
commit d6db75eb2e1f23528e9200ea51507eb793eefa3c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Sep 16 18:18:14 2022 +0300
all: continue merging
commit 45b4c484deb7198a469aa18d719bb9dbe81e5d22
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Sep 14 15:44:22 2022 +0300
all: merge filtering types
2022-09-23 13:23:35 +03:00
Ainar Garipov
3660b4810e
Pull request: 4865-refactor-dns-handlers
...
Updates #4865 .
Squashed commit of the following:
commit b874088ee72dfd0cae5f4102fac87e1f26245ddf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 2 14:01:52 2022 +0300
dnsforward: imp code, docs
commit a1b95fda58b777a54e7dcd57f0c419200f8fdc15
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 1 19:37:45 2022 +0300
all: refactor dns handler; opt
2022-09-02 14:52:19 +03:00
Ainar Garipov
fa76ad2a3c
filtering: imp code
2022-08-25 18:44:19 +03:00
Eugene Burkov
4293cf5945
Pull request: 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-04 19:05:28 +03:00
Ainar Garipov
21a1187ed2
Pull request: all: upd go, tools
...
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 26cd13146df705ead5e1c39c27e73252c71fa64d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 13 17:46:24 2022 +0300
all: upd go, tools
2022-04-13 18:16:33 +03:00
Eugene Burkov
e783564084
Pull request: 4238 response filtering
...
Merge in DNS/adguard-home from 4238-response-filtering to master
Closes #4238 .
Squashed commit of the following:
commit 2113f83c617a396a39f910bb8df939364fedf391
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 3 21:04:25 2022 +0300
dnsforward: restore a bit
commit f78607ed97892557c6bd6f3c3332f0bae01c1987
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 3 20:52:45 2022 +0300
all: imp code, docs
commit 646074ce141e8ac12a972f46d071389a2ce124e4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 3 20:37:05 2022 +0300
all: log changes
commit 94556d810549370fc455bcf14537fa1d2783eed1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Feb 3 20:30:57 2022 +0300
all: imp test upstream, cover resp filtering
commit 63e7721822a049734a390c7d7ea6d8416a43c8b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Feb 1 21:58:08 2022 +0300
all: filter response by rrtype
2022-02-03 21:19:32 +03:00
Eugene Burkov
f9aa5ae86a
Pull request: 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-27 20:18:52 +03:00
Ainar Garipov
dea8a585f8
Pull request: 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-27 19:40:39 +03:00
Ainar Garipov
52f36f201e
Pull request: filtering: restore rewrite behavior with other question types
...
Updates #4008 .
Squashed commit of the following:
commit babbc29331cfc2603c0c3b0987f5ba926690ec3e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 24 18:46:20 2021 +0300
filtering: restore rewrite behavior with other question types
2021-12-24 20:14:36 +03:00
Eugene Burkov
b3210cfa7e
Pull request: 3835 check ports properly
...
Merge in DNS/adguard-home from 3835-imp-error-msg to master
Updates #3835 .
Squashed commit of the following:
commit ba31cb67833df9f293fe13be96a35c2a823f115b
Merge: 19c7dfc9 4be69d35
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 16 20:07:25 2021 +0300
Merge branch 'master' into 3835-imp-error-msg
commit 19c7dfc96284a271d30d7111c86c439be3461389
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 16 19:42:10 2021 +0300
all: imp more
commit 5b9c6a3e357238bf44ef800a6033a7671f27d469
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 16 18:57:02 2021 +0300
all: introduce aghhttp
commit 29caa17200957aad2b98461573bb33d80931adcf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Dec 16 14:23:53 2021 +0300
all: imp more
commit 754c020191d7b9518cb0e789f3f5741ba38c3cf4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 15 20:53:41 2021 +0300
all: imp code, log changes
commit ec712dd562f31fcc2fbc27e7035f926c79827444
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Dec 15 18:40:54 2021 +0300
home: check ports properly
2021-12-16 20:54:59 +03:00
Ainar Garipov
86cffcd168
Pull request: all: upd go, minor imp
...
Merge in DNS/adguard-home from minor-imp to master
Squashed commit of the following:
commit c5b9e2a15290760b2782acc0c08df3fe57356500
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 10 14:23:28 2021 +0300
all: upd go, minor imp
2021-12-10 17:20:15 +03:00
Eugene Burkov
4f50519b9f
Pull request: 3846 filter lists ids
...
Merge in DNS/adguard-home from 3846-list-ids to master
Closes #3846 .
Squashed commit of the following:
commit 02a12fc27bc5d3cf1a17fd43c6f05e2c389bd71d
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Nov 26 16:58:13 2021 +0300
client: fix name
commit 6220570e6e9c968f0d3fa9d02c12099ce66aaaad
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Nov 26 16:46:54 2021 +0300
client: handle special filter ids
commit dcdeb2d7f4500aab6ce5ffe642bdaacf291f5951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:52:06 2021 +0300
all: mv constants, imp config
commit 8ceb4a2b351e595929d8b2af564c6d0267afa230
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 26 15:04:36 2021 +0300
all: fix custom list id, log changes
commit acb8b456e7f41a556da34cf10647eecee058beec
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 25 20:04:37 2021 +0300
all: rm global ctx, add const flt ids
2021-11-26 18:25:43 +03:00
Eugene Burkov
51f11d2f8e
Pull request: 3846 hosts querylog
...
Merge in DNS/adguard-home from 3846-hosts-querylog to master
Updates #3846 .
Squashed commit of the following:
commit 722e96628b1ccca1a5b5a716b8bcb1da2aefcc3b
Merge: a20ad71e ed868fa4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 23 17:52:08 2021 +0300
Merge branch 'master' into 3846-hosts-querylog
commit a20ad71e723dbfa3483c3bdf9e4c8fd15c8b0e3c
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:28:12 2021 +0300
client: fix variable name
commit 7013bff05d6cff75c6c25a38d614db8b4b2f0b87
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 17:03:26 2021 +0300
client: fix missing import
commit 8e4a0fb047b4d39ab44a285f59420573d7ba5eec
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 23 16:56:50 2021 +0300
client: handle system host filter id
commit abbbf662d2f3ea3f5d3569a9c45418e356adbf3c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Nov 22 13:54:52 2021 +0300
all: imp code
commit c2df63e46e75f84f70a610d18deccbeee672ebda
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Nov 22 12:50:51 2021 +0300
querylog: rm unused test data
commit 8a1d47d266254fd4aedd4c61c7ea9e48168ea375
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Nov 22 02:52:50 2021 +0300
aghnet: final imps
commit ade3acb4bebc8bdd755e56f314cdf19bc9375557
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Nov 19 15:48:40 2021 +0300
all: add hosts container rule list support
2021-11-23 18:01:48 +03: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
884a98501d
Pull request: 3371 pipe-tailed rules
...
Merge in DNS/adguard-home from 3371-rules-validation to master
Updates #3371 .
Squashed commit of the following:
commit 7881a0bc788f130eaed27ea9306309dea52f62e7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Nov 11 15:06:42 2021 +0300
all: imp code, docs
commit 613775a4bc3e75ca7792fb6896e161f3ef6b1a29
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 2 16:50:43 2021 +0300
all: upd urlfilter
2021-11-11 16:19:33 +03:00
Eugene Burkov
b8c4651dec
Pull request: 1558 enable dnsrewrites on disabled protection
...
Merge in DNS/adguard-home from 1558-always-rewrite to master
Squashed commit of the following:
commit b8508b3b5fb688cad273a9259c09ccfc07948b2f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 20 19:17:22 2021 +0300
all: imp log of changes
commit 97e3649b670786a2936e368a9505faf52f8e8804
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 18 13:18:15 2021 +0300
all: enable dnsrewrites on disabled protection
2021-10-20 19:52:13 +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
bf1263628a
Pull request: filtering: fix special values in legacy rewrites
...
Updates #3616 .
Squashed commit of the following:
commit 06a65c3fe754f8f849f5e1648cc3d94d564bfa16
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:31:06 2021 +0300
filtering: imp docs
commit 9b6788453622ee19b0b383833e734d25e03a4d55
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Sep 17 14:22:56 2021 +0300
filtering: fix special values in legacy rewrites
2021-09-17 14:37:55 +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
194ea6ef95
Pull request: filtering: fix legacy rewrite wildcards
...
Updates #3343 .
Squashed commit of the following:
commit ab3c3e002a6d2a11bc3207fdaaeb292aaa194907
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 20:58:57 2021 +0300
filtering: fix legacy rewrite wildcards
2021-07-12 21:10:39 +03:00
Ainar Garipov
f419896ec6
Pull request: filtering: fix letter case in cname matching
...
Updates #3335 .
Squashed commit of the following:
commit ff55c112417199e4b04098a32c5f4805b59356f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jul 12 12:38:46 2021 +0300
filtering: fix letter case in cname matching
2021-07-12 13:10:47 +03:00
Ainar Garipov
7547d3a422
Pull request: all: sup many ips in host rules
...
Closes #1381 .
Squashed commit of the following:
commit 44965f74d8becb27173cafc533e56e1cde484b59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 17 13:54:44 2021 +0300
dnsforward: imp code, docs
commit 23736cf9b407b668faade19b61739536caafff03
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 20:33:59 2021 +0300
dnsforward: rm todo
commit ff086756160d72f3cdbe662862dd1fb447ac5ff3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 16 20:32:01 2021 +0300
all: sup many ips in host rules
2021-06-17 14:09:16 +03:00
Eugene Burkov
14250821ab
Pull request: 2875 fix client filtering settings
...
Merge in DNS/adguard-home from 2875-client-filtering to master
Updates #2875 .
Squashed commit of the following:
commit b3b9582b7dde826005ba79d499ed7e82af067e93
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 24 14:22:29 2021 +0300
all: use atomic, log changes
commit 9304d8b96d0d064d7741c85165ab885f5547fd4c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon May 24 13:43:22 2021 +0300
all: fix client filtering settings
2021-05-24 14:48:42 +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