Commit Graph

4073 Commits

Author SHA1 Message Date
Hoàng Rio da2cf75480
Merge branch 'AdguardTeam:master' into fix/blank-settings-when-access-clients-first 2024-02-28 20:55:00 +07:00
Eugene Burkov 499dcaa115 Pull request 2154: 6723 caching bootstrap
Updates #6723.

Squashed commit of the following:

commit 594286c7b9cddd73e4360fb731d04172ba1edef0
Merge: 17411a7f9 31c3d7d30
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 28 14:01:06 2024 +0300

    Merge branch 'master' into 6723-caching-bootstrap

commit 17411a7f9163857ad16f60c961d13d1383407cbb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 26 20:51:01 2024 +0300

    all: up[d finally

commit f47491c872af1f731132558ac655a34387880a9d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 21 14:25:49 2024 +0300

    all: log changes

commit a04fc78f10f3b7790a620ce139377338f7ac92ea
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 20 16:30:08 2024 +0300

    all: upd proxy
2024-02-28 14:10:03 +03:00
Stanislav Chzhen 31c3d7d302 Pull request 2155: AG-27492-client-persistent-index
Squashed commit of the following:

commit 1f99640f9f0a24ade7d2325737edf83ad0da3895
Merge: 5a9211e8c 9276afd79
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 27 13:13:03 2024 +0300

    Merge branch 'master' into AG-27492-client-persistent-index

commit 5a9211e8c7832700ae4f58cea25ad38ccba98efa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 22 19:08:35 2024 +0300

    all: add todo

commit a4fc94904b0b05ed5ca5ba270125a7d7fb1e6817
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 21 14:48:33 2024 +0300

    all: client persistent index
2024-02-27 13:48:11 +03:00
Hoàng Rio 560758b812
Fix blank settings page when access clients first 2024-02-26 09:08:27 +07:00
Ainar Garipov 9276afd79d Pull request 2156: 6717-conf-path-logs
Updates #6717.

Squashed commit of the following:

commit 05a7e18923e987ea9bd6294fe675a22cf86f6dce
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Feb 21 16:44:00 2024 +0300

    home: imp docs, logs
2024-02-21 17:01:15 +03:00
Stanislav Chzhen 4605e7c90e Pull request 2153: 6610-hostsfile-enabled
Updates #6610.

Squashed commit of the following:

commit 13522f0768fe0a4f6abe3fc82ffb7ddf3f4df9bf
Merge: befa3bd1d 6fd0a624c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 21 12:53:08 2024 +0300

    Merge branch 'master' into 6610-hostsfile-enabled

commit befa3bd1dedcd2853ef299c06d5c14c9ed7f2c84
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Feb 19 15:56:20 2024 +0300

    all: upd chlog

commit c1954306fe7c4d7af164f599b298374ab983216f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 15 20:52:52 2024 +0300

    home: hostsfile enabled
2024-02-21 13:04:58 +03:00
Eugene Burkov 6fd0a624ca Pull request 2152: 4923 gopacket DHCP vol.7
Updates #4923.

Squashed commit of the following:

commit 0f90eb3596fcbca0d87cb4eb857d45aea26f3854
Merge: 38b3165b6 bd99e3e09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 19 20:11:38 2024 +0300

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

commit 38b3165b696c9a3f69484d8e4c2c847340ed9363
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 19 14:52:01 2024 +0300

    dhcpsvc: imp docs

commit 0a078920a20de9fb2d864c90d2311800c6f3bc3f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 19 14:48:19 2024 +0300

    dhcpsvc: imp code

commit 30691f0d989c48b2f0dff8079952615dbfbdaea1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Feb 15 19:57:41 2024 +0300

    dhcpsvc: imp code, dry

commit 20f5ef80fb2d1cad869883da3684a01e5b8b3315
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Feb 15 15:57:09 2024 +0300

    dhcpsvc: finish leases methods
2024-02-20 14:52:38 +03:00
Eugene Burkov bd99e3e09d Pull request 2150: AG-28455 rc versions
Squashed commit of the following:

commit 9b80bf2da8676c7a80982b88b547b35760afd4dd
Merge: 2c184158c fede29794
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 16 15:49:23 2024 +0300

    Merge branch 'master' into AG-28455-rc-versions

commit 2c184158c052dc1ddc57f4bdf53ad31a50410659
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 14 13:01:30 2024 +0300

    scripts: imp code

commit f0965058ad2231b342cf406a8434d76cc3f546c2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 13 14:52:10 2024 +0300

    scripts: imp code

commit a5bed23c7077ea3655ae88528c1dfc5ea9d061a7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 12 18:35:52 2024 +0300

    scripts: fix typo

commit 36e9ea1ac3403a53452fcc16d35d32ec7663fd1e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 12 15:41:57 2024 +0300

    scripts: revert changes, imp docs

commit d74c85d4ec77b12ceaae28db5a8e7961896d688a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 5 18:12:38 2024 +0300

    all: mark rc versions separately
2024-02-16 19:19:00 +03:00
Stanislav Chzhen fede297942 Pull request 2138: AG-27492-client-persistent-storage
Squashed commit of the following:

commit 37e33ec761cfa30164125af2c5bb40789412355e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 14 15:25:25 2024 +0300

    aghalg: imp code

commit 6b2f09a44298b474ec1bdf3d027fb4941d2f7bea
Merge: b8ea924aa 37736289e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 14 15:04:59 2024 +0300

    Merge branch 'master' into AG-27492-client-persistent-storage

commit b8ea924aa7ed4c052760a6068f945d83d184e7e3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 13 19:07:52 2024 +0300

    home: imp tests

commit aa6fec03b1a1ead96bc76919b7ad51ae19626633
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 13 14:54:28 2024 +0300

    home: imp docs

commit 10637fdec47d0b035cf5c7949ddcd9ec564851a3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 8 20:16:11 2024 +0300

    all: imp code

commit b45c7d868ddb1be73e119b3260e2a866d57baa91
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 7 19:15:11 2024 +0300

    aghalg: add tests

commit 7abe33dbaa7221ddbc8b7d802dbfa7f951d90cf8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Feb 6 20:50:22 2024 +0300

    all: imp code, tests

commit 4a44e993c9bd393d2cb9853108eae1ad91e64402
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 1 14:59:11 2024 +0300

    all: persistent client index

commit 66b16e216e03e9f3d5e69496a89b18a9d732b564
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 31 15:06:05 2024 +0300

    aghalg: ordered map
2024-02-15 14:08:05 +03:00
Ainar Garipov 37736289e2 Pull request 2151: upd-all
Squashed commit of the following:

commit 3115356ba147778afdda27fa69d1d49287e26ea7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 13 18:14:18 2024 +0300

    all: upd deps, flts, i18n, svcs, tools
2024-02-13 18:30:14 +03:00
Eugene Burkov 2a546aa609 Pull request 2149: 6711 watch hosts
Updates #6711.

Squashed commit of the following:

commit 3ddfe809f76325c2d4cda0715a7bcc15e76a2388
Merge: 185957cd0 d338451fa
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 13 13:01:30 2024 +0300

    Merge branch 'master' into 6711-watch-hosts

commit 185957cd01516e5955e388108615e6f131d6ad71
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 9 18:11:41 2024 +0300

    aghos: imp docs

commit 3afbbcbb7ab6cc60c7c40ef8acd5b3ddf52cb3d1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 9 15:40:02 2024 +0300

    all: upd golibs, imp fswatcher
2024-02-13 13:19:22 +03:00
Stanislav Chzhen d338451faf Pull request 2145: 5992-stats-qlog-custom-dir
Updates #5992.

Squashed commit of the following:

commit 39d3df705ef68672ec9406d81e00daf52a3b3c70
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Feb 12 15:25:22 2024 +0300

    all: fix typo

commit 21e03e4d5a7624a68add53734a127652053845a2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Feb 12 15:22:35 2024 +0300

    all: upd docs

commit 11180061619f4352774d4bc8c85b481ae28f0d0b
Merge: ac5fd8dc8 7f8370744
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Feb 12 14:57:35 2024 +0300

    Merge branch 'master' into 5992-stats-qlog-custom-dir

commit ac5fd8dc82c9c6e88a182cd6e6aed07bf3548639
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 7 14:55:51 2024 +0300

    all: upd chlog

commit fe00652e158db65e0e735a19cf88aa999ece3e62
Merge: 21ad1ecf7 56b98080f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 7 14:53:24 2024 +0300

    Merge branch 'master' into 5992-stats-qlog-custom-dir

commit 21ad1ecf7b30c3c8f45d54210d7297966126b0f7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Feb 7 14:52:12 2024 +0300

    home: imp docs

commit 739b158de77e673ef80efdaa523044939ea879d5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Feb 5 20:15:50 2024 +0300

    home: add stats qlog custom dir
2024-02-12 18:45:51 +03:00
Eugene Burkov 7f83707449 Pull request 2143: AG-29441 QA versions
Squashed commit of the following:

commit c004644dd6b86847a654764e2055349919ac0de0
Merge: f26ec4440 24baee0f8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 9 13:09:44 2024 +0300

    Merge branch 'master' into AG-29441-qa-versions

commit f26ec4440cd406d0753d1225313b3cc5f60bf3e2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Feb 7 13:27:15 2024 +0300

    github: imp workflow doc

commit 825a00c8dde47f9bc9b837885978a135bfb1dc61
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 6 18:53:32 2024 +0300

    scripts: imp doc

commit ef62d96cec66f186799db175a813fca0913482b7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 6 15:00:42 2024 +0300

    scrits: imp count

commit 2d02b23da426063b9a852c06a04ba2fef874b9bf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Feb 6 14:22:28 2024 +0300

    scripts: imp code, docs

commit 549bfb982fa32cd30aa339f4458e60b6fc22e53a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Feb 5 18:54:55 2024 +0300

    scripts: imp dev version
2024-02-09 13:47:04 +03:00
Ainar Garipov 24baee0f8e Pull request 2148: 6703-adguardhome-sync
Updates #6703.

* commit 'a13d120317281e397aa3f1f68d76d6f95da6145a':
  all: fix markdown
  Mention AdGuardHome sync in usages
2024-02-09 12:06:30 +03:00
Ainar Garipov a13d120317 all: fix markdown 2024-02-08 21:23:26 +03:00
Ainar Garipov 32bd78347c Merge branch 'master' into 6703-adguardhome-sync 2024-02-08 21:22:54 +03:00
Ainar Garipov 332621f268 Pull request 2147: all: upd deps, go, scripts
Squashed commit of the following:

commit 425f1bd28074d22890629d06f43257e0353ce3d5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 8 20:15:58 2024 +0300

    all: upd deps, go, scripts
2024-02-08 20:39:18 +03:00
Ildar Kamalov 02ea4a362c Pull request: add persistent client from the query log context menu
Updates #6679

Squashed commit of the following:

commit 2e051c9528085182a22ec40a1df11780012a5001
Merge: a001f52ab 56b98080f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Feb 8 15:02:22 2024 +0300

    Merge branch 'master' into ADG-8179

commit a001f52ab5dadcfc1116ac46da01c0344e51b656
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Feb 5 18:59:13 2024 +0300

    fix changelog

commit 5bac6a2446413b157da6bb404e0e21bb35ac6a10
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Feb 5 16:01:01 2024 +0300

    fix

commit 14a7190ebb18fbed99a897723c27b80144d56825
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Feb 5 15:59:35 2024 +0300

    ADG-8179 add persistent client from query log context menu
2024-02-08 15:10:12 +03:00
Ainar Garipov 56b98080ff Pull request 2146: upd-chlog
Squashed commit of the following:

commit ddac33162c96583276561b8d6714fe0389f92277
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Feb 6 19:48:34 2024 +0300

    all: upd chlog
2024-02-06 19:59:05 +03:00
Ainar Garipov bf38a7ce40 Pull request 2144: gh-tmpl
Squashed commit of the following:

commit 55880402b3aac1b88009c9e97cc11200a549fd48
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Feb 5 19:49:52 2024 +0300

    all: imp gh tmpl
2024-02-05 20:04:39 +03:00
Stanislav Chzhen 34aa81ca99 Pull request 2107: AG-28327-upstream-config-parser
Squashed commit of the following:

commit e496653b10de52676826ed8e0c461e91405603a8
Merge: db2cd04e9 60a978c9a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Feb 1 18:23:50 2024 +0300

    Merge branch 'master' into AG-28327-upstream-config-parser

commit db2cd04e981dd24998d87f4935ff6590ea7854cd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 31 16:21:53 2024 +0300

    all: upd proxy

commit e8878179b6d094321d56fb2b75c16c1ba8cf637d
Merge: ccbbae6d6 aa872dfe9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 31 16:17:34 2024 +0300

    Merge branch 'master' into AG-28327-upstream-config-parser

commit ccbbae6d615e110d7d2d4c2a6b35954311153bcf
Merge: d947d900e 8936c95ec
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 29 18:31:17 2024 +0300

    Merge branch 'master' into AG-28327-upstream-config-parser

commit d947d900e1f759159bc9068589ffe852483cfdd0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 29 18:26:01 2024 +0300

    dnsforward: imp docs

commit cf9678c098951e2a4bebae7a3a5808d7de4c14c6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jan 25 14:18:04 2024 +0300

    dnsforward: imp code

commit 22792a9311cb93b2bb3b804293f87f091b9b81e2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 24 13:59:28 2024 +0300

    dnsforward: imp code

commit 57ddaaaaaf1009c65f0d9d6b2b1671211f194c85
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 22 20:19:44 2024 +0300

    all: add tests

commit d6732d13adae4ee46410252a33d092e67da3c34a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 22 18:44:57 2024 +0300

    all: imp errors

commit e14456571ce2ef43fb217f45445729ce6299daf6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jan 18 19:05:31 2024 +0300

    dnsforward: imp code

commit a5c106eae9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 15 18:36:30 2024 +0300

    dnsforward: imp logs

commit 333b8561aa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Dec 21 15:06:42 2023 +0300

    all: imp tests

commit 5b19d6b039
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 15 14:21:58 2023 +0300

    all: imp code

commit 15fbd229de
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 13 14:49:40 2023 +0300

    all: upstream config parser
2024-02-05 16:12:27 +03:00
Marc Brugger b98e093157
Mention AdGuardHome sync in usages 2024-02-03 10:00:12 +01:00
Ainar Garipov 60a978c9a6 Pull request 2141: upd-i18n
Squashed commit of the following:

commit fd143da4328b7b018146c503cf09ab7532e7c6df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 1 15:04:00 2024 +0300

    client: upd i18n
2024-02-01 15:59:55 +03:00
Ainar Garipov 2c055fea11 Pull request 2139: fix-invalid-addr
Squashed commit of the following:

commit 12e9e53ec20685989425411801bd836cbdefe9aa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 31 19:34:40 2024 +0300

    all: fix chlog

commit 6a8d872dcf49ff685454297e36b888309e058fcf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 31 19:33:18 2024 +0300

    all: doc

commit 12cd89634f9ae97876d8dd79e30de704b57ef47d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 31 19:20:27 2024 +0300

    dnsforward: fix http private ptrs
2024-02-01 13:46:28 +03:00
Eugene Burkov aa872dfe98 Pull request 2130: 4923 gopacket dhcp vol.6
Updates #4923.

Squashed commit of the following:

commit 14ae8dc3680eae7d3ecb9e37a44c2e68221c5085
Merge: 280a4dbc7 713901c2a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jan 31 13:52:52 2024 +0300

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

commit 280a4dbc728ff67c7659f91734a74c87bf0bda43
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 30 20:20:04 2024 +0300

    dhcpsvc: imp docs

commit 310ed67b9bf22f88c4414095bfbfc1a29c6db6d5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 30 18:51:49 2024 +0300

    dhcpsvc: generalize

commit e4c2cae73a729be4db244d3042d93fcc9742bb34
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 30 12:37:38 2024 +0300

    dhcpsvc: imp code

commit 9a60d3529293ce1f0e8da70da05958f81e1d0092
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Jan 26 16:28:04 2024 +0300

    dhcpsvc: imp code

commit 120c0472f3a3df2ebc0495a40936c8f94156db4b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Jan 25 20:44:09 2024 +0300

    dhcpsvc: imp code, names, docs

commit a92f44c75279868d8e07fe7d468278025a245d13
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jan 24 16:01:35 2024 +0300

    dhcpsvc: imp code, docs

commit 18b3f237b7523f649b49563e852c298fe02fa8ae
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Jan 18 15:29:36 2024 +0300

    dhcpsvc: add some lease-related methods
2024-01-31 14:50:27 +03:00
Ainar Garipov 713901c2a0 Pull request 2136: upd-all
Squashed commit of the following:

commit 96c544aa561b087463d6ec3e6176656aba920e84
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 30 18:40:38 2024 +0300

    all: upd i18n, svcs, trackers
2024-01-30 18:58:47 +03:00
Eugene Burkov 8936c95eca Pull request 2135: Fix changelog
Squashed commit of the following:

commit 857c53d263c4aa2de671e616b33b5a1abb0d1aac
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Jan 25 21:07:29 2024 +0300

    all: fix chlog
2024-01-26 13:54:13 +03:00
Ainar Garipov 6178ad5762 Pull request 2134: 6675-readme-ext
Closes #6671.
Updates #6675.

* commit 'ea620d76bec60565d5ecb4c5178107f84f98f286':
  Readme - Added browser extension
2024-01-25 16:41:00 +03:00
Sathesh Sivashanmugam ea620d76be
Merge branch 'AdguardTeam:master' into master 2024-01-24 13:50:44 -07:00
Stanislav Chzhen 136c028600 Pull request 2133: AG-29704-filtering-syntax
Squashed commit of the following:

commit 834ed8480e0942d2b2f5522a0d78f59445d4fe88
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 24 17:40:42 2024 +0300

    client: upd filtering syntax links
2024-01-24 18:19:37 +03:00
Sathesh Sivashanmugam bb2f1b4eb4 Readme - Added browser extension 2024-01-23 23:31:54 -07:00
Eugene Burkov 1fe814c1ad Pull request 2132: upd all
Squashed commit of the following:

commit 45c8bb0bff1ca8874ec99c70e406dddc3df75e8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 23 19:08:49 2024 +0300

    all: upd deps

commit 9018da49ba2502b91a5da4f916606f213c1183bd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 23 18:47:37 2024 +0300

    all: upd filters, trackers, services
2024-01-23 19:38:46 +03:00
Ainar Garipov 18cf9f9730 Pull request 2131: upd-readme
Squashed commit of the following:

commit 8fd3ef24725d48cff41cec8762f397f3b9a524f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 19 16:08:37 2024 +0300

    all: rm outdated link from readme
2024-01-19 16:28:59 +03:00
Stanislav Chzhen 88b05287d7 Pull request 2129: 6644-fix-nil-deref
Updates #6644.

Co-authored-by: Eugene Burkov <E.Burkov@AdGuard.COM>

Squashed commit of the following:

commit a79f4a35f811ab85302d266839f55143afc6fff8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 17 19:53:58 2024 +0300

    all: upd chlog

commit 9106dfb65dcfbbe40a0c97964279e8c35d4c8c00
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 17 19:43:34 2024 +0300

    home: fix nil deref
2024-01-18 16:14:11 +03:00
Dimitry Kolyshev df40da7c64 Pull request: AG-28961-upd-golibs
Squashed commit of the following:

commit b153bbc7100dd9184ca689f1755f068b63e3046b
Merge: d16da0cf6 4508ae860
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Jan 17 13:56:34 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs

commit d16da0cf61
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Jan 17 09:52:03 2024 +0200

    all: imp code

commit 46aeca7221
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Jan 17 09:50:10 2024 +0200

    all: imp code

commit 32bc83c0a9
Merge: ee51c6046 6dbeb5b97
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Jan 16 15:42:32 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs

    # Conflicts:
    #	go.mod
    #	go.sum

commit ee51c60466
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Jan 16 10:56:38 2024 +0200

    all: upd libs

commit 02c1dbd9b5
Merge: 1daba8342 58b47adaf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Jan 16 10:53:54 2024 +0200

    Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs

commit 1daba8342b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Jan 15 11:15:05 2024 +0200

    all: upd dnsproxy

commit b1670e8a81
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Jan 15 10:46:27 2024 +0200

    dnsforward: imp code

commit 7b65a50fca
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Jan 12 14:14:34 2024 +0200

    all: upd golibs
2024-01-17 15:06:16 +03:00
Stanislav Chzhen 4508ae860e Pull request 2122: AG-27492-client-persistent-ids
Squashed commit of the following:

commit a0527b86f10596a86357630117607a3c507e4ac2
Merge: 512edaf2d 9694f19ef
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 17 13:15:18 2024 +0300

    Merge branch 'master' into AG-27492-client-persistent-ids

commit 512edaf2dc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 15 15:50:28 2024 +0300

    home: imp docs

commit 4d4b359991
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jan 11 20:20:42 2024 +0300

    home: imp code

commit 8031347b86
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jan 11 18:46:20 2024 +0300

    home: fix typo

commit 5932b181fe
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jan 11 16:52:49 2024 +0300

    home: imp code more

commit 9412f58467
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Jan 11 15:41:23 2024 +0300

    home: imp code

commit 855d3201ab
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Jan 10 20:24:49 2024 +0300

    home: add tests

commit 112f1bd13a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 29 18:29:11 2023 +0300

    home: imp code

commit 8b295bfa89
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 29 14:58:17 2023 +0300

    home: persistent client ids
2024-01-17 13:24:21 +03:00
Ildar Kamalov 9694f19efe Pull request: fix client schedule update
Squashed commit of the following:

commit b3c6c20aa5
Merge: dfd1eff37 6dbeb5b97
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jan 16 13:31:45 2024 +0300

    Merge branch 'master' into ADG-7988

commit dfd1eff37f
Merge: 2de46aaf6 f7995aa02
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jan 16 12:42:39 2024 +0300

    Merge branch 'master' into ADG-7988

commit 2de46aaf68
Merge: ac5a23c19 1e0ff4d43
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jan 12 13:19:39 2024 +0300

    Merge branch 'master' into ADG-7988

commit ac5a23c199
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jan 11 10:28:07 2024 +0300

    fix error

commit d0103f4556
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 10 19:19:22 2024 +0300

    ADG-7988 fix client schedule update
2024-01-17 10:32:19 +03:00
Eugene Burkov 6dbeb5b971 Pull request 2125: 6321 upd proxy
Updates #6321.

Squashed commit of the following:

commit 033f4d427bc965c8c5b5fc452ddc938b71c8d4f4
Merge: febf5b568 f7995aa02
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 16 12:42:50 2024 +0300

    Merge branch 'master' into 6321-upd-proxy

commit febf5b568b012ccdce86c1d0dde710b99f5729b2
Merge: 7e4b247a4 58b47adaf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Jan 16 12:34:28 2024 +0300

    Merge branch 'master' into 6321-upd-proxy

commit 7e4b247a40
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Jan 12 14:37:28 2024 +0300

    all: upd proxy revision

commit 0e925c1fcf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Jan 11 14:24:47 2024 +0300

    dnsforward: imp code

commit 6f5c271895
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jan 10 16:34:02 2024 +0300

    all: use caching resolver more, imp code

commit ce3f3137d2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jan 10 16:00:08 2024 +0300

    all: log changes

commit ce90dbcda8
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jan 10 13:01:25 2024 +0300

    dnsforward: use caching resolvers

commit 208fbaf0aa
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Jan 10 12:52:15 2024 +0300

    all: upd proxy
2024-01-16 13:18:22 +03:00
Ildar Kamalov f7995aa022 Pull request: replace empty string with load_balance for upstream_mode
Squashed commit of the following:

commit 69d23105ce68e61132f2eb6571deb41fad25efbf
Merge: 76df04027 58b47adaf
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jan 16 12:22:52 2024 +0300

    Merge branch 'master' into ADG-7965

commit 76df04027f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jan 12 13:18:21 2024 +0300

    remove changelog

commit e79b7bffdd
Merge: df0f18929 1e0ff4d43
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jan 12 13:17:50 2024 +0300

    Merge branch 'master' into ADG-7965

commit df0f18929f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 10 19:21:34 2024 +0300

    fix changelog

commit 814308708d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 10 18:04:24 2024 +0300

    handle empty string

commit e9e672cd99
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jan 9 16:15:02 2024 +0300

    changelog

commit 34fb9b71e8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Jan 9 13:23:09 2024 +0300

    ADG-7965 replace empty string with load_balance for upstream_mode
2024-01-16 12:42:11 +03:00
Stanislav Chzhen 58b47adaff Pull request 2128: 6585-imp-readme
Closes #6585.

Squashed commit of the following:

commit 903079b2c9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 15 17:48:51 2024 +0300

    all: fix typo

commit 232083a8b2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 15 17:45:24 2024 +0300

    all: imp docs
2024-01-15 20:16:26 +03:00
Stanislav Chzhen 1e0ff4d437 Pull request 2119: 6570-querylog-size-memory
Updates #6570.

Squashed commit of the following:

commit 92b2723ac1
Merge: 2da12283b 0143c3aac
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Jan 9 17:07:23 2024 +0300

    Merge branch 'master' into 6570-querylog-size-memory

commit 2da12283b5
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Jan 9 17:04:54 2024 +0300

    all: imp tests

commit 1cb404c65d
Merge: 5f7d20516 94d437d40
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Dec 28 20:18:00 2023 +0300

    Merge branch 'master' into 6570-querylog-size-memory

commit 5f7d205169
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 27 15:07:54 2023 +0300

    all: imp docs

commit 0b17cfc424
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Dec 25 20:06:09 2023 +0300

    all: querylog size memory
2024-01-11 18:38:30 +03:00
Eugene Burkov 0143c3aac5 Pull request 2123: 6574 upd proxy
Squashed commit of the following:

commit 18d865fc0a28d8146668d6b754b62784796135b6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Dec 29 17:32:03 2023 +0500

    all: upd proxy
2023-12-29 17:06:27 +03:00
Stanislav Chzhen 94d437d404 Pull request 2110: AG-27492-client-persistent
Squashed commit of the following:

commit 6605cd17a2e5137cf69c853c2a956b2443e81ce9
Merge: 5b294a268 bec3cab56
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Dec 28 16:51:39 2023 +0300

    Merge branch 'master' into AG-27492-client-persistent

commit 5b294a2684
Merge: afe4d5f16 d75712bb9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 27 19:13:50 2023 +0300

    Merge branch 'master' into AG-27492-client-persistent

commit afe4d5f165
Merge: 05dc0bfda ad147ac7b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 26 14:59:10 2023 +0300

    Merge branch 'master' into AG-27492-client-persistent

commit 05dc0bfda2
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 20 19:44:04 2023 +0300

    home: imp err msg

commit c3b21c739c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Dec 18 15:05:29 2023 +0300

    all: imp docs

commit a2118f5aed
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 15 18:27:50 2023 +0300

    all: add persistent client uid
2023-12-28 17:26:17 +03:00
Ildar Kamalov bec3cab56c Pull request: add etc timezones to the timezone list
Updates #6568

Squashed commit of the following:

commit cea0e9143eb1322d359fdb611ea7572431fef623
Merge: 6f4a5b162 b42063ee8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Dec 28 13:40:47 2023 +0300

    Merge branch 'master' into ADG-7953

commit 6f4a5b1629
Merge: c574e3f52 d75712bb9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Dec 27 16:29:53 2023 +0300

    Merge branch 'master' into ADG-7953

commit c574e3f52a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Dec 27 09:52:20 2023 +0300

    ADG-7953 add etc timezones to the timezones list
2023-12-28 16:27:01 +03:00
Stanislav Chzhen b42063ee86 Pull request 2121: 6584-stats-non-anonymized-ips
Squashed commit of the following:

commit 4767b7bf61
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 27 14:30:10 2023 +0300

    all: fix non-anonymized ips in stats
2023-12-27 19:47:38 +03:00
Stanislav Chzhen d75712bb95 Pull request 2113: 6409-cache-ttl-override
Updates #6409.

Squashed commit of the following:

commit 7dea2a383ecdcef0de651f2cf720c1eb7a4486a3
Merge: 959b61862 ad147ac7b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 26 14:32:15 2023 +0300

    Merge branch 'master' into 6409-cache-ttl-override

commit 959b61862f
Merge: ca02da2d2 4bc5c346a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 22 15:13:12 2023 +0300

    Merge branch 'master' into 6409-cache-ttl-override

commit ca02da2d29
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 22 15:12:12 2023 +0300

    all: imp docs

commit 183eab145f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Dec 21 17:29:39 2023 +0300

    all: upd chlog

commit 51c7a52601
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Dec 18 20:23:13 2023 +0300

    all: cache ttl override
2023-12-26 16:52:33 +03:00
Eugene Burkov ad147ac7b6 Pull request 2114: 6480 upd proxy
Updates #6480.

Squashed commit of the following:

commit 03d73fe8f6
Merge: b6f9bd5af 1511fabee
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Dec 25 14:50:08 2023 +0300

    Merge branch 'master' into 6480-upd-proxy

commit b6f9bd5af4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 19 19:31:14 2023 +0300

    dnsforward: imp code, docs

commit db0356cd4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 19 17:21:53 2023 +0300

    all: log changes

commit 0cbb0e8a6b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 19 16:26:34 2023 +0300

    all: upd proxy
2023-12-25 18:23:10 +03:00
Dimitry Kolyshev 1511fabeec Pull request: AG-28771 conf upstream mode
Squashed commit of the following:

commit afb5a0d8a499bccf7761baea40910f39c92b8a20
Merge: 09ac43c85 abf20c6de
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Dec 25 12:55:45 2023 +0200

    Merge remote-tracking branch 'origin/master' into conf-ups-mode

commit 09ac43c859
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 22 14:36:07 2023 +0200

    openapi: imp docs

commit d0fbd4349e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 22 11:47:10 2023 +0200

    all: changelog

commit 105f9c5073
Merge: 62a2cf12d 4bc5c346a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 22 11:27:21 2023 +0200

    Merge remote-tracking branch 'origin/master' into conf-ups-mode

    # Conflicts:
    #	openapi/CHANGELOG.md

commit 62a2cf12df
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 22 10:52:59 2023 +0200

    openapi: imp docs

commit 87956c4924
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Dec 21 12:08:07 2023 +0200

    dnsforward: imp code

commit bf74d67ad1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Dec 20 15:46:38 2023 +0200

    dnsforward: imp code

commit 3a98dee888
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Dec 20 15:41:06 2023 +0200

    dnsforward: imp code

commit 1499da1fa0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Dec 20 13:36:28 2023 +0200

    dnsforward: imp code

commit 228c61a5a0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Dec 20 13:06:11 2023 +0200

    dnsforward: imp code

commit 069ee22c6d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 19 12:39:25 2023 +0200

    dnsforward: imp code

commit 90919f99a9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 19 12:10:43 2023 +0200

    confmigrate: fix

commit a8c3299504
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 19 12:08:05 2023 +0200

    dnsforward: imp code

commit 58b53ccd97
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Dec 18 15:10:01 2023 +0200

    all: conf upstream mode
2023-12-25 14:16:48 +03:00
Stanislav Chzhen abf20c6dea Pull request 2116: fix-nil-deref
Squashed commit of the following:

commit bf6cfdb4e2315dc6826daa4c83aef5e961b86ddc
Merge: 3c532f508 4bc5c346a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Dec 25 13:35:45 2023 +0300

    Merge branch 'master' into fix-nil-deref

commit 3c532f5087
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 20 13:59:29 2023 +0300

    home: fix nil deref
2023-12-25 13:48:44 +03:00
Stanislav Chzhen 4bc5c346a7 Pull request 2115: ADG-7924-stats-interval
Squashed commit of the following:

commit 2c7ee92b82087c7dfcb9f6955cc062e1c32d07f8
Merge: 67313ec7d 469857922
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 20 19:04:44 2023 +0300

    Merge branch 'master' into ADG-7924-stats-interval

commit 67313ec7de
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 19 20:02:31 2023 +0300

    all: imp docs

commit f073dc46f1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 19 18:33:51 2023 +0300

    upd: chlog

commit 109dbb146a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 19 17:23:58 2023 +0300

    stats: interval
2023-12-20 19:16:22 +03:00