Ainar Garipov
80eb339896
all: sync with master; upd chlog
2023-02-01 15:41:34 +03:00
Ainar Garipov
5f6fbe8e08
all: sync with master; upd chlog
2023-01-19 15:04:46 +03:00
Ainar Garipov
a11c8e91ab
all: sync with master
2022-12-15 17:50:08 +03:00
Ainar Garipov
fde9ea5cb1
all: sync with master
2022-12-07 16:46:59 +03:00
Ainar Garipov
c9314610d4
all: sync with master
2022-11-02 16:18:02 +03:00
Ainar Garipov
21f6ed36fe
all: sync with master
2022-09-29 17:36:01 +03:00
Ainar Garipov
faf2b32389
all: sync with master
2022-09-07 18:03:18 +03:00
Ainar Garipov
c7a8883201
cherry-pick: 4795-bilibili
...
Updates #4795 .
* commit 'e6ebb8efef4430c48b06469ba566349bba3d9856':
filtering: fmt
filtering: add Bilibili and Weibo domains
filtering: add Bilibili service
2022-08-19 15:18:14 +03:00
Ildar Kamalov
11146f73ed
cherry-pick: 4775 fix query log issue on tablet devices
...
Updates #4775
Squashed commit of the following:
commit 9ad85d2306b68227e11c7b1dd792e3fe6389939d
Merge: 95aa29d6 41f081d8
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Aug 2 11:44:04 2022 +0300
Merge branch 'master' into 4775-popup
commit 95aa29d68bdf5e9c4e7aa59f42d04328b1872115
Author: Ildar Kamalov <ik@adguard.com >
Date: Mon Aug 1 16:21:23 2022 +0300
client: fix query log issue on tablet devices
2022-08-03 15:57:05 +03:00
Ainar Garipov
af4ff5c748
cherry-pick: upd-domains-and-links
...
Merge in DNS/adguard-home from upd-domains-and-links to master
Squashed commit of the following:
commit 5e5ff2fec358104995877da689da24749ac470ce
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Jul 28 19:53:19 2022 +0300
all: upd urls
Update domains and URLs to make them more resistant to state blocking.
2022-08-03 15:54:23 +03:00
Eugene Burkov
aa4a0d9880
cherry-pick: 4698 Gateway IP in DHCP Lease
...
Closes #4698 .
Squashed commit of the following:
commit 6be0caee58926f8cea1e10650fbde0c8d97d0dac
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Jul 8 13:41:50 2022 +0300
update translation
commit e0370656d05e8463d73ea73568cae81187c6b2e3
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Jul 8 13:40:54 2022 +0300
client: validate static lease ip
commit 7f4d00f9f3a54dc93ce5d5c45e9c21745f6e39d1
Merge: 2ee79626 77e5e27d
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Fri Jul 8 13:20:15 2022 +0300
Merge branch 'master' into 4698-lease-with-gateway
commit 2ee79626a1b0c7b113dbd22ba4ef6e85ea9913ec
Merge: 471b96b8 3505ce87
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Jul 7 19:34:33 2022 +0300
Merge branch 'master' into 4698-lease-with-gateway
commit 471b96b81da8920c1e71b7110050154f912677d2
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Jul 7 16:07:23 2022 +0300
dhcpd: imp docs
commit 67dd6c76f7d2df4712a57281e0f40f2ee1a1efa2
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Jul 7 15:48:47 2022 +0300
dhcpd: restrict gateway ip for lease
2022-07-13 15:14:32 +03:00
Ainar Garipov
86e5756262
client: sync with master
2022-06-02 17:23:58 +03:00
Dimitry Kolyshev
723279121a
cherry-pick: whotracksme tracker links
...
Merge in DNS/adguard-home from 4416-ui-tracker-href to master
Squashed commit of the following:
commit 979ea82a3b4d2c2a895b81aacd613fb7e5bec586
Merge: 4fe6328b 12ee287d
Author: Dimitry Kolyshev <dkolyshev@adguard.com >
Date: Tue Apr 19 15:03:13 2022 +0200
Merge remote-tracking branch 'origin/master' into 4416-ui-tracker-href
commit 4fe6328b276e697a2aa351c6543d2efe6d2dc2e1
Author: Dimitry Kolyshev <dkolyshev@adguard.com >
Date: Tue Apr 19 14:08:10 2022 +0200
whotracksme tracker links
2022-06-02 16:53:32 +03:00
Ildar Kamalov
1547f9d35e
cherry-pick: client: fix constant loading for blocked requests
...
Updates #4420
Squashed commit of the following:
commit 461a59e1541626020bf0bcfaf34ba7d2f4509dc7
Merge: 5c5e7b5d 2a1ad532
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Mon Apr 25 18:46:02 2022 +0300
Merge branch 'master' into 4420-loading-log
commit 5c5e7b5d1a69d30e40e71f49f46dea89fa8c40a2
Author: Ildar Kamalov <ik@adguard.com >
Date: Sun Apr 24 22:18:22 2022 +0300
client: fix constant loading for blocked requests
2022-06-02 16:45:06 +03:00
Dimitry Kolyshev
bccbecc6ea
cherry-pick: all: filters json
...
Merge in DNS/adguard-home from 4581-filters-json to master
Squashed commit of the following:
commit da0b86983432ac1791645da328df5848daac5ea6
Merge: 62fa4fc6 a82ec09a
Author: Dimitry Kolyshev <dkolyshev@adguard.com >
Date: Wed May 25 12:58:25 2022 +0200
Merge remote-tracking branch 'origin/master' into 4581-filters-json
commit 62fa4fc6ff150ebb8dbd8888a58819fb644d43ad
Author: Dimitry Kolyshev <dkolyshev@adguard.com >
Date: Wed May 25 11:55:52 2022 +0200
all: filters json
commit 96486ffbb41947b5e748f6e35eb96ee73867eba1
Merge: 9956f0af c0ac82be
Author: Dimitry Kolyshev <dkolyshev@adguard.com >
Date: Tue May 24 15:57:52 2022 +0200
Merge branch 'master' into 4581-filters-json
commit 9956f0aff1b7029f336d22013a62f2871a964322
Author: Dimitry Kolyshev <dkolyshev@adguard.com >
Date: Tue May 24 15:53:43 2022 +0200
all: filters json
2022-06-02 16:33:33 +03:00
Eugene Burkov
6a4a9a0239
cherry-pick: 3978 Query Log ECS
...
Merge in DNS/adguard-home from 3978-ecs-ip to master
Updates #3978 .
Squashed commit of the following:
commit 915b94afa4b6d90169f73d4fa171bc81bcc267a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Mar 3 17:46:40 2022 +0300
all: rm dot
commit 2dd2ed081b199de7e5d8269dae5d08d53b5eea6d
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Mar 3 17:42:45 2022 +0300
client: imp txt
commit 8d5a23df739f0b650f9f3870141fd83e8fa0c1e0
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Mar 3 14:36:04 2022 +0300
client: imp text
commit 69c856749a20144822ef3f1f67c5f3e3c24f5374
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Mar 3 14:24:56 2022 +0300
client: imp description
commit cd0150128ad29d1874492735a5d621c0803ad0bd
Merge: 28181fbc e0b557ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Wed Mar 2 21:02:16 2022 +0300
Merge branch 'master' into 3978-ecs-ip
commit 28181fbc79eb22e7fd13cbd1d5a3c040af9fa2a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Wed Mar 2 20:45:50 2022 +0300
client: show ecs
commit cdc5e7f8c4155b798426d815eed0da547ef6efb7
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Feb 17 20:15:56 2022 +0300
openapi: fix milestone
commit 404d6d822fa1ba4ed4cd41d92d4c1b805342fe55
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Feb 17 20:08:21 2022 +0300
all: fix deps, docs
commit 8fb80526f1e251d3b7b193c53a4a6dee0e22c145
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Feb 17 19:39:34 2022 +0300
all: add querylog ecs backend
2022-06-02 16:29:22 +03:00
Ainar Garipov
74004c1aa0
cherry-pick: client: use strict search by client
...
Updates #4271 .
Squashed commit of the following:
commit 10a113126306fce51b4dd10a696b8c7d3213a445
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Fri Feb 11 18:37:18 2022 +0300
client: more strict search
commit 7aa24129195c0eba442bfe43564469fdb2a5b138
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Fri Feb 11 18:22:18 2022 +0300
client: use strict search by client
2022-02-14 17:06:16 +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
Ainar Garipov
959d9ff9a0
cherry-pick: client: upd manual upd link
...
Closes #4208 .
Squashed commit of the following:
commit 4ae27b5f7cd6b0f4ec0c9041d92c4d1ac00dd622
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Mon Jan 31 18:34:18 2022 +0300
client: upd manual upd link
2022-02-07 20:09:09 +03:00
Ildar Kamalov
5ebdd1390e
cherry-pick: 4143 sort client ids
...
Merge in DNS/adguard-home from 4143-clients-sort to master
Updates #4143 .
Squashed commit of the following:
commit a4b547eb46a54bdfdc7d342fab5f8ecfa54f5d06
Merge: d369c11c d82b2902
Author: Ildar Kamalov <ik@adguard.com >
Date: Thu Jan 20 11:58:42 2022 +0300
Merge branch 'master' into 4143-clients-sort
commit d369c11c69665510043f63e0283e1ca1b2974289
Author: Ildar Kamalov <ik@adguard.com >
Date: Wed Jan 19 16:53:39 2022 +0300
client: fix sort ip method
commit d767a1199c37ad9df7f3bc2d362d840b0226d836
Author: Ildar Kamalov <ik@adguard.com >
Date: Wed Jan 19 16:23:23 2022 +0300
client: sort client ids
2022-01-21 17:08:07 +03:00
Andrey Meshkov
7ee8142b38
Pull request: revise vetted lists, fix #2644
...
Merge in DNS/adguard-home from 2644-reviselists to master
Squashed commit of the following:
commit 162985aed01742ec19db2f5ba4c642d005cd905f
Merge: c7e7f701 72db0149
Author: Andrey Meshkov <am@adguard.com >
Date: Wed Dec 15 16:44:39 2021 +0300
Merge branch 'master' into 2644-reviselists
commit c7e7f701abd4fbbb4c8eec9b068f895b7ecf69da
Author: Andrey Meshkov <am@adguard.com >
Date: Wed Dec 15 16:39:29 2021 +0300
revise vetted lists, fix #2644
2021-12-15 16:51:03 +03:00
Andrey Meshkov
72db014905
Pull request: added companiesdb script, fix #2793
...
Merge in DNS/adguard-home from 2793-whotracksme to master
Squashed commit of the following:
commit eff9de98b389ba087eb529c12e3ec916842aa8c3
Merge: bf9bc6a4 49eb62ae
Author: Andrey Meshkov <am@adguard.com >
Date: Wed Dec 15 16:38:53 2021 +0300
Merge branch 'master' into 2793-whotracksme
commit bf9bc6a4f5c1d7e4b6265f1c33bd532ec5b58cc7
Author: Andrey Meshkov <am@adguard.com >
Date: Wed Dec 15 16:04:57 2021 +0300
scripts: fix review comments
commit 5a035cabc1a75a3c750a4a7a36af38ad9f33959b
Author: Andrey Meshkov <am@adguard.com >
Date: Wed Dec 15 15:47:41 2021 +0300
added companiesdb script, fix #2793
2021-12-15 16:44:28 +03:00
Ainar Garipov
a396865869
Pull request: all: do not redirect to https if not necessary
...
Merge in DNS/adguard-home from 3558-https-redirect to master
Squashed commit of the following:
commit f656563c0b0db6275748de28bc890dcf85b0e398
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Fri Dec 10 20:44:00 2021 +0300
all: do not redirect to https if not necessary
2021-12-13 13:48:08 +03:00
Eugene Burkov
434032f8e3
Pull request: 3772 cache upstreams
...
Merge in DNS/adguard-home from 3772-cache-upstreams to master
Updates #3772 .
Squashed commit of the following:
commit 809e874fe8847fdbd7f8a7221f18393509f41339
Merge: 5774798c 2d328ea8
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Tue Dec 7 17:15:59 2021 +0300
Merge branch 'master' into 3772-cache-upstreams
commit 5774798ce1897bf292be49410794ce06cd084f93
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Dec 7 16:48:38 2021 +0300
client: fix formatting
commit 4b4bb668c762c9b4d47cf40a007f34fe47a6e260
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Dec 7 16:47:18 2021 +0300
client: remove comment
commit a2a9f904a6ab52194bb811a2a83967660a25f2cc
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Dec 7 16:45:31 2021 +0300
client: handle cached upstream
commit a56804c4910da838cb10c8ef0af2a525e9722b1c
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Fri Nov 26 15:33:43 2021 +0300
querylog: rm todo
commit 16c0a62ad2dfc7fcb5a6adbc868b296b7840fd27
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Fri Nov 26 15:31:53 2021 +0300
all: revise log of changes
commit 9f4b793205f17b6e85d74e83126093ed09eb24e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Nov 25 17:23:42 2021 +0300
WIP
commit 7fbc6d596295570d2c61c3e507160f65c9adccb8
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Thu Nov 25 17:03:42 2021 +0300
all: imp upstream info in querylog
2021-12-07 17:43:51 +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
Ildar Kamalov
936a7057fd
Pull request: 3824 fix DHCP empty form validation
...
Closes #3824
Squashed commit of the following:
commit 24d5770e2f276f710c011bf94e36702881ccbf1a
Merge: 8f539900 32294407
Author: Ildar Kamalov <ik@adguard.com >
Date: Wed Nov 24 12:21:23 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 8f539900489c940c6d7068d672420a553a1da299
Merge: 4be77268 51f11d2f
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Nov 23 19:06:44 2021 +0300
Merge branch 'master' into 3824-empty-values
commit 4be77268ab1b3dc99b754b8002320a615db2d99e
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Tue Nov 23 19:04:06 2021 +0300
all: use new consts
commit 701fd9a2b82d69c6b813a4a1889c65404ac3571b
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Nov 23 18:58:03 2021 +0300
client: get status on reset
commit a20734cbf26a57ec96fdb6e0f868a8656751e80a
Author: Eugene Burkov <E.Burkov@AdGuard.COM >
Date: Tue Nov 23 18:31:59 2021 +0300
dhcpd: fix reset defaults
commit e2cb0cb0995e7b2dd3e194c5bb9fe944cf7be8f5
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Nov 23 17:33:22 2021 +0300
client: fix DHCP empty form validation
2021-11-24 13:57:50 +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
Dmitry Seregin
b1e28a74d1
Pull request: 3767 removed dhcp leases validators
...
Merge in DNS/adguard-home from 3767-remove-dhcp-leases-validators to master
Squashed commit of the following:
commit 30511ecbb1ebbc913d3c3490b80b284fcc857e6c
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Tue Nov 2 19:20:06 2021 +0300
3767: removed dhcp leases validators
2021-11-02 20:12:11 +03:00
Eugene Burkov
7d9a1a2f30
client: fix json
2021-10-21 14:36:02 +03:00
Eugene Burkov
8388b3d5bc
Merge branch 'master' into 3745-cleanup-lists
2021-10-21 14:30:18 +03:00
Dmitry Seregin
d7aafa7dc6
Pull request #1329 : 3529 validate dhcpv4
...
Merge in DNS/adguard-home from 3529-validate-dhcpv4 to master
Squashed commit of the following:
commit 2f2455aa13a41398cd2846f31be96da9d34ba95d
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Tue Oct 19 19:18:12 2021 +0300
dhcpv4: better test && fix changelog
commit ec4ff9180e8390fb739b3be0fc76fd2c715fe691
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 19:08:44 2021 +0300
dhcpv4: better tests
commit e0e2f27b7a063ed84af170b16c3f87636cb738d2
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 18:55:47 2021 +0300
dhcpv4: better tests
commit 73e1d08e1265e336ee6339d5021f90883fe3e395
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 18:47:21 2021 +0300
dhcpv4: better tests
commit f636fc316123f26b6e2930afb4b22c18024ec93d
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 18:47:07 2021 +0300
all: updated golibs
commit 86dd107a1d483ac24bd8c26422324eb8b9c3d086
Merge: 51aaf6d9 b296fa22
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 17:18:17 2021 +0300
Merge branch 'master' into 3529-validate-dhcpv4
commit 51aaf6d9eb5fbe2b4304254dc6782305a19c53fa
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 17:18:02 2021 +0300
dhcpv4: better changelog
commit 720b896bb595c57fab6d376f88c8a4b1d131db40
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 17:14:25 2021 +0300
dhcpv4: better tests
commit 1098beffca8d5feb2ec104d26419210962c9a97d
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 12:08:26 2021 +0300
dhcp: changelog
commit d1f6c89d68657431fb261658133c67e9e3135c1c
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 12:03:06 2021 +0300
dhcpv4: fixed tests
commit 8b6713468fc04321c5238300df90bbb2d67ee679
Merge: 9991e9cb 3fa38fb4
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 11:57:57 2021 +0300
Merge branch 'master' into 3529-validate-dhcpv4
commit 9991e9cbee7dc87d8fa1d7e86e6cc7e09ab6938c
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 11:55:40 2021 +0300
dhcpv4: added tests
commit 5798a80de6c060365c1c647326d46cc13ccf28cb
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Mon Oct 18 11:46:03 2021 +0300
dhcpv4: validate subnet mask and ip range
2021-10-19 19:28:18 +03:00
bruvv
49d67a70b6
Cleaned up the list
...
Since SPAM404 is not maintained anymore and is a huge full spam list now of it's own (https://github.com/Spam404/lists/pull/18 ) it is save to remove it I would say.
Also removed X since it is also unmaintained
Added Netherlands blocking list
2021-10-18 10:04:24 +02:00
Ildar Kamalov
3fa38fb420
Pull request: 3684 validate client id in the mobileconfig form
...
Closes #3684
Squashed commit of the following:
commit 78e9862f7a06262f91c28d6ddcc10512560eedae
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Oct 15 14:39:36 2021 +0300
fix build
commit 3ed4ee69590f238396dd3aab2b62f110baa6d681
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Oct 15 13:39:12 2021 +0300
client: validate client id in the mobileconfig form
2021-10-15 15:01:50 +03:00
Ainar Garipov
eeda06f9b0
Pull request: 3564 9gag
...
Updates #3564 .
Squashed commit of the following:
commit dafb26d9c0a85f30fb06627411f653e160d38cc8
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Wed Sep 8 12:13:43 2021 +0300
client: fix 9gag spelling
commit a6aa44853061839e427836fe2daf69605cc90d33
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Wed Sep 8 12:07:59 2021 +0300
all: chlog
commit d46b17c079584946b857b63296a11acd6d524346
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Wed Sep 8 12:01:41 2021 +0300
filtering: fix 9gag blocked service
2021-09-08 12:24:12 +03:00
Ildar Kamalov
e5c73877c8
Pull request: 3403 use checkbox to disable statistics
...
Closes #3403
Squashed commit of the following:
commit 25eaa0a70cb5ac7de51c456d2f611522f334846c
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Aug 27 15:42:29 2021 +0300
fix enabling stats
commit 1e2897651a84cf32ae01a79b8a61aeb5aa9f6405
Author: Ildar Kamalov <ik@adguard.com >
Date: Mon Aug 16 18:46:21 2021 +0300
client: use checkbox to disable statistics
2021-08-27 16:08:29 +03:00
Dmitry Seregin
8454e65cd9
Pull request #1269 : tls: hide saved private key
...
Merge in DNS/adguard-home from 1898-hide-private-key to master
Squashed commit of the following:
commit 542569bbc098541f8e191cc5c1e5509a65fe2c5f
Merge: a07d715f 756c7064
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Fri Aug 27 13:29:15 2021 +0300
Merge branch 'master' into 1898-hide-private-key
commit a07d715f0f0932fdad4ec3f1e1a265b43809e21b
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 19:45:39 2021 +0300
fix bug
commit 9f2b70719a24aab827c2dc300fc94bf2202527a7
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 19:07:17 2021 +0300
fixes
commit e79f0e620844531a737fff5a88f5c2cffc403f51
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 18:35:32 2021 +0300
more documentation to god of documentation
commit 47790964ed05f50c075f6b6497b1517b0d974bea
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 18:23:08 2021 +0300
changed var named && fixed description
commit d35de5a34eafb3ffbd1148982dd31735a2000377
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 18:11:13 2021 +0300
revert locales
commit 514ab1a5d90039bf9aad1389dd0ed966fd1a7e65
Merge: 5d9b992a 16092e8b
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 14:41:27 2021 +0300
Merge branch 'master' into 1898-hide-private-key
commit 5d9b992a236dec276a46a035509da6938a7da7bf
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Thu Aug 26 14:41:13 2021 +0300
here we go again
commit 2e7b30df5f19953f4e055394083be62b23028ad6
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Fri Aug 20 17:11:49 2021 +0300
update deps
commit 5e58c3e22a77c42f321deb9707f34f031b345d75
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Fri Aug 20 17:10:19 2021 +0300
small fix
commit c2096377de0a8ecf4f36567322ad9171c5fb5ab2
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Fri Aug 20 17:07:45 2021 +0300
fixes && updated translations
commit ada2d4784e6288b1740b8564b6ffc1ef8f0dcf68
Merge: dc5ce072 550b1798
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Fri Aug 20 13:17:34 2021 +0300
Merge branch 'master' into 1898-hide-private-key
commit dc5ce0721b5c095ed79f2a302ad90d9616785f93
Author: Dmitriy Seregin <d.seregin@adguard.com >
Date: Fri Aug 13 20:12:18 2021 +0300
tls: hide saved private key
If private key saved as a string, then hide it from the answer to UI
2021-08-27 13:42:31 +03:00
Ildar Kamalov
ebade2b6ce
Pull request: 3313 statistics settings UI
...
Closes #3313
Squashed commit of the following:
commit 6f2ff98a8282789e2dbb16694ca87a1f4cc8c076
Merge: 1221f02f f4dde3f2
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Wed Jul 14 15:53:18 2021 +0300
Merge branch 'master' into 3313-statistics
commit 1221f02f40628964febd22967d85d5185f87b08d
Author: Ildar Kamalov <ik@adguard.com >
Date: Wed Jul 14 15:23:09 2021 +0300
client: make client names clickable
commit 99770ec065e14ce2522a59820f9851d79001923c
Author: Ildar Kamalov <ik@adguard.com >
Date: Wed Jul 14 15:06:30 2021 +0300
client: decreasing interval confirm, disabled stats message
2021-07-14 16:01:12 +03:00
Eugene Burkov
e113b276e7
Pull request: 2504 querylog interval
...
Merge in DNS/adguard-home from 2504-querylog-ivl to master
Updates #2504 .
Squashed commit of the following:
commit 5d15a6f735cd195fc81c8af909b56fbc7db1fe21
Merge: 8cd5c30d 97073d0d
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 18:45:10 2021 +0300
Merge branch 'master' into 2504-querylog-ivl
commit 8cd5c30de6f72d4b12162dbc9e3d90132795fe94
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 18:35:50 2021 +0300
client: fix fmt
commit e95d462c31d886bacec0735acc567fec7c962149
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 17:58:06 2021 +0300
home: imp code
commit 48737b249c52a997a4f34dac45fbaf699477b007
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 17:23:18 2021 +0300
home: imp duration
commit 44f5dc3d3ada5120d74caa24cace9a253b8f15d3
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 16:55:31 2021 +0300
home: imp code, docs
commit bb2826521b7e5d248ce2ab686528219c312b8ba2
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 16:11:40 2021 +0300
all: imp code, docs
commit d688aed1f340807a8bac8807c263956b0fc16f5b
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Thu Jul 1 13:49:42 2021 +0300
all: change querylog interval setting format
2021-07-01 18:50:28 +03:00
Ainar Garipov
232cd381ff
Pull request: client: add links to the query log from dashboard
...
Updates #3245 .
Squashed commit of the following:
commit 32ca6e12f34e78ab51501f27609ed21fd5a1d1e7
Merge: b5cd0bee 77c70193
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Tue Jun 29 17:06:50 2021 +0300
Merge branch 'master' into 3245-imp-dashboard
commit b5cd0beea03d39a65f97922e3cdbc6af3e19ffdc
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Jun 29 16:16:45 2021 +0300
client: remove links from labels
commit 3a3003aeed737819888a6974c878b88aa6abee38
Merge: 2dc1a5f8 90a85362
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Tue Jun 22 13:42:21 2021 +0300
Merge branch 'master' into 3245-imp-dashboard
commit 2dc1a5f8b936c771cb0c7c26a529c824d0e445a2
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Jun 11 19:24:12 2021 +0300
client: get response status from const
commit 1bb9dc2abd6e9f2263fca09fed4d393f1969446c
Merge: 137dcb05 12f1e4ed
Author: Ildar Kamalov <ik@adguard.com >
Date: Fri Jun 11 19:08:24 2021 +0300
Merge branch 'master' into 3245-imp-dashboard
commit 137dcb058e
Author: Mark Hicken <mhicken@adobe.com >
Date: Tue Jun 8 15:05:17 2021 -0600
Add links to all the dashboard things
2021-06-29 17:13:34 +03:00
Eugene Burkov
16e5e09c2e
Pull request: 3013 querylog idna
...
Merge in DNS/adguard-home from 3013-idna to master
Closes #3013 .
Squashed commit of the following:
commit 567d4c3beef3cf3ee995ad9d8c3aba6616c74c6c
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Tue Jun 29 13:11:10 2021 +0300
client: mv punycode label
commit 6585dcaece9f590d7f02afb5aa25953ab0c2555b
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Jun 29 12:32:40 2021 +0300
client: handle unicode name
commit c0f61bfbb9bdf919be7b07c112c4b7a52f3ad6a1
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Mon Jun 28 20:00:57 2021 +0300
all: imp log of changes
commit 41388abc8770ce164bcba327fcf0013133b5e6f7
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Mon Jun 28 19:52:23 2021 +0300
scripts: imp hooks
commit 9c4ba933fbd9340e1de061d4f451218238650c0f
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Mon Jun 28 19:47:27 2021 +0300
all: imp code, docs
commit 61bd6d6f926480cb8c2f9bd3cd2b61e1532f71cf
Author: Eugene Burkov <e.burkov@adguard.com >
Date: Mon Jun 28 16:09:25 2021 +0300
querylog: add ascii hostname, convert to unicode
2021-06-29 13:36:52 +03:00
Ainar Garipov
dbe8b92dfc
Pull request: all: make stats disableable, imp code
...
Updates #2141 .
Squashed commit of the following:
commit d8f3bcd9927b00a1d4b8b60b43144bc4b4469311
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Jun 17 19:10:53 2021 +0300
stats: imp docs, names
commit 97eae3c2da5585467ca024bdacdbf922bcc8b444
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Jun 17 18:51:49 2021 +0300
all: make stats disableable, imp code
2021-06-17 19:44:46 +03:00
Ainar Garipov
327e76cd65
Pull request: 2842 DHCP validation ui
...
Closes #2842 .
Squashed commit of the following:
commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8
Merge: a5d7187b ab85ad5a
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Tue Apr 13 15:29:06 2021 +0300
Merge branch 'master' into 2842-dhcp-validation-ui
commit a5d7187bba1ae3595bbc26a362ff27aae81a7048
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 13 15:08:28 2021 +0300
fix: revert deleted translation
commit 50169266111032f6de3bc159ba562ee9580532fb
Merge: 46adf2c0 48d702f7
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 13 14:39:40 2021 +0300
Merge branch 'master' into 2842-dhcp-validation-ui
commit 46adf2c05b6bedd55e60475eac060347db6572b7
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 13 14:13:12 2021 +0300
fix: no-bitwise
commit 1afc4030a5ea885545e51748976724959f87fb26
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 13 13:57:43 2021 +0300
fix: IPv4 in CIDR validation
commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 13 11:58:03 2021 +0300
fix: translations
commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 13 11:57:27 2021 +0300
fix: MAC validation
commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c
Merge: 48b50ce9 65553a29
Author: Ildar Kamalov <ik@adguard.com >
Date: Tue Apr 6 18:12:06 2021 +0300
Merge branch 'master' into 2842-dhcp-validation-ui
commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e
Author: Artem Baskal <a.baskal@adguard.com >
Date: Mon Apr 5 19:04:35 2021 +0300
Add leases ip validation
commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1
Author: Artem Baskal <a.baskal@adguard.com >
Date: Mon Apr 5 13:59:16 2021 +0300
Add helper for subnet to bitmap mask conversion, write test
commit 80dc7a8d19b27cecc50e2c610619574374f363d3
Author: Artem Baskal <a.baskal@adguard.com >
Date: Fri Apr 2 17:46:27 2021 +0300
2842 Update DHCP range validation in UI
2021-04-13 15:29:28 +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
70d4c70e75
Pull request: client: use relative links for mobileconfig api
...
Updates #2905 .
Squashed commit of the following:
commit af607433e07a43497930cdc1ef0012fa713e64da
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Apr 1 19:33:35 2021 +0300
client: use relative links for mobileconfig api
2021-04-02 12:33:16 +03:00
Ainar Garipov
44168292d5
Pull request: 2662 dnscrypt logs
...
Merge in DNS/adguard-home from 2662-dnscrypt-logs to master
Closes #2662 .
Squashed commit of the following:
commit 05f6742b5c73e1d150834965ae3a54ca06ef8e24
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Feb 11 12:58:08 2021 +0300
all: imp docs
commit ee0b8c574c1cb5302a5ffb62d2fec4126509b2e8
Merge: aaa8c6b8 e64df20e
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Feb 11 12:56:44 2021 +0300
Merge branch 'master' into 2662-dnscrypt-logs
commit aaa8c6b8085679f4acd234527bd03cb0b2520b4f
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Feb 11 12:38:49 2021 +0300
all: document changes
commit 57b6a4d8e95e87d928274d095dc2004f1591d940
Author: Ainar Garipov <A.Garipov@AdGuard.COM >
Date: Thu Feb 11 12:36:22 2021 +0300
all: fix dnscrypt in logs
2021-02-11 13:46:59 +03:00
Andrey Meshkov
cbceab0f65
Change category for WindowsSpyBlocker to general
2021-02-05 00:16:20 +03:00
Andrey Meshkov
245f197f95
Actualize vetted blocklists
2021-02-05 00:10:43 +03:00
Andrey Meshkov
8aec08727c
Added several blocked services
...
Closes #2224
Closes #2401
Squashed commit of the following:
commit 8d422091187d03273393775ddc691bdd2a6913f4
Merge: 7a8f598b fa33568f
Author: Andrey Meshkov <am@adguard.com >
Date: Thu Feb 4 17:57:32 2021 +0300
Merge branch 'master' into fix-2224
commit 7a8f598b19a877c19cb1537047c0ae14fa8a0064
Author: Andrey Meshkov <am@adguard.com >
Date: Thu Feb 4 17:34:53 2021 +0300
Review comments
commit 181db867fc56d89dd13a4d50a24922604eed4eae
Author: Andrey Meshkov <am@adguard.com >
Date: Thu Feb 4 17:20:20 2021 +0300
fixed review comments
commit fd5b0816d63952664c6e89a91494ca09dc4fc52d
Author: Ildar Kamalov <ik@adguard.com >
Date: Thu Feb 4 16:10:29 2021 +0300
+ client: add service icons
commit 724e0c26691488fdf7cd8215d200867ed3a86198
Author: Andrey Meshkov <am@adguard.com >
Date: Thu Feb 4 15:42:53 2021 +0300
Added several blocked services
Closes #2224
Closes #2401
2021-02-04 18:16:01 +03:00
Andrey Meshkov
676f8c7671
Remove 280blocker from Vetted list. Closes #2427
2021-02-04 14:52:55 +03:00
Ildar Kamalov
a83c3cf2ea
Merge: - client: fix server name validation
...
Closes #2617
Squashed commit of the following:
commit be7fa5a37ab86dd0855dbb456415642d70817cbb
Author: Ildar Kamalov <ik@adguard.com >
Date: Mon Feb 1 11:19:08 2021 +0300
- client: fix server name validation
2021-02-01 12:53:19 +03:00