Dimitry Kolyshev
e1995408e4
Pull request: 6263 custom ups cache
...
Updates #6263 .
Squashed commit of the following:
commit f6b704fb58
Merge: 780d001ce
5dd10d9fc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 24 09:55:04 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
commit 780d001cef
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Nov 24 09:53:46 2023 +0200
all: imp locales
commit 820bcf0e23
Merge: e7ca51563
1320043e9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Nov 23 11:16:54 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
# Conflicts:
# CHANGELOG.md
commit e7ca515630
Merge: 23392d08b
0f5e8ca56
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Nov 22 09:49:32 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
commit 23392d08b1
Merge: a09cd190c
feb15745d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Nov 22 09:49:10 2023 +0200
Merge remote-tracking branch 'origin/6263-custom-ups-cache' into 6263-custom-ups-cache
commit a09cd190c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Nov 22 09:48:43 2023 +0200
home: imp code
commit feb15745d2
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 21 17:27:38 2023 +0300
client: move cache fields to the upstream tab
commit 789060e4d4
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Nov 21 16:28:03 2023 +0300
client: add form fields
commit a700bfb42e
Merge: 7669419b5
db42254d7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Nov 21 11:44:14 2023 +0200
Merge remote-tracking branch 'origin/master' into 6263-custom-ups-cache
commit 7669419b59
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Nov 21 11:34:17 2023 +0200
home: imp code
commit 4a9dc1d6c1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 20 15:08:44 2023 +0200
docs: http client docs
commit 944e0d7a4b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 20 13:51:00 2023 +0200
home: http client dns cache
2023-11-24 15:20:32 +03:00
Dimitry Kolyshev
c8f1112d4e
Pull request home: fix client dns cache
...
Merge in DNS/adguard-home from custom-ups-cache-conf-fix to master
Squashed commit of the following:
commit 01a728e74b2e2e709c496794ca7ceb90703a02fc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Nov 20 11:48:01 2023 +0200
home: fix client dns cache
2023-11-20 15:28:08 +03:00
Stanislav Chzhen
905f9615a8
Pull request 1989: AG-24794-client-source
...
Squashed commit of the following:
commit 5cf83aafc8ddfea15b4f8e9b4061af021727f68c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Sep 1 14:58:03 2023 +0300
client: imp code
commit 4325c8f610d1329ad38c800e20275668f1690f51
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Sep 1 14:38:33 2023 +0300
all: add client source
2023-09-01 15:24:44 +03:00
Eugene Burkov
a325c9b6bb
Pull request 1978: 4923 gopacket dhcp vol.2
...
Merge in DNS/adguard-home from 4923-gopacket-dhcp-vol.2 to master
Updates #4923 .
Squashed commit of the following:
commit d0ef7d44af9790ed55401f6f65c7149f4c3658f7
Merge: f92b4c72d a4fdc3e8e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 30 13:43:41 2023 +0300
Merge branch 'master' into 4923-gopacket-dhcp-vol.2
commit f92b4c72de03ceacb9b8890b7cf4307688795ce5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Aug 28 12:33:29 2023 +0300
dhcpd: imp code
commit 63f0fce99a0343af2670943770cfef4694ae93ed
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 24 15:01:34 2023 +0300
all: imp dhcpd code
commit 563b43b4b5ab6c9c9046c7f09008ea3ef344f4e9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 28 17:03:55 2023 +0300
dhcpd: imp indexing
commit 340d3efa90ac4d34ba3d18702692de0fbc0247be
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Jul 28 16:22:43 2023 +0300
all: adapt current code
2023-08-30 14:02:12 +03:00
Stanislav Chzhen
aac36a2d2f
Pull request 1907: 951-blocked-services-schedule-api
...
Updates #951 .
Squashed commit of the following:
commit 6b840fd516f5a87fde0420e3aceb9c239b22c974
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Aug 29 19:53:03 2023 +0300
client: imp docs more
commit 7fc8f0363fbe4c4266cb0f67428fe4d18c351d2d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Aug 29 19:40:00 2023 +0300
client: imp docs
commit 00bc14d5760614f2797714cdc2c4c19b1a94b86e
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 18:43:49 2023 +0300
try to fix lock file
commit d749df74b576091e0b58928d86ea8b3b49f919da
Merge: c69f9230b e1f6229e5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Aug 28 18:14:02 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule-api
commit c69f9230b12f7c983db06b74324b3df77d74b32b
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 17:16:20 2023 +0300
revert eslintrc
commit b37916c2dff0ddea5293d87570bb58e3443d2d21
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 12:02:39 2023 +0300
fix translations
commit f5bb67d81506c687d0abd580049a3eee0af808e0
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 11:43:57 2023 +0300
fix helpers
commit 13ec6a8b3a0acfb62762ae7e46c6e98eb7c82212
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 11:24:57 2023 +0300
remove todo
commit 23724ec2fd683ed17b9f1cee841ad9aaf4c9d04f
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Aug 28 09:56:56 2023 +0300
add clients schedule form
commit 84d29e558a329068e64e7a95ee183946aa4515b5
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 25 17:44:40 2023 +0300
fix schedule form
commit 83e4017688082e9eb670091d5a24d98157050502
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:58:16 2023 +0300
remove unused
commit ef2b68e138da382e3cf42586ae604e12d9493504
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:57:37 2023 +0300
client: fix translation string
commit 32ea80c968f52f18adbc811b2f06874644cdfe20
Author: Ildar Kamalov <ik@adguard.com>
Date: Fri Aug 18 12:26:26 2023 +0300
wip schedule
commit 9b770873859186c9424c8d108812e32ddff33bad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 21 14:29:50 2023 +0300
all: imp naming
commit ea4e9514ea3b264bcce7f2a301db817de4e87059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jul 19 18:09:27 2023 +0300
all: imp code
commit 98a705bdaa5c1e79394c73e5d75af2416fe9f297
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jul 18 18:23:26 2023 +0300
all: imp naming
commit 4f84b55c7bfc9f7b680feac0ec45f5ea9189299a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 14 15:01:17 2023 +0300
all: add global schedule api
commit 87cf1646869ee9138964b47a27b7493674c8854a
Merge: cabb80ac1 2adc8624c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jul 14 12:09:29 2023 +0300
Merge branch 'master' into 951-blocked-services-schedule-api
commit cabb80ac16de437a8118bb0166479574379c97a3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 13:37:23 2023 +0300
openapi: fix typo
commit 2279b03acbcfc3d76216f8aaf30ae1c7894127bc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jul 13 12:26:19 2023 +0300
all: imp docs
... and 3 more commits
2023-08-29 20:03:40 +03:00
Stanislav Chzhen
1fd6cf1a2f
Pull request 1901: 5946-fix-blocked-services-client-schedule
...
Updates #5946 .
Squashed commit of the following:
commit cd6ba613fae56d05a2e51ae1a65e9fcf4a39899e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 30 11:27:52 2023 +0300
home: fix blocked services client schedule
2023-06-30 11:56:03 +03:00
Stanislav Chzhen
d88181343c
Pull request 1883: 951-blocked-services-client-schedule
...
Updates #951 .
Squashed commit of the following:
commit 94e4766932940a99c5265489bccb46d0ed6cec25
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 17:21:41 2023 +0300
chlog: upd docs
commit b4022c33860c258bf29650413f0c972b849a1758
Merge: cfa24ff01 e7e638443
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 16:33:20 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit cfa24ff0190b2bc12736700eeff815525fbaf5fe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 27 15:04:10 2023 +0300
chlog: imp docs
commit dad27590d5eefde82758d58fc06a20c139492db8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 26 17:38:08 2023 +0300
home: imp err msg
commit 7d9ba98c4477000fc2e0f06c3462fe9cd0c65293
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 26 16:58:00 2023 +0300
all: add tests
commit 8e952fc4e3b3d433b29efe47c88d6b7806e99ff8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 16:36:10 2023 +0300
schedule: add todo
commit 723573a98d5b930334a5fa125eb12593f4a2430d
Merge: 2151ab2a6 e54fc9b1e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 11:40:03 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit 2151ab2a627b9833ba6cce9621f72b29d326da75
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 23 11:37:49 2023 +0300
all: add tests
commit 81ab341db3e4053f09b181d8111c0da197bdac05
Merge: aa7ae41a8 66345e855
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 22 17:59:01 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit aa7ae41a868045fe24e390b25f15551fd8821529
Merge: 304389a48 06d465b0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 17:10:11 2023 +0300
Merge branch 'master' into 951-blocked-services-client-schedule
commit 304389a487f728e8ced293ea811a4e0026a37f0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 17:05:31 2023 +0300
home: imp err msg
commit 29cfc7ae2a0bbd5ec3205eae3f6f810519787f26
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 20:42:59 2023 +0300
all: imp err handling
commit 8543868eef6442fd30131d9567b66222999101e9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 18:21:50 2023 +0300
all: upd chlog
commit c5b614d45e5cf25c30c52343f48139fb34c77539
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 14:37:47 2023 +0300
all: add blocked services schedule
2023-06-27 18:03:07 +03:00
Stanislav Chzhen
06d465b0d1
Pull request 1858: AG-22594-imp-whois
...
Merge in DNS/adguard-home from AG-22594-imp-whois to master
Squashed commit of the following:
commit 093feed53291d02469fb1bd8d99472597ebd5015
Merge: 956d20dc4 ca313521d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 21 12:42:40 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit 956d20dc473dcec90895b6f618fc56e96e9ff833
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 18:30:48 2023 +0300
whois: imp code more
commit c771fd9c5e4d90e76d079a0d25ab097ab5652a42
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 15:05:45 2023 +0300
whois: imp code
commit 21900fd468e10d9aee22149a6312b8596ff39810
Merge: 8dbe132c0 371261b2c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 11:34:06 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit 8dbe132c08d3ad4a63b0d4bdb9d00a5bc25971f4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 20 11:33:26 2023 +0300
whois: imp code more
commit f5e761a260237579c67cbd48f01ea90499bff6b0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 19 16:04:35 2023 +0300
whois: imp code
commit 2780f7e16aacddad8736f83b77ef9bfa1271f8b1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 16 17:33:47 2023 +0300
all: imp code
commit 1fc67016068b745a46b3d0d341ab14f9f5bdc9aa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 16 17:29:19 2023 +0300
whois: imp tests
commit 204761870764fb10feea20065d79dee8c321e70b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 16 11:55:37 2023 +0300
all: upd deps
commit ded4f59498c5c544277b9c8e249567626547680e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 20:43:32 2023 +0300
all: imp tests
commit 0eed9834ff9dd94d0788ce69d0bb0521fa725410
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed Jun 14 19:31:49 2023 +0300
all: imp code
commit 9f867587c8ad87363b8c8b061ead536c1ec59c5d
Merge: 504e9484d 681c604c2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 14:20:44 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit 504e9484dd84ab9d7c84a3f8399993d6422d3b67
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Jun 13 14:18:06 2023 +0300
all: imp cache
commit c492abe41ace7ad76fcd4e297c22b910a90fec30
Merge: db36adb9c 826b314f1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 16:06:12 2023 +0300
Merge branch 'master' into AG-22594-imp-whois
commit db36adb9c14ce92b3971db0d87ec313d5bcd787e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 9 15:53:33 2023 +0300
all: add todo
commit 5cf192de9f93cd0d8521a3a6b4ded7f2bc5e0031
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 8 14:59:26 2023 +0300
all: imp docs
commit 021aa3eb5b9476a93b4af5fc90cc9ccf014ca152
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Jun 5 18:35:25 2023 +0300
all: imp naming
commit 4626c3a7fa3f2543501806c9fa1a19531547f394
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 17:41:00 2023 +0300
all: imp tests
commit 1afcc9605ca176e4c7f76a03a2c996cf7d6bde13
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Jun 2 12:44:32 2023 +0300
all: imp docs
commit cdd0544ff1a63faed5ced3dae6bfb3b783e45428
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Jun 1 17:21:37 2023 +0300
all: add docs
... and 2 more commits
2023-06-21 12:53:53 +03:00
Stanislav Chzhen
a7680a593a
Pull request 1855: fix-clients-races
...
Merge in DNS/adguard-home from fix-clients-races to master
Squashed commit of the following:
commit 2b29271b4c04b1c3046bd4cb3fb82f82fff0973b
Merge: 7f553feff cbc7985e7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 17:43:07 2023 +0300
Merge branch 'master' into fix-clients-races
commit 7f553feff3aa46ae124a984776b60ed625148a1f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 16:25:43 2023 +0300
home: imp docs more
commit aaf74666cf069fc6cdd5a5e64915fef5675e0382
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu May 25 13:57:42 2023 +0300
home: imp docs
commit 50085085da3ae07b58bcc471906725339eec353e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Wed May 24 15:41:52 2023 +0300
home: imp code more
commit 9dc001640ec4bef62b2ccaed307a9daeeb3a8d3a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 23 15:30:53 2023 +0300
home: imp code
commit fa906e78ec0777c8c585622873addd0f4791554e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue May 23 14:17:16 2023 +0300
home: fix clients races
2023-05-25 17:45:55 +03:00
Stanislav Chzhen
18acdf9b09
Pull request 1809: 4299-querylog-stats-clients-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-clients-api to master
Squashed commit of the following:
commit 066100a7869d7572c4ae65b3c7b1487ac50baf15
Merge: 95bc00c0 5da77514
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 14 13:57:30 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 95bc00c0b3d05b262ee0b90be9757e61cac0778c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:48:39 2023 +0300
all: fix typo
commit 4b868da48f0c976d204346e40ba948803be6397f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:42:52 2023 +0300
all: fix text label
commit 7a3ba5c7f688bd53cf761b5e8e614fbe251bd006
Merge: 315256e3 6c8d89a4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:34:59 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 315256e3f3861b5116962f7c47384b7c72e41813
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 11 19:07:18 2023 +0300
all: ignore search, unit
commit 28c6ffec9558e7c38d7bd12055eabddb8f5675c2
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 15:08:35 2023 +0300
Added 'Protection' and 'Query Log and statistics' sections to client settings. Added checkboxes to ignore client in (query log/statistics)
commit 2657bd2b820d8b2b3d71d23e4545c867b9ae6cdf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 17:28:59 2023 +0300
all: add todo
commit e151fcbc0c36d8e6a5c091fbf374bf0e35804699
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 15:15:46 2023 +0300
openapi: imp docs
commit 31875cbbd1bd09a73baa3636d0cc242b5ac35059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 13:02:31 2023 +0300
all: add querylog stats client ignore api
2023-04-14 15:25:04 +03:00
Ainar Garipov
61b4043775
Pull request 1803: 5685-fix-safe-search
...
Updates #5685 .
Squashed commit of the following:
commit 5312147abfa0914c896acbf1e88f8c8f1af90f2b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 6 14:09:44 2023 +0300
safesearch: imp tests, logs
commit 298b5d24ce292c5f83ebe33d1e92329e4b3c1acc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:36:16 2023 +0300
safesearch: fix filters, logging
commit 63d6ca5d694d45705473f2f0410e9e0b49cf7346
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:24:47 2023 +0300
all: dry; fix logs
commit fdbf2f364fd0484b47b3161bf6f4581856fdf47b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Apr 5 20:01:08 2023 +0300
all: fix safe search update
2023-04-06 14:12:50 +03:00
Dimitry Kolyshev
df61741f60
Pull request: 1163 safesearch http api vol.3
...
Merge in DNS/adguard-home from 1163-safesearch-1-3 to master
Squashed commit of the following:
commit f26c5fb4f7a27dc61b10c28d6672d5307796784c
Merge: e7a1b885 143616ca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 23 18:45:25 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
# Conflicts:
# CHANGELOG.md
commit e7a1b885d67628c187ce08327338cf3138012f03
Merge: 01b73d76 eb5d8a49
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:55:23 2023 +0200
Merge branch '1163-safesearch-1-3' of ssh://bit.adguard.com:7999/dns/adguard-home into 1163-safesearch-1-3
commit 01b73d763c6ee76de995093cc7107f113c7785ce
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Wed Mar 22 13:52:02 2023 +0200
client: add safe search extended settings to clients
commit eb5d8a499ac1036e5077d2b4aa84479381577e10
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 18:50:23 2023 +0700
all: docs
commit 2043a8fba7f664ef365ccc5abac14a85035eb4b7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:50 2023 +0700
all: docs
commit bb1d2f6c0252891ccac3d3727eb23288a24d4bda
Merge: 95f9fd3d c3edab43
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Mar 22 09:42:00 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 95f9fd3dd1e8abcdf1a156e81aff8e52f320f4c3
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date: Tue Mar 21 15:25:39 2023 +0200
client: move to new safe search api
commit ac823a911f0d6ab6f1813d11a0ca082d54cc9131
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:40:29 2023 +0700
all: docs
commit aaa287b125c7c7a775b821e0dd272199229a7538
Merge: 16fa7031 48431f8b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:14 2023 +0700
Merge remote-tracking branch 'origin/master' into 1163-safesearch-1-3
commit 16fa7031ab2aec31139ace54ffa0155cde8e9135
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 22:39:03 2023 +0700
all: docs
commit 498f7d3cbb842eda218b0fd06fc3bb3601b81f80
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:59:47 2023 +0700
filtering: imp code
commit aab7b70e2355ba86577e5156c1d5569b21b4b358
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Mar 20 18:40:18 2023 +0700
filtering: imp code
commit d2870a18ffdb1d293993487073912168d6b75a38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 21:57:58 2023 +0700
filtering: imp code
commit 868f5d1ed29c3af702114079e7ffe46e136eb901
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:06:36 2023 +0700
all: imp docs
commit f6d70b06ed873684501ce17f647ccf07a85dd50b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Mar 17 19:05:40 2023 +0700
filtering: imp code
commit 7cd9a37dde6262a8cf4f0f13f9946e011cc0e2cf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 14:56:51 2023 +0700
home: imp code
commit 84d8817512e47a517ed2880ffa9dde5ffda1d288
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Thu Mar 16 09:39:41 2023 +0700
all: safesearch http api
2023-03-23 15:25:58 +03:00
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
167b112511
Pull request: 5035-more-clients-netip-addr
...
Updates #5035 .
Squashed commit of the following:
commit 1934ea14299921760e9fcf6dd9053bd3155cb40e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 9 14:19:54 2022 +0300
all: move more client code to netip.Addr
2022-11-09 14:37:07 +03:00
Ainar Garipov
04c8e3b288
Pull request: 5035-netip-arp-hosts
...
Updates #5035 .
Squashed commit of the following:
commit d1c4493ee4e28d05670c20532ebae1aa809d18da
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 25 14:26:52 2022 +0300
aghnet: imp hosts rec equal
commit 0a7f40a64a819245fba20d3b481b0fc34e0c60e6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Oct 24 18:10:09 2022 +0300
aghnet: move arp and hosts to netip.Addr
2022-10-25 15:08:12 +03:00
Ainar Garipov
cebbb69a4c
Pull request: 5035-netip-maps-clients
...
Updates #5035 .
Squashed commit of the following:
commit c2d38fe75b8aa2f00b19892724984ed3bb843db5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Oct 24 16:50:14 2022 +0300
home: move clients to netip.Addr
2022-10-24 17:49:52 +03:00
Eugene Burkov
2de42284a5
Pull request: 5044 Close upstreams
...
Merge in DNS/adguard-home from 5044-close-upstreams to master
Closes #5044 .
Squashed commit of the following:
commit e121380ecb32bd2664d47f0968c68509156404c1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 15:54:17 2022 +0300
all: upd proxy again
commit ce7fa539a7430a1a197fd45e7988697010c684db
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 14:30:46 2022 +0300
home: imp docs, names
commit 851c5b8128149941cc469e6192ec9b4b1f92b0b5
Merge: b9ee5d63 d2a09e49
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 14:21:44 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit b9ee5d6348e696ff0b44dabee601469c545c8bd9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 14:20:15 2022 +0300
all: close upstreams more
commit eaca476319dc64e7986e26e67110005938cf1278
Merge: f924bc7a 8dba4ecd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 18:33:53 2022 +0300
Merge branch 'master' into 5044-close-upstreams
commit f924bc7a836001f8bb7463de2b5ddaf1be1a53c1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 18:23:54 2022 +0300
all: imp code, docs
commit 011fde16aa912fc78e3d6f60375cee73a0d88709
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 17:26:40 2022 +0300
all: upd dnsproxy
2022-10-19 16:13:05 +03:00
Ainar Garipov
756b14a61d
Pull request: HOFTIX-csrf
...
Merge in DNS/adguard-home from HOFTIX-csrf to master
Squashed commit of the following:
commit 75ab27bf6c52b80ab4e7347d7c254fa659eac244
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Sep 29 18:45:54 2022 +0300
all: imp cookie security; rm plain-text apis
2022-09-29 19:04:26 +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
9ed8699c75
Pull request: 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 14:36:18 +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
e08a64ebe4
Pull request: all: allow clientid in access settings
...
Updates #2624 .
Updates #3162 .
Squashed commit of the following:
commit 68860da717a23a0bfeba14b7fe10b5e4ad38726d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:41:33 2021 +0300
all: imp types, names
commit ebd4ec26636853d0d58c4e331e6a78feede20813
Merge: 239eb721 16e5e09c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:14:33 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 239eb7215abc47e99a0300a0f4cf56002689b1a9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 15:13:10 2021 +0300
all: fix client blocking check
commit e6bece3ea8367b3cbe3d90702a3368c870ad4f13
Merge: 9935f2a3 9d1656b5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 29 13:12:28 2021 +0300
Merge branch 'master' into 2624-clientid-access
commit 9935f2a30bcfae2b853f3ef610c0ab7a56a8f448
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jun 29 11:26:51 2021 +0300
client: show block button for client id
commit ed786a6a74a081cd89e9d67df3537a4fadd54831
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:56:23 2021 +0300
client: imp i18n
commit 4fed21c68473ad408960c08a7d87624cabce1911
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 15:34:09 2021 +0300
all: imp i18n, docs
commit 55e65c0d6b939560c53dcb834a4557eb3853d194
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 25 13:34:01 2021 +0300
all: fix cache, imp code, docs, tests
commit c1e5a83e76deb44b1f92729bb9ddfcc6a96ac4a8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jun 24 19:27:12 2021 +0300
all: allow clientid in access settings
2021-06-29 15:53:28 +03:00
Ainar Garipov
dab7b439d1
Pull request: all: imp docs, names
...
Merge in DNS/adguard-home from imp-text to master
Squashed commit of the following:
commit fa7d64014fb2ac379e1c137eaccc7aefca86419d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jun 11 17:09:00 2021 +0300
all: imp docs, names
2021-06-18 18:13:36 +03:00
Ainar Garipov
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
d83091fc1f
Pull request: all: allow local non-top-level domains
...
Updates #2961 .
Squashed commit of the following:
commit 207eeb85caf6caee81a669302daf4e10a5b61585
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 18:48:50 2021 +0300
all: allow local non-top-level domains
2021-04-15 19:00:31 +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
2638e271fe
Pull request: all: use http method constants
...
Merge in DNS/adguard-home from method-const to master
Squashed commit of the following:
commit ae6d6699a25ca04ba92aa53258d46e50233a9e00
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jan 29 22:03:59 2021 +0300
all: use http method constants
2021-02-04 14:15:34 +03:00
Ainar Garipov
eeeb03839a
Pull request: all: fix client id handling in querylog
...
Merge in DNS/adguard-home from 2607-querylog-client-id to master
Closes #2607 .
Squashed commit of the following:
commit 95367a82469af3b042489fb650b962b48cb73236
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jan 28 19:02:02 2021 +0300
all: fix client, imp docs
commit b652a7ef2373a75f7e897d29f5c9e36b0e076f8e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Jan 28 18:36:17 2021 +0300
all: fix client id handling in querylog
2021-01-28 19:39:33 +03:00
Ainar Garipov
fc9ddcf941
Pull request: all: client id support
...
Merge in DNS/adguard-home from 1383-client-id to master
Updates #1383 .
Squashed commit of the following:
commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:51:59 2021 +0300
- client: check if IP is valid
commit 0c330585a170ea149ee75e43dfa65211e057299c
Author: Ildar Kamalov <ik@adguard.com>
Date: Wed Jan 27 17:07:50 2021 +0300
- client: find clients by client_id
commit 71c9593ee35d996846f061e114b7867c3aa3c978
Merge: 9104f161 3e9edd9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 16:09:45 2021 +0300
Merge branch 'master' into 1383-client-id
commit 9104f1615d2d462606c52017df25a422df872cea
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 13:28:50 2021 +0300
dnsforward: imp tests
commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jan 27 12:39:52 2021 +0300
dnsforward: fix address
commit 98b222ba69a5d265f620c180c960d01c84a1fb3b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:50:31 2021 +0300
home: imp code
commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20
Merge: 199fdc05 c215b820
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:45:13 2021 +0300
Merge branch 'master' into 1383-client-id
commit 199fdc056f8a8be5500584f3aaee32865188aedc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 19:20:37 2021 +0300
all: imp tests, logging, etc
commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:55:19 2021 +0300
+ client: remove block button from clients with client_id
commit 32991a0b4c56583a02fb5e00bba95d96000bce20
Author: Ildar Kamalov <ik@adguard.com>
Date: Tue Jan 26 18:54:25 2021 +0300
+ client: add requests count for client_id
commit 2d68df4d2eac4a296d7469923e601dad4575c1a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 15:49:50 2021 +0300
stats: handle client ids
commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:45:25 2021 +0300
openapi: fix example
commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:37:10 2021 +0300
openapi: improve clients find api docs
commit f79876e550c424558b704bc316a4cd04f25db011
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 26 13:18:52 2021 +0300
home: accept ids in clients find
commit 5b72595122aa0bd64debadfd753ed8a0e0840629
Merge: 607e241f abf8f65f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:34:56 2021 +0300
Merge branch 'master' into 1383-client-id
commit 607e241f1c339dd6397218f70b8301e3de6a1ee0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 18:30:39 2021 +0300
dnsforward: fix quic
commit f046352fef93e46234c2bbe8ae316d21034260e5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Jan 25 16:53:09 2021 +0300
all: remove wildcard requirement
commit 3b679489bae82c54177372be453fe184d8f0bab6
Author: Andrey Meshkov <am@adguard.com>
Date: Mon Jan 25 16:02:28 2021 +0300
workDir now supports symlinks
commit 0647ab4f113de2223f6949df001f42ecab05c995
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:59:46 2021 +0300
- client: remove wildcard from domain validation
commit b1aec04a4ecadc9d65648ed6d284188fecce01c3
Author: Ildar Kamalov <ik@adguard.com>
Date: Mon Jan 25 14:55:39 2021 +0300
+ client: add form to download mobileconfig
... and 12 more commits
2021-01-27 18:32:13 +03:00
Eugene Burkov
ecd9ef47b0
Pull request: 2509 type-safety vol.3
...
Merge in DNS/adguard-home from 2509-type-safety-vol2-1 to master
Squashed commit of the following:
commit d58efb32396328247e1bb044f2b01145530cd84c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Jan 22 14:27:54 2021 +0300
home: imp JSON encoding
2021-01-22 15:00:45 +03:00
Eugene Burkov
7fab31beae
Pull request: 2508 ip conversion vol.2
...
Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master
Closes #2508 .
Squashed commit of the following:
commit 5b9d33f9cd352756831f63e34c4aea48674628c1
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 20 17:15:17 2021 +0300
util: replace net.IPNet with pointer
commit 680126de7d59464077f9edf1bbaa925dd3fcee19
Merge: d3ba6a6c 5a50efad
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 20 17:02:41 2021 +0300
Merge branch 'master' into 2508-ip-conversion-vol2
commit d3ba6a6cdd01c0aa736418fdb86ed40120169fe9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 19 18:29:54 2021 +0300
all: remove last conversion
commit 88b63f11a6c3f8705d7fa0c448c50dd646cc9214
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 19 14:12:45 2021 +0300
all: improve code quality
commit 71af60c70a0dbaf55e2221023d6d2e4993c9e9a7
Merge: 98af3784 9f75725d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 18 17:13:27 2021 +0300
Merge branch 'master' into 2508-ip-conversion-vol2
commit 98af3784ce44d0993d171653c13d6e83bb8d1e6a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 18 16:32:53 2021 +0300
all: log changes
commit e99595a172bae1e844019d344544be84ddd65e4e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 18 16:06:49 2021 +0300
all: fix or remove remaining net.IP <-> string conversions
commit 7fd0634ce945f7e4c9b856684c5199f8a84a543e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Jan 15 15:36:17 2021 +0300
all: remove redundant net.IP <-> string converions
commit 5df8af030421237d41b67ed659f83526cc258199
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jan 14 16:35:25 2021 +0300
stats: remove redundant net.IP <-> string conversion
commit fbe4e3fc015e6898063543a90c04401d76dbb18f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Jan 14 16:20:35 2021 +0300
querylog: remove redundant net.IP <-> string conversion
2021-01-20 17:27:53 +03:00
Ainar Garipov
679bbcdc26
Pull request: home: don't miss blocked clients in client search api
...
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master
Updates #2428 .
Squashed commit of the following:
commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Jan 15 16:32:53 2021 +0300
home: don't miss blocked clients in client search api
2021-01-15 20:30:48 +03:00
Ainar Garipov
9b963fc777
Pull request: all: fix lint and naming issues vol. 3
...
Merge in DNS/adguard-home from 2276-fix-lint-3 to master
Updates #2276 .
Squashed commit of the following:
commit 6ee94cc6ed2a9762b70ef395b58b496434244b80
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 15:55:45 2020 +0300
all: fix lint and naming issues vol. 3
2020-12-07 16:04:53 +03:00