mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-25 14:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
3904 commits 94 branches 201 tags 51 MiB
Commit graph

3904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ainar Garipov
76899cc31e Pull request 2044: 6301-upd-dnsproxy-quic-go 
Updates #6301.

Squashed commit of the following:

commit 1199ea26d5c1d1066070268a97a3c89ba0634515
Merge: 7218fdc9e f514f365a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 17 16:54:36 2023 +0300

    Merge branch 'master' into 6301-upd-dnsproxy-quic-go

commit 7218fdc9e17749746c6b981f56f24fd2169cef73
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 17 16:23:24 2023 +0300

    all: upd dnsproxy, quic-go
 2023-10-17 17:08:27 +03:00
Ildar Kamalov
f514f365ab Pull request: 6180 fix dashboard tables scroll 
Updates #6180

Squashed commit of the following:

commit eee7fa39d4e1d366086a541216a1b00051c3af8a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 17 11:47:41 2023 +0300

    fix scroll

commit 0a86a1a5c3d56902ad8de92a34b28d3e462a00c3
Merge: 07f4550ed 413f48481
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 17 10:27:29 2023 +0300

    Merge branch 'master' into ADG-7473-1

commit 07f4550ed0fbb400f4d99a3e9fd60acf8b9f2e2e
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 17:41:47 2023 +0300

    changelog

commit 28a1a7360344475b1d1d46b7d9ef14b292d82746
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:13:59 2023 +0300

    overflow

commit aa38288326bcfa374245416d270bd57bc217cabd
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:09:05 2023 +0300

    firefox scroll

commit ac98653f2daf57d23f877a3a3f0c8cb9d3b0f536
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:06:49 2023 +0300

    constants

commit a3cdd0acd454934af8c1999d87ecb736dbdca0b9
Merge: 0cd848115 506d71310
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:03:16 2023 +0300

    Merge branch 'master' into ADG-7473-1

commit 0cd8481150d6b3000bc8796bdff963c7a07a2e7d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 11:13:14 2023 +0300

    changelog

commit ed678070e7b1e6a144ebd7fefe99137a1529c025
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 11:00:23 2023 +0300

    fix rows

commit 5e4f35c874de15fc51a312e0ab2ba19018537194
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 10:58:58 2023 +0300

    ADG-7473 fix dashboard tables scroll
 2023-10-17 16:52:28 +03:00
Ildar Kamalov
413f484810 Pull request: 684 move block/unblock button to the tooltip menu 
Updates #684

Squashed commit of the following:

commit 2c5ac44d3edb55d0d3be169fb0bbfb336920964d
Merge: 0fce61dfa 733d6c1fc
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 16 10:08:58 2023 +0300

    Merge branch 'master' into ADG-7200

commit 0fce61dfad31951c3d5a484a14383c58964b47f0
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:38:13 2023 +0300

    fix dashboard clients table block/unblock button

commit ef5d72fd7cac81b70503c8813cf6e96952ec3b65
Merge: f49281b88 506d71310
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:16:21 2023 +0300

    Merge branch 'master' into ADG-7200

commit f49281b8818728ab298d769b8164919ea415d6c9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 11:25:05 2023 +0300

    fix disabled

commit 0031861174108214e9741852f6e00c5873c3b20f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 11:20:50 2023 +0300

    fix icon color

commit 2916937b0d6a0d126bd48e59f41a6fcbc4622ea1
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 11:15:55 2023 +0300

    changelog

commit 34493c974fb9304267e9149360c802d9364dd7de
Merge: d3267bbe9 d3fabdda4
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Oct 12 11:13:43 2023 +0300

    Merge branch 'master' into ADG-7200

commit d3267bbe9477d6db0783534cb4ab4f7afc4d63b0
Merge: 58a6c766f 6a3661562
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 11 16:46:39 2023 +0300

    Merge branch 'master' into ADG-7200

commit 58a6c766f3b783f0e2fdc36d40889042f3c74f2f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 11 16:46:13 2023 +0300

    ADG-7200 move block/unblock button to the tooltip menu
 2023-10-16 18:00:28 +03:00
Ildar Kamalov
733d6c1fca 6296 fix charts and custom retention labels 
Updates #6296

Squashed commit of the following:

commit e6a36f107b7bdd17fe4141b035fe5c1f6edd5c6c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 17:42:41 2023 +0300

    changelog

commit 96f11f2090d2aff600f6dcd6ca601e25cd857530
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 16:01:27 2023 +0300

    changelog

commit 136fb14f61dcb2bdec3bc9b8943a05544752a606
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 13 15:20:14 2023 +0300

    ADG-7598 fix charts and custom retention labels
 2023-10-16 10:06:37 +03:00
Ainar Garipov
506d71310c Pull request 2040: 6301-rollback-quic-go 
Updates #6301.

Squashed commit of the following:

commit e1a1b039323fa932d26039a157b0f959bafa6f2b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 12 21:41:14 2023 +0300

    all: rollback quic-go
 2023-10-12 21:50:01 +03:00
Stanislav Chzhen
bb652cd9a1 Pull request 2039: 6304-fix-ring-buffer 
Updates #6304.

Squashed commit of the following:

commit 7382630404cf18ff45e54234134c192161f5d94a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 12 19:37:01 2023 +0300

    all: upd chlog

commit ff9a82a6872f3bd93fe89956c5441429c189bce7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 12 19:27:35 2023 +0300

    querylog: fix ring buffer
 2023-10-12 19:48:12 +03:00
Ainar Garipov
d3fabdda40 Pull request 2037: upd-chlog-deps 
Squashed commit of the following:

commit 366718399f279c9217156fbc0adf323e5e6e8988
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 11 19:09:21 2023 +0300

    all: upd approx date

commit e6bf750b570f4af0eec8a7b6f54e8bd5c9c4e3a0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 11 19:03:20 2023 +0300

    all: upd chlog, deps
 2023-10-11 19:17:02 +03:00
Ainar Garipov
e218ddc35f Pull request 2036: 6180 revert 
Updates #6180.

Squashed commit of the following:

commit 38689bd26cad9b195cf01f5f1b09fbe075c6ff84
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 11 18:24:23 2023 +0300

    Revert "6180 fix dashboard empty tables scroll"

    This reverts commit 3ce3c41b59.
 2023-10-11 18:32:50 +03:00
Ainar Garipov
5fa11567aa Pull request 2035: upd-go 
Squashed commit of the following:

commit 336c11f1006e4dedfbf721eec394a905fd9baa60
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 11 17:00:24 2023 +0300

    all: upd go
 2023-10-11 17:14:54 +03:00
Ildar Kamalov
6a36615629 6206 get table page size from local storage 
Updates #6206

Squashed commit of the following:

commit 03089136a749fbda7da9be1af5997a24738eabb6
Merge: 7078c449c 3ce3c41b5
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 11 15:25:11 2023 +0300

    Merge branch 'master' into ADG-7558

commit 7078c449cb02039b47bdd085de12145b6982ea2c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:47:58 2023 +0300

    fix default page size

commit 64569487a916797bbb42246eb935f1388626590e
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:47:22 2023 +0300

    remove unused

commit 17614fa76b5aab617b807e226f743b9fd461c247
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:30:22 2023 +0300

    ADG-7473 get table page size from local storage
 2023-10-11 16:17:33 +03:00
Ildar Kamalov
3ce3c41b59 6180 fix dashboard empty tables scroll 
Updates #6180

Squashed commit of the following:

commit ad4188f6b019977977f9230b2518383c5f16ac47
Merge: 830250640 0fb6d6163
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 11 15:03:55 2023 +0300

    Merge branch 'master' into ADG-7473

commit 830250640ef456c7e64561e573c7763046870f32
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:43:02 2023 +0300

    Revert "ADG-7473 get table page size from local storage"

    This reverts commit b6bf48a2690e0ea93bac621e6ddb90b172a7c3eb.

commit 960f3a1814a437f5c5945e4cc0351a59268ada40
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:42:31 2023 +0300

    fix stats config page

commit b6bf48a2690e0ea93bac621e6ddb90b172a7c3eb
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 19:30:22 2023 +0300

    ADG-7473 get table page size from local storage

commit 7201d00a880e4efabea9c809ce980fa1bc628c5b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Oct 9 17:20:48 2023 +0300

    ADG-7473 fix dashboard tables scroll
 2023-10-11 15:24:26 +03:00
Eugene Burkov
0fb6d6163d Pull request 2030: 6156 upd proxy 
Merge in DNS/adguard-home from 6156-upd-proxy to master

Updates #6156.

Squashed commit of the following:

commit 8e765f781e05dbf68d1d1bc89369b3aa37cbbd4f
Merge: b18d0aed5 3ec76cdef
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Oct 9 15:51:22 2023 +0300

    Merge branch 'master' into 6156-upd-proxy

commit b18d0aed5f34cf7eba583b6622dab9bfeb210f8a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Oct 9 13:06:42 2023 +0300

    all: upd proxy
 2023-10-11 12:49:22 +03:00
Ainar Garipov
3ec76cdef5 Pull request 2031: upd-all 
Squashed commit of the following:

commit dc88ce95a75e4e230e2a1b34c89d714859e1934d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Oct 9 13:46:52 2023 +0300

    all: upd go, flts, i18n, svcs, trackers
 2023-10-09 14:03:27 +03:00
Stanislav Chzhen
24e0e33bb6 Pull request 2029: 6247-amd64-levels 
Updates #6247.

Squashed commit of the following:

commit 81bcde806688cb1d8991d1e6069c1a8d5c1ed21b
Merge: 5c60b76a6 8842b2df9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 9 13:17:27 2023 +0300

    Merge branch 'master' into 6247-amd64-levels

commit 5c60b76a6005dd4ef95969d1cde0c94ac24b8f66
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 19:20:46 2023 +0300

    scripts: upd docs

commit 2808203f1ad02adbe936ee6d5712a922b3c7840c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 17:55:43 2023 +0300

    all: add goamd64
 2023-10-09 13:24:52 +03:00
Stanislav Chzhen
8842b2df90 Pull request 2027: 6233-ipset-cached-entries 
Updates #6233.

Squashed commit of the following:

commit ef7692fb78a287a51a6b50c4ac0f1c33857a9ff0
Merge: b3ef5de41 8b6c260de
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 9 13:07:10 2023 +0300

    Merge branch 'master' into 6233-ipset-cached-entries

commit b3ef5de411d2ebb2f344430daf81e05a33ae4e78
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 9 13:06:23 2023 +0300

    all: fix typo

commit d42a970336d1d7e8a2f7c8459bf862762cdac8f6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 19:26:51 2023 +0300

    all: imp chlog

commit 818931a136c7b851820f8ff8e05ada5360da2090
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 18:30:52 2023 +0300

    all: upd chlog

commit af3dc60c038f04690882eca30a6f9c7d23f7c371
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 18:03:01 2023 +0300

    ipset: imp docs

commit 2c9d6c0c88ba2c2185b4d29212272ad5d48ae474
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 16:53:42 2023 +0300

    all: add tests

commit 0d41eaabf7a275c6a9eb4a1d64aa551d4d8de367
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 15:12:54 2023 +0300

    ipset: rm cache
 2023-10-09 13:15:51 +03:00
Ainar Garipov
8b6c260de8 Pull request 2028: upd-golibs 
Squashed commit of the following:

commit cdb77df24d1f62b2cf4b26a6e65342e6362d2091
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Oct 6 16:31:11 2023 +0300

    all: upd golibs
 2023-10-06 16:45:48 +03:00
Stanislav Chzhen
ef88f7462f Pull request 2024: 6233-imp-ipset 
Updates #6233.

Squashed commit of the following:

commit 308754d9cfc24005352bae6db420ad8a5ccde3eb
Merge: 8289df04f 5d7e59e37
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 6 13:04:13 2023 +0300

    Merge branch 'master' into 6233-imp-ipset

commit 8289df04f1827e28ea481e6880ceb72d4036dd4f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 5 19:53:53 2023 +0300

    ipset: imp naming

commit b24ddd547128db58dcba1a0bf153398db8d9b71c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 5 19:16:40 2023 +0300

    all: imp ipset
 2023-10-06 13:16:39 +03:00
Ainar Garipov
5d7e59e37a Pull request 2025: 6184-service-icons 
Closes #6184.

Squashed commit of the following:

commit 6189cdada082bd27effd0e994ed26d514a072e27
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Oct 6 12:39:59 2023 +0300

    filtering: upd svcs
 2023-10-06 12:59:50 +03:00
Ainar Garipov
e79981e8bb Pull request 2023: upd-node 
Squashed commit of the following:

commit 83b0aa9703a7fd023eeb82a4fdf43a5717a3d9cf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 17:42:38 2023 +0300

    all: upd node
 2023-10-05 17:52:01 +03:00
Oleg Morozov
fd13953eea Pull request 2013: ADG-7167 upd package.json 
Squashed commit of the following:

commit 4ebecadb164d8b0c03299aae7e7746f7f41cfcec
Merge: f60e62527 8bb80ba98
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 16:22:04 2023 +0300

    Merge branch 'master' into ADG-7167

commit f60e625278028d6e2a8a651019eafd9658b6b1ae
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 16:15:48 2023 +0300

    client: try fixing packages

commit 26aa0c668f5e9d0c355cdafa1da982f590335673
Author: Oleg Morozov <veryn1zee@gmail.com>
Date:   Thu Sep 14 16:47:06 2023 +0700

    Updated lock file

commit 789b74f96f84a86487bcf132bbc1655142735eac
Author: Oleg Morozov <veryn1zee@gmail.com>
Date:   Wed Sep 13 19:02:05 2023 +0700

    Updated lock file

commit dcf111d8a80c0b288f780ed64aa1e997d502c110
Author: Oleg Morozov <veryn1zee@gmail.com>
Date:   Wed Sep 13 18:54:35 2023 +0700

    Updated axios version

commit 3806f488aaa22acdb51531363b8b23fa5c296103
Author: Oleg Morozov <veryn1zee@gmail.com>
Date:   Wed Sep 13 18:40:55 2023 +0700

    Updated package.json node version and packages fixed versions
 2023-10-05 16:41:56 +03:00
Ainar Garipov
8bb80ba98f Pull request 2022: 6280-password-length 
Updates #6280.

Squashed commit of the following:

commit 85014e27da6f289a4ecdd8cbd05c0bee358da39e
Merge: 2d93201ce 5f61b550f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 15:58:48 2023 +0300

    Merge branch 'master' into 6280-password-length

commit 2d93201cea23517cdf3c2b3a4a4c26b7d89d2511
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 15:43:05 2023 +0300

    client: rm dep

commit 3b11d10af8200110fbb1a1d7a7e6e26715ee0436
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 15:22:58 2023 +0300

    client: imp i18n

commit f88dfc9a991c961b17a9add229a768a5cc127071
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 15:17:56 2023 +0300

    all: imp i18n, names

commit a7874f5f1a057a76e05a009ed5204bb1a3d70f50
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Oct 5 15:07:10 2023 +0300

    all: fix passwd check
 2023-10-05 16:20:28 +03:00
Eugene Burkov
5f61b550fa Pull request 2021: upd golibs 
Merge in DNS/adguard-home from upd-golibs to master

Squashed commit of the following:

commit 266b002c5450329761dee21d918c80d08e5d8ab9
Merge: 99eb7745d e305bd8e4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 5 14:21:51 2023 +0300

    Merge branch 'master' into upd-golibs

commit 99eb7745d0bee190399f9b16cb7151f34a591b54
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 5 14:14:28 2023 +0300

    home: imp alignment

commit 556cde56720ce449aec17b500825681fc8c084bf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 5 13:35:35 2023 +0300

    dnsforward: imp naming, docs

commit 1ee99655a3318263db1edbcb9e4eeb33bfe441c8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 5 13:28:39 2023 +0300

    home: make ports uint16

commit b228032ea1f5902ab9bac7b5d55d84aaf6354616
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Oct 4 18:56:59 2023 +0300

    all: rm system resolvers

commit 4b5becbed5890db80612e53861f000aaf4c869ff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Oct 4 17:30:16 2023 +0300

    all: upd golibs
 2023-10-05 15:26:19 +03:00
Stanislav Chzhen
e305bd8e40 Pull request 2019: 1700-update-static-lease 
Updates #1700.

Squashed commit of the following:

commit b3fdf0a492e38be594500b1db4da20bf70cd7096
Merge: 507cb9bc7 4479b32ad
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Oct 5 12:53:30 2023 +0300

    Merge branch 'master' into 1700-update-static-lease

commit 507cb9bc7bec9884ce7db2f42688d0a409015756
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Oct 4 18:54:06 2023 +0300

    all: upd chlog

commit 0736b97bdd652a3da13bce4177c64daa0a3da2af
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 4 16:05:35 2023 +0300

    client: fix update action

commit 351986bb03b1c525f00b1e7cd44a3dab8dd9eb97
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 4 16:01:38 2023 +0300

    client: update static lease

commit 3c328283c8374480132a9907e1738978c0b0384f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 28 20:06:29 2023 +0300

    dhcpd: fix err msg

commit 5b2f8f51b427ae07b227357fa3cc073a3278079b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 28 16:28:07 2023 +0300

    dhcpd: imp code

commit a9d24e816f602ad207e42124ddbb56ecdb0e03f6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Sep 27 17:43:04 2023 +0300

    all: add tests

commit 453785796191179ef4136b613f4dd8665703b364
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 26 20:14:17 2023 +0300

    dhcpd: update static lease
 2023-10-05 13:54:21 +03:00
Stanislav Chzhen
4479b32ad4 Pull request 2020: AG-26236-ring-buffer 
Squashed commit of the following:

commit 4b9cc9ddf52739fc5f918babedc99ac7ac0e2415
Merge: a6259ed57 39aeaf891
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 20:39:58 2023 +0300

    Merge branch 'master' into AG-26236-ring-buffer

commit a6259ed5758156e4110ee3ea6a49760d2880ade3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 20:30:20 2023 +0300

    querylog: imp code

commit 40f9f7cd5a1cff22bcb858020f2cfa9be8399671
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 20:11:49 2023 +0300

    querylog: fix typo

commit 1aabbadcb5fcbe6a95945c5bd1455b956b85a8d0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 20:05:22 2023 +0300

    querylog: imp err msg

commit 02913d35b43e190e42765823ccfcdd332839e984
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 19:37:47 2023 +0300

    aghalg: imp tests

commit 98a7909088d2a65b78afa9fa3113545c94429e65
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 19:23:10 2023 +0300

    all: imp tests

commit e147804eeafe89e5020cd917784eef3ff2b310d0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 18:49:49 2023 +0300

    all: imp code

commit 5f21f2f63b7bce89f2bc79c97c7350cd693c956b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 3 14:39:43 2023 +0300

    all: add tests

commit 35a45c7dc5d5961f6987da7c69249c56e54e97f5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Oct 2 17:43:09 2023 +0300

    all: imp code

commit 21e51fcbe411258eaf830825df9d05b7ddcc187a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 29 18:21:00 2023 +0300

    all: add ring buffer
 2023-10-03 20:50:43 +03:00
Eugene Burkov
39aeaf8910 Pull request 2014: 4923 gopacket dhcp vol.3 
Merge in DNS/adguard-home from 4923-gopacket-dhcp-vol.3 to master

Updates #4923.

Squashed commit of the following:

commit 1a09c436e5666a515084cd5e76cfccd67991ae5e
Merge: 95bcf0720 c3f141a0a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 28 19:38:57 2023 +0300

    Merge branch 'master' into 4923-gopacket-dhcp-vol.3

commit 95bcf07206434fd451632e819926871ba8c14f08
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 28 13:19:42 2023 +0300

    dhcpsvc: fix interface to match legacy version

commit 5da513ce177319f19698c5a8e1d10affaaf5e85c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 28 12:32:21 2023 +0300

    dhcpsvc: make it build on 32bit

commit 37a935514b1cebdc817cdcd5ec3562baeafbc42d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Sep 27 19:39:35 2023 +0300

    dhcpd: fix v6 as well

commit 03b5454b04c4fdb3fe928d661562883dc3e09d81
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Sep 27 19:34:17 2023 +0300

    dhcpsvc: imp code, docs

commit 91a0e451f78fba64578cc541f7ba66579c31d388
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 22 15:25:58 2023 +0300

    dhcpsvc: imp filing

commit 57c91e1194caa00a69e62b6655b1b4e38b69b89f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 22 15:23:02 2023 +0300

    dhcpsvc: imp code

commit d86be56efbfc121c9fe2c5ecef992b4523e04d57
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 14 12:24:39 2023 +0300

    dhcpsvc: imp code, docs

commit c9ef29057e9e378779d1a7938ad13b6eebda8f50
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Sep 13 17:53:55 2023 +0300

    dhcpsvc: add constructor, validations, tests

commit f2533ed64e4ef439603b9cdf9596f8b0c4a87cf1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 12 23:05:42 2023 +0500

    WIP
 2023-10-02 13:21:16 +03:00
Eugene Burkov
c3f141a0a8 Pull request 2018: 6231 filter local addrs 
Merge in DNS/adguard-home from 6231-filter-local-addrs to master

Updates #6231.

Squashed commit of the following:

commit 9a60d4e33f25c7dd7eaa4366d8397389196156ac
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 28 18:59:51 2023 +0300

    dnsforward: imp code

commit f0c3452525c227b0ee6e761c4a6b68543900d5b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Sep 27 18:12:47 2023 +0300

    all: don't match nets

commit 572dc0f24e74560adaa4d89ddc921dfd7e1fed02
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Sep 27 13:37:48 2023 +0300

    dnsforward: move some code, rm dups

commit 3af627ce9c7f6f4d2aa695a7660b8a0027fa241c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Sep 25 19:21:05 2023 +0300

    dnsforward: imp naming

commit cad1e4e71662836d1dfc79bc2979599b7a29fea1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Sep 25 19:17:53 2023 +0300

    dnsforward: imp code

commit 23d69700789d5652bd25cc089f16afb8b38e51f8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Sep 25 19:08:48 2023 +0300

    dnsforward: add upstream matcher

commit 5819c594a2a8d8bf2cd42883133e21ca7ed2681a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 22 18:31:37 2023 +0300

    all: imp code, docs

commit d07ea96bb568161e029e22d69329a368d9eeb729
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 22 18:09:09 2023 +0300

    all: imp code

commit 38a912a62c63247c4c5bb61b67ccc9bfd255feff
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Sep 22 15:48:25 2023 +0300

    all: imp code

commit 811212fa16bc231a8da990c075d7231c471c7e3b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 21 19:05:07 2023 +0300

    all: imp addrs detection
 2023-09-28 19:11:11 +03:00
Stanislav Chzhen
93ab0fde23 Pull request 2015: AG-23168-imp-updater-tests 
Squashed commit of the following:

commit 402ac873839fcf4dfb762872497b740bd55b2dcc
Merge: 209e1b171 af38476ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 21 16:46:47 2023 +0300

    Merge branch 'master' into AG-23168-imp-updater-tests

commit 209e1b171cb4c55d177ef5a4198cf24c2bc41195
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 21 14:09:43 2023 +0300

    updater: fix windows build

commit d112ca53540e0c999fe126442e8c526ff7e33bf5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Sep 20 18:57:54 2023 +0300

    all: imp tests, docs

commit f940724f81a90af6c07de523c8fcce66240dbec9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Sep 20 16:07:48 2023 +0300

    all: imp tests

commit 8915818e81360a7f6ff5b652a983ca034ad6d0c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 19 19:33:20 2023 +0300

    all: add test

commit c1cb8df2b056cefc5d7f1b32c089cd0ede0af9d2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 14 19:12:47 2023 +0300

    updater: imp tests
 2023-09-21 17:07:57 +03:00
Eugene Burkov
af38476efa Pull request 2017: 6226 legacy rewrite sort 
Merge in DNS/adguard-home from 6226-legacy-rewrite-sort to master

Updates #6226.

Squashed commit of the following:

commit e47e8c9088d42dcf636101db94bff82b3b03fd2e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 19 17:16:43 2023 +0300

    all: imp log of changes

commit e551a745df2dc95b82ef562d6ff677217f3b88a0
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 19 16:29:46 2023 +0300

    all: fix alphabetical order

commit 2ce10c7346e2e4fc61b973f48ab0b80bbc95e2a5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 19 16:28:08 2023 +0300

    all: log changes

commit 545dd7039b6440e87b08f8d0c0982e0421a566f7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 19 16:25:13 2023 +0300

    filtering: fix sort
 2023-09-19 17:58:37 +03:00
Stanislav Chzhen
5c20bf7cd4 Pull request 2016: 6217-warning-validation 
Squashed commit of the following:

commit 50c3b548511f1815a80977f55d96120c275d3cd1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 15 16:49:42 2023 +0300

    client: fix warning validation
 2023-09-15 17:48:21 +03:00
Stanislav Chzhen
a59fca2da3 Pull request 2009: 4569-blocked-response-ttl 
Updates #4569.

Squashed commit of the following:

commit cc5842fd9d19e6d8bc19f9f88a587c2dd102828d
Merge: 2e1e59e1b 5c6b3ace4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Sep 13 13:41:59 2023 +0300

    Merge branch 'master' into 4569-blocked-response-ttl

commit 2e1e59e1b787d461819d01a99ceb70d21e882dc1
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Sep 12 20:28:34 2023 +0300

    client: fix input length

commit 05bfa8cff7bff020a5b655779513612bc353267f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 12 12:16:35 2023 +0300

    openapi: bump version

commit f4f36111265aea8927b9a5154d74954ba05e5f10
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 19:36:38 2023 +0300

    all: upg chlog

commit 09c1e6d75ee7a95a5286aed526521a0206026986
Merge: ff3e2dc9f fb332dfc2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 19:35:30 2023 +0300

    Merge branch 'master' into 4569-blocked-response-ttl

commit ff3e2dc9f1ed1aacf023821160c6973ee98506b7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 19:34:59 2023 +0300

    client: add blocked response ttl

commit 31064d160e361f9e88f545fa42d8eb824ecc5c86
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 15:58:06 2023 +0300

    all: add blocked response ttl
 2023-09-13 13:58:12 +03:00
Stanislav Chzhen
5c6b3ace4a Pull request 2012: 6158-fix-context-filters 
Updates #6158.

Squashed commit of the following:

commit 7d1661c5d7824cd8cd988f8b1d2b1a600aad00ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 12 17:26:43 2023 +0300

    home: fix context filters
 2023-09-12 17:46:14 +03:00
Ainar Garipov
fb332dfc2a Pull request 2011: upd-chlog 
Squashed commit of the following:

commit 7df4e845a5766a3ba221aa198cf937c7a9929899
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Sep 11 18:27:31 2023 +0300

    all: upd chlog, deps
 2023-09-11 18:40:51 +03:00
Ainar Garipov
15e229620b Pull request 2010: upd-i18n 
Squashed commit of the following:

commit 6d842069f67a37688375a5d52e8a3b3a20f73717
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Sep 11 17:27:05 2023 +0300

    client: upd i18n
 2023-09-11 17:39:35 +03:00
Stanislav Chzhen
d18219395a Pull request 2004: 6176-conf-check-output 
Squashed commit of the following:

commit bc2c99c77ef4899872d7cc628fdfd04a2190dd89
Merge: d2bd0c95a 2bb04094e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 16:36:47 2023 +0300

    Merge branch 'master' into 6176-conf-check-output

commit d2bd0c95a79567eebfada170cfcca8bdafad03cd
Merge: d2bb7b1a6 8b8ae8ffa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 14:10:09 2023 +0300

    Merge branch 'master' into 6176-conf-check-output

commit d2bb7b1a6e7812402ff5fbf2e4d2abf3f0effb54
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 11 14:05:03 2023 +0300

    all: imp code

commit 160aa94b59e4dfd00cb1b09eb8d99d9eaf8d0892
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 8 13:30:39 2023 +0300

    all: add conf check output
 2023-09-11 16:42:41 +03:00
Ainar Garipov
2bb04094e1 Pull request 2008: 6198-fix-chlog 
Closes #6198.

Squashed commit of the following:

commit 165cffb06b080c9ed27a14686d35284742c83958
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Sep 11 14:19:04 2023 +0300

    all: fix chlog
 2023-09-11 14:34:42 +03:00
Ainar Garipov
8b8ae8ffad Pull request 2007: 6183-orig-resp 
Closes #6183.

Squashed commit of the following:

commit a99b935d7a152f2cf2d003057cfb8e3c7c3579c5
Merge: 3534f663f 36517fc21
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Sep 8 17:46:51 2023 +0300

    Merge branch 'master' into 6183-orig-resp

commit 3534f663ff4aaacc4a1044b018802bd23cd8f7ec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Sep 8 17:00:54 2023 +0300

    dnsforward: fix orig resp
 2023-09-08 17:55:13 +03:00
Stanislav Chzhen
36517fc21b Pull request 2006: 6182-fix-fallback-dns 
Updates #6182.

Squashed commit of the following:

commit 7467bf851932a878af0eda01c140056a4261b597
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 8 17:29:44 2023 +0300

    dnsforward: imp test

commit b807123d6030012bf9e9a4a0e454983a2e012a96
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 8 17:22:49 2023 +0300

    dnsforward: add test

commit 698fc69e441e9f1e0e4c2878c81309967c058cab
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 8 16:50:39 2023 +0300

    dnsforward: fix more

commit 444ae2870cd78ef736df744d80438b4dae5133ce
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 8 16:32:49 2023 +0300

    all: upd chlog

commit 114ff58c7010528249f27bdc0b2f9bcc537f74c1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 8 15:59:13 2023 +0300

    dnsforward: fix fallback dns
 2023-09-08 17:37:28 +03:00
Ainar Garipov
5f696da9dc Pull request 2005: 6181-safebrowsing-default 
Updates #6181.

Squashed commit of the following:

commit 3c4d0fe0750823c81548c2e81988ec27c718028f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Sep 8 14:23:13 2023 +0300

    home: fix default safe browsing, parental
 2023-09-08 15:04:25 +03:00
Ildar Kamalov
62da8f4974 Pull request: merge schedule 
Updates #6177

Squashed commit of the following:

commit 2f8e4164d40af338d9e4664d5c9ea0aab7113e26
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Sep 8 10:09:32 2023 +0300

    client: merge schedule
 2023-09-08 13:23:00 +03:00
Ainar Garipov
acf539b11d Pull request 2002: fix-typo 
Squashed commit of the following:

commit 29c749d1773dc7d14a2696b3dea8cf4fec2ed9fc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Sep 7 20:06:42 2023 +0300

    all: fix some typos
 2023-09-07 20:37:24 +03:00
Ainar Garipov
854c89cd4d Pull request 2001: upd-chlog 
Squashed commit of the following:

commit 3120305b22a612e187b83c1bf115b2c675cd50ee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Sep 7 18:46:05 2023 +0300

    all: fix go.mod

commit bc18a634caa5f25dc98bc0cb4f49b59fc43adeb8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Sep 7 18:38:02 2023 +0300

    all: upd chlog, deps
 2023-09-07 18:58:55 +03:00
Eugene Burkov
cb0063156b Pull request 2000: fix windows tests 
Merge in DNS/adguard-home from fix-windows-migr-test to master

Squashed commit of the following:

commit be0550f0d6b99f2f18a2bdc9b8e330600c224ea4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Sep 7 17:42:12 2023 +0300

    confmigrate: fix windows tests
 2023-09-07 17:55:10 +03:00
Stanislav Chzhen
3b846bae6e Pull request 1998: upd-proj-skel 
Squashed commit of the following:

commit 5cc2914b18fd71ff83e2872ef6755f2ff56d653c
Merge: bf14a513e 085b4fdce
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 7 14:58:44 2023 +0300

    Merge branch 'master' into upd-proj-skel

commit bf14a513eb46ebf2c2809246603b071e6c334e9f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 7 14:47:10 2023 +0300

    all: imp code

commit ec3f7a88b86b3f423193aa95c2e820bcd86fdef3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 7 14:28:39 2023 +0300

    scripts: upd go lint

commit 6a9342f6058bc21252f97045f7015440f013cb09
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Sep 7 14:13:17 2023 +0300

    all: upd proj skel
 2023-09-07 15:05:21 +03:00
Ainar Garipov
085b4fdcea Pull request 1999: upd-all 
Squashed commit of the following:

commit 1488f831eb8d3fbf15cf66f413ff1ca9b926624a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Sep 7 14:44:50 2023 +0300

    all: upd i18n, svcs, trackers
 2023-09-07 14:57:28 +03:00
Ainar Garipov
0b3920df62 Pull request 1997: upd-go 
Squashed commit of the following:

commit 7e558500d08328b4dca4ef67160334f27c8c48d6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Sep 7 13:54:50 2023 +0300

    all: upd go, tools
 2023-09-07 14:10:35 +03:00
Ainar Garipov
93d7be1604 Pull request 1996: fix-typo 
Squashed commit of the following:

commit 992ad5752cd529c915e28600ef34511d3c941fee
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Sep 6 15:54:58 2023 +0300

    all: fix some typos
 2023-09-06 19:42:34 +03:00
Eugene Burkov
30c6676dc0 Pull request 1995: AG-25392 confmigrate vol.3 
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master

Squashed commit of the following:

commit 925b35b9fedcdcf18474785530189a1eb504e1d6
Merge: 232f18481 581891af2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Sep 6 12:48:05 2023 +0300

    Merge branch 'master' into AG-25392-confmigrate-vol.3

commit 232f18481bbf3400da0b95bcec7949fb3868bf85
Merge: c0d880bed 5bd452516
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 5 18:54:47 2023 +0300

    Merge branch 'master' into AG-25392-confmigrate-vol.3

commit c0d880bed6e3270e88f5377e66b787565e1249ce
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 5 17:21:57 2023 +0300

    confmigrate: fix v15

commit 8a27148b708e6d6a61f8097bf7792aefa1055772
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Sep 5 15:47:18 2023 +0300

    confmigrate: imp gocognit, overall
 2023-09-06 13:43:29 +03:00
Stanislav Chzhen
581891af22 Pull request 1992: 3701-fallback-dns-check 
Squashed commit of the following:

commit a5191def0b950cb7ab1ea737e9c8c6e8b65ec720
Merge: 7d127bfca 5bd452516
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Sep 6 12:21:08 2023 +0300

    Merge branch 'master' into 3701-fallback-dns-check

commit 7d127bfca54ac940c611681e6f48b89881491602
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Sep 5 13:21:35 2023 +0300

    client: add fallback_dns to the upstream test

commit 970da7215503b5f05c53fcad47c715a96d9fc3c4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Sep 4 19:23:35 2023 +0300

    all: add fallback dns check
 2023-09-06 12:29:45 +03:00
Ainar Garipov
5bd4525161 Pull request 1994: try-fix-workflow 
Squashed commit of the following:

commit 5def2019df7432a86cec1dfe9dd1008faea7a67e
Merge: ab8ddec77 42291cd54
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 5 18:40:26 2023 +0300

    Merge branch 'master' into try-fix-workflow

commit ab8ddec7705764cf0ee249da2e6b93b0a0bd0993
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Sep 5 14:36:59 2023 +0300

    .github: try fixing lint flow
 2023-09-05 18:47:22 +03:00
Stanislav Chzhen
42291cd547 Pull request 1983: 5720-wildcard-ignored-domains 
Updates #5720.

Squashed commit of the following:

commit e8093c990f15e2efc496f1a04f87360825e34e96
Merge: df5413eef 28fefaff1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 5 15:06:33 2023 +0300

    Merge branch 'master' into 5720-wildcard-ignored-domains

commit df5413eefeac2c7e34eb725db9e2908b5b2d08cb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 5 14:49:05 2023 +0300

    confmigrate: imp docs

commit 1644d99b730cc7f22c9d75b8e990149d3ce5b32a
Merge: 9542ee161 1e4517898
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 5 14:23:42 2023 +0300

    Merge branch 'master' into 5720-wildcard-ignored-domains

commit 9542ee1616c1dd4bdb6ec9a2af79a2af3858a7e3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Sep 5 12:48:48 2023 +0300

    all: upd chlog

commit 183f84a7f73c7bd33669bd108076f60514ca101e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Sep 1 17:11:31 2023 +0300

    all: imp chlog

commit a704325352a577a9b6652f011b82180ec3a6e095
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Aug 31 18:59:52 2023 +0300

    all: imp code

commit fe99c3b883500850399b1feb72c914ab878b3107
Merge: 7f11e9460 0182b9ec1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Aug 31 18:43:09 2023 +0300

    Merge branch 'master' into 5720-wildcard-ignored-domains

commit 7f11e94609027ed821a125d27a1ffde03f37334a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Aug 30 19:57:51 2023 +0300

    aghnet: add tests

commit f10f9190ce1064a5d03155e8b6bba61db977897b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Aug 30 18:32:07 2023 +0300

    all: add conf migration

commit a53c14df129765366966c5230dd53aa29bdd25c5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Aug 30 13:37:30 2023 +0300

    all: add ignore engine
 2023-09-05 15:13:35 +03:00