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

4036 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 7e4b247a40263225dda3aaa77b823c056ae49541
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Jan 12 14:37:28 2024 +0300

    all: upd proxy revision

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

    dnsforward: imp code

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

    all: use caching resolver more, imp code

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

    all: log changes

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

    dnsforward: use caching resolvers

commit 208fbaf0aa50df33f8482a441d361d106fc7b146
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 76df04027f52157b7ac820888bf8b91ecb93c48c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jan 12 13:18:21 2024 +0300

    remove changelog

commit e79b7bffdd8e9dc6d530049489e9fe8365827ae6
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 df0f18929f4d4b7f9d20347fa5f8481b667a1bd8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Jan 10 19:21:34 2024 +0300

    fix changelog

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

    handle empty string

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

    changelog

commit 34fb9b71e882ed5230df8d4caca88a930996f86b
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 903079b2c91ce84e66c368565808251dcf7a16a6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Jan 15 17:48:51 2024 +0300

    all: fix typo

commit 232083a8b29d030758c2db91f26c214cdd8cfc93
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 92b2723ac1b2a78138a55cb82a3222f66119bbda
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 2da12283b5f504fa77f08fa6026fa9a57b806b38
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Jan 9 17:04:54 2024 +0300

    all: imp tests

commit 1cb404c65d4e9981b709d689fd281253eca01f82
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 5f7d20516934867e1a141c19a97edb49407884ee
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 27 15:07:54 2023 +0300

    all: imp docs

commit 0b17cfc4243a88606c62e4b1ae893a09149655b5
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 5b294a26848e173b26eb9496b3c380b847a9fa1b
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 afe4d5f1659c474173139ed4c841d72306ed27ac
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 05dc0bfda2001cececc37c040f0cee632921aae4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 20 19:44:04 2023 +0300

    home: imp err msg

commit c3b21c739ccb4436e9606579e3fb46cc32821a81
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 6f4a5b1629c2e9cffdc23292af8c1319fdd461f1
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 c574e3f52a73f39044b333a2857a11a23ca997a8
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 4767b7bf61a277f20d8326783cc44de1b736de3d
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 959b61862fc007118e287e5ed7aefa8605b0164a
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 ca02da2d292a6ecf020c2957c22b8b0fa5d86104
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 22 15:12:12 2023 +0300

    all: imp docs

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

    all: upd chlog

commit 51c7a526019a676411b06d4ee80ad1c95bde5a2e
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 03d73fe8f6637b88d11cb331a71c78a0bc79ac7e
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 b6f9bd5af43c55ec37133fae42f80adc58092f39
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 19 19:31:14 2023 +0300

    dnsforward: imp code, docs

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

    all: log changes

commit 0cbb0e8a6b525088f1f739b777229547fdd1dccb
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 09ac43c859ef8cbd3bb0488d1a945589cd59ca19
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 22 14:36:07 2023 +0200

    openapi: imp docs

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

    all: changelog

commit 105f9c50738733b0736a768fb9ee09d2e7fbf42e
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 62a2cf12df694611888e840a5041a9c517cdfddb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 22 10:52:59 2023 +0200

    openapi: imp docs

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

    dnsforward: imp code

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

    dnsforward: imp code

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

    dnsforward: imp code

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

    dnsforward: imp code

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

    dnsforward: imp code

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

    dnsforward: imp code

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

    confmigrate: fix

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

    dnsforward: imp code

commit 58b53ccd97d353fab0df29f13425b5e341c8fdeb
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 3c532f50876f3d04c63e1377b1143f2436fd37f2
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 67313ec7de745b4b1fd6201e127b7237dfe1bc30
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 19 20:02:31 2023 +0300

    all: imp docs

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

    upd: chlog

commit 109dbb146ad589ee6d3f2b1b8bf4e12b31ccee61
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
Ainar Garipov
4698579227 Pull request 2118: 6564-doc-fix 
Updates #6564.

* commit '9bfad46a6ca813fe1d6e50b7039476351f2c68c6':
  openapi: upd chlog
  correct schema type for client upstreams_cache_size
 2023-12-20 18:33:43 +03:00
Ainar Garipov
9bfad46a6c Merge branch 'master' into 6564-doc-fix 2023-12-20 18:24:21 +03:00
Ildar Kamalov
38b3ec19cc Pull request: fix edit static lease 
Updates #6534

Squashed commit of the following:

commit 1ca6cdc37a865ff0beab2d1f4fb0d44528bd4df3
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Dec 20 15:41:27 2023 +0300

    ADG-7889 fix edit static lease
 2023-12-20 18:17:05 +03:00
Ainar Garipov
97a048b238 openapi: upd chlog 2023-12-20 18:15:20 +03:00
Marc Brugger
8d1e1e8bec
correct schema type for client upstreams_cache_size 
Signed-off-by: bakito <github@bakito.ch>
 2023-12-20 07:56:09 +01:00
Ainar Garipov
0920bb99fe Pull request 2109: AG-20945-rule-list-filter 
Squashed commit of the following:

commit 2da8c1754f349a9b7f8b629de8f0c892b9bae4dc
Merge: 5cea6a6a2 4fc6bf504
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 19 21:14:07 2023 +0300

    Merge branch 'master' into AG-20945-rule-list-filter

commit 5cea6a6a2bed88f645828ab5b4e7de09f9bf91ec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 19 17:53:21 2023 +0300

    filtering/rulelist: imp docs, tests

commit f01434b37a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 14 19:17:02 2023 +0300

    filtering/rulelist: imp names

commit fe2bf68e6b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 14 19:07:53 2023 +0300

    all: go mod tidy

commit c7081d3486
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 14 19:03:33 2023 +0300

    filtering/rulelist: add filter
 2023-12-19 21:21:17 +03:00
Eugene Burkov
4fc6bf504e Pull request 2108: 6541 hosts nodata 
Updates #6541.

Squashed commit of the following:

commit e79507f6a7850cc3af316f0e46c289a84882ae15
Merge: 1a09de91d d32832735
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Dec 18 14:29:21 2023 +0300

    Merge branch 'master' into 6541-hosts-nodata

commit 1a09de91dc
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 14 18:24:56 2023 +0300

    filtering: separate files

commit e00d1d26c7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 14 18:00:52 2023 +0300

    filtering: fix hosts nodata
 2023-12-18 14:43:08 +03:00
Ainar Garipov
d32832735c Pull request 2111: 6545-schema-version 
Updates #6545.

Squashed commit of the following:

commit b1969128a99ff21c97feb4e7805b4b8133d7122f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 15 20:04:37 2023 +0300

    home: fix import

commit 872ccea1491a8da76cc24db79247438d0ce4d256
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 15 20:01:15 2023 +0300

    all: output schema version
 2023-12-15 20:27:47 +03:00
Stanislav Chzhen
9241393ed2 Pull request 2083: AG-27492-client-runtime 
Squashed commit of the following:

commit e4c2abd37f5885a12da5c68179e3dba18534c3be
Merge: 7411b40b2 dae304fc3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 13 13:15:40 2023 +0300

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

commit 7411b40b234a438df4c84823fcb19efecf5eb64d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 12 17:51:51 2023 +0300

    all: imp code

commit d5edd0258779c6dfba56da1e4d79e0380b137385
Merge: 371f5b23c c908eec5d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 12 13:45:33 2023 +0300

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

commit 371f5b23c9507fb6e8e8f8ec1f644ca8e67ea412
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 12 13:44:38 2023 +0300

    client: imp code

commit 9aefb1443082a342270a7e5e77a07d5d1518e327
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 8 17:08:07 2023 +0300

    all: imp code

commit 3aa51d10aadfd124f36238a31f3d623706e3c870
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 5 19:20:41 2023 +0300

    all: imp docs

commit 71d7187e0c14e143865b055e9b01ff61a2e30083
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Dec 1 17:17:06 2023 +0300

    all: imp code

commit e09f8a0bd90f295b5a580e24b2696cc78993713a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 30 14:46:53 2023 +0300

    all: imp log msg

commit ce0a9454df9a173694395b4dd8b05347a2e56fdc
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 28 16:21:01 2023 +0300

    all: imp code

commit e84f176aaba6953b22e13a5fa84079a832d30a24
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 22 17:40:18 2023 +0300

    all: add client runtime
 2023-12-13 13:39:52 +03:00
Dimitry Kolyshev
dae304fc3c Pull request: safesearch cname 
Updates #6352.

Squashed commit of the following:

commit 79d24e0e44a19d05750101e2baa4129c9b62e7ac
Merge: 04c2759bf c908eec5d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 12 12:26:57 2023 +0200

    Merge remote-tracking branch 'origin/master' into 6352-safesearch-cname

    # Conflicts:
    #	CHANGELOG.md

commit 04c2759bf779d124673c9b3d5c6d95a1dc11a7d0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 12 11:14:13 2023 +0200

    all: fix changelog

commit 78d726e912d2066e8137f10e4057fd9179227884
Merge: 2d2c17436 79d7a1ef4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 12 11:12:58 2023 +0200

    Merge remote-tracking branch 'origin/master' into 6352-safesearch-cname

commit 2d2c17436266a82b6fadd436df33ffc0bf55e26f
Merge: 2b1c1eabb 7b5cce517
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Dec 11 11:08:08 2023 +0200

    Merge remote-tracking branch 'origin/master' into 6352-safesearch-cname

    # Conflicts:
    #	CHANGELOG.md

commit 2b1c1eabb274351cbaffaeb1c92eb62aeccb384e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 15:24:02 2023 +0200

    all: changelog

commit 38afdbab686d2ec3c322c34ede032f313ba85ddc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 15:21:23 2023 +0200

    safesearch: imp docs

commit e941f5e76efcf1872f7e24bb2378f33e56f06db9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 14:43:39 2023 +0200

    dnsforward: imp code

commit 8dedb4a01db8d3f9005c602bd4c6e54637667101
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 14:26:51 2023 +0200

    dnsforward: imp tests

commit 8f23adeae9d10d7b2ffc30dd76d3e18192cc774e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 13:33:50 2023 +0200

    all: safesearch cnames

commit 061a6deeacf801a71d1a027355d67f3fc6455eac
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 13:09:32 2023 +0200

    all: changelog

commit 6f7ff7f9e61f492c7ded9c79fb2499cfeeaa5883
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 13:07:36 2023 +0200

    all: safesearch cnames
 2023-12-12 16:20:55 +03:00
Dimitry Kolyshev
c908eec5de Pull request: home: http dns plain 
Merge in DNS/adguard-home from AG-28194-plain-dns to master

Squashed commit of the following:

commit a033982b949217d46a8ea609f63198916f779a61
Merge: 03fc28211 79d7a1ef4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 12 12:07:39 2023 +0200

    Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns

commit 03fc282119a6372fcb4ce17a5d89779ad84589f5
Merge: e31a65931 34a34dc05
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Dec 12 11:07:46 2023 +0200

    Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns

    # Conflicts:
    #	CHANGELOG.md

commit e31a659312fffe0cd5f57710843c8a6818515502
Merge: 0b735eb42 7b5cce517
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Dec 11 11:09:07 2023 +0200

    Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns

    # Conflicts:
    #	CHANGELOG.md

commit 0b735eb4261883961058aed562c1e72ad1a20915
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 15:22:27 2023 +0200

    Revert "safesearch: imp docs"

    This reverts commit bab6bf3467f8914a34413bbbcdc37e89ff0401a5.

commit bab6bf3467f8914a34413bbbcdc37e89ff0401a5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 15:21:23 2023 +0200

    safesearch: imp docs

commit aa5e6e30e01bf947d645ac4a9578eeac09c92a19
Merge: 503888447 2b62901fe
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 14:48:13 2023 +0200

    Merge remote-tracking branch 'origin/AG-28194-plain-dns' into AG-28194-plain-dns

commit 503888447aaf30d48c3fb9a414e8a65beb1a4e23
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 14:47:23 2023 +0200

    home: imp code

commit 2b62901feb29c9613ae648fa5e83598157207a17
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Dec 8 11:55:25 2023 +0300

    client: add plain dns description

commit 3d51fc8ea1955e599953070a4b330dd4e2fd44bc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 10:15:53 2023 +0200

    all: changelog

commit 59697b5f1ab049bd2259ffe42cef7223531ef7aa
Merge: 81a15d081 b668c04ea
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 8 10:11:59 2023 +0200

    Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns

commit 81a15d0818b18f99e651311a8502082b4a539e4b
Author: Natalia Sokolova <n.sokolova@adguard.com>
Date:   Thu Dec 7 17:30:05 2023 +0300

    client/src/__locales/en.json edited online with Bitbucket

commit 0cf2f880fbd1592c02e6df42319cba357f0d7bc8
Author: Natalia Sokolova <n.sokolova@adguard.com>
Date:   Thu Dec 7 17:29:51 2023 +0300

    client/src/__locales/en.json edited online with Bitbucket

commit 2f32c59b8b1d764d060a69c35787566cf5210063
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Dec 7 13:14:04 2023 +0200

    home: imp code

commit 01e21a26bdd13c42c55c8ea3b5bbe84933bf0c04
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Dec 7 12:14:02 2023 +0200

    all: imp docs

commit b6beec6df7c2a9077ddce018656c701b7e875b53
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Dec 7 12:42:21 2023 +0300

    client: fix reset settings

commit 93448500d56a4652a3a060b274936c40015ac8ec
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Dec 7 10:55:25 2023 +0200

    home: imp code

commit eb32f8268bee097a81463ba29f7ea52be6e7d88b
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Dec 7 10:42:23 2023 +0200

    home: imp code

commit 873d1412cf7c07ed985985a47325779bcfbf650a
Merge: 627659680 214175eb4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Dec 7 10:22:25 2023 +0200

    Merge remote-tracking branch 'origin/master' into AG-28194-plain-dns

commit 627659680da8e973a3878d1722b276d30c7a27bb
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Dec 6 17:39:14 2023 +0300

    client: handle plain dns setting

commit ffdbf05fede721d271a84482a5759284d18eb189
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 1 15:12:50 2023 +0200

    home: http dns plain

... and 1 more commit
 2023-12-12 13:16:01 +03:00
Eugene Burkov
79d7a1ef46 Pull request 2096: 4923 gopacket dhcp vol.5 
Updates #4923.

Squashed commit of the following:

commit 762a3f9b7d7d4dd8799e8bf4df632b8d50321bf8
Merge: 2af65b42a 34a34dc05
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 12 11:13:21 2023 +0300

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

commit 2af65b42a62b92ec5bc28ef81eb6f08d0f9f443e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Dec 8 16:22:51 2023 +0300

    dhcpsvc: imp code

commit 71233b9952b0d74e7e890d6755652877bc4c543b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Dec 8 15:26:25 2023 +0300

    dhcpsvc: imp docs

commit 2949544f32b52d592f76e53062cf017e08073d29
Merge: 593e9edaa 214175eb4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 7 16:48:18 2023 +0300

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

commit 593e9edaa9e776db35b3bedfa942c015d7b1e4af
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 7 16:45:10 2023 +0300

    dhcpsvc: imp docs

commit cdb1915c7db3bf36800b40bc6aedc0e20f55f899
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 7 16:33:56 2023 +0300

    dhcpsvc: imp code

commit a0c423c2b39d674debf4c0fedf6208f656be861a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 5 20:56:43 2023 +0300

    dnspsvc: add opts

commit 050ab7f9410c206287c66376e21d36af8a3da384
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 5 20:17:37 2023 +0300

    WIP
 2023-12-12 12:05:44 +03:00
Ainar Garipov
34a34dc05a Pull request 2106: all: upd chlog 
Squashed commit of the following:

commit 7fe0f60d3f8b20b7faf8558d7d69773407d59182
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 11 20:41:05 2023 +0300

    all: upd chlog
 2023-12-11 21:00:16 +03:00
Eugene Burkov
c08ac4c22e Pull request 2105: upd proxy 
Squashed commit of the following:

commit 5ab6acc2c7c57ffbe6a828f6ea3c717336666d13
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Dec 11 13:52:01 2023 +0300

    all: upd proxy
 2023-12-11 14:12:07 +03:00
Ainar Garipov
7b5cce5170 Pull request 2103: 6510-mapped-addr 
Updates #6510.

Squashed commit of the following:

commit cc79f082b018ebda5ece461058b95de398bc3dc0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 8 19:28:46 2023 +0300

    all: upd dnsproxy
 2023-12-08 19:40:23 +03:00
Ainar Garipov
b668c04ea8 Pull request 2101: upd-all 
Squashed commit of the following:

commit 1db293fd79672098a3595a1b44ce52971f30b9f5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 7 18:32:52 2023 +0300

    all: upd chlog, deps, tools
 2023-12-07 18:46:36 +03:00
Eugene Burkov
ce868268bc Pull request 2094: AG-27796 upd golibs 
Squashed commit of the following:

commit a205c1302e3979d1c4270b11d253b6bc0d292216
Merge: de289ff4f 214175eb4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 7 16:36:53 2023 +0300

    Merge branch 'master' into AG-27796-upd-golibs

commit de289ff4f3199bc2dffb029a9804cabe86b3b886
Merge: b2322093c a0ec0b2b5
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Dec 6 12:12:35 2023 +0300

    Merge branch 'master' into AG-27796-upd-golibs

commit b2322093cea0ecdf34be66b56a9ab0fd7b32c7b9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 5 19:20:30 2023 +0300

    filtering: imp cognit

commit 563aa45824a2cc9d63d2c394f6a60f053e5d6d3b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Dec 4 17:02:56 2023 +0300

    all: imp code

commit 064a00bce4340caa4cea052fa8234cedb8dcea01
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 28 18:41:07 2023 +0300

    all: upd golibs
 2023-12-07 16:48:55 +03:00
Stanislav Chzhen
214175eb41 Pull request 2097: 6420-ipset-currenly-known-sets 
Updates #6420.

Squashed commit of the following:

commit 9c08b4206845547bae07b5c456eaf74df4d55921
Merge: a9ee2fe56 083abaac0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 6 19:20:53 2023 +0300

    Merge branch 'master' into 6420-ipset-currenly-known-sets

commit a9ee2fe5603168ce75a5c8cba5b2356c039b0970
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 6 18:26:01 2023 +0300

    all: imp docs

commit fabaab0cc40256cb486366e1cc2d345159178cd1
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Dec 6 15:00:58 2023 +0300

    ipset: currently known sets
 2023-12-06 19:28:56 +03:00
Eugene Burkov
083abaac09 Pull request 2099: improve validator test 
Squashed commit of the following:

commit 3a7b8fd5e73cd301643d3a907f38b2dade87b60d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Dec 6 18:36:08 2023 +0300

    dnsforward: imp code

commit 9751bf513ddf7013071e22500a347cdda1540ce6
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Dec 6 18:27:59 2023 +0300

    dnsforward: imp validator test
 2023-12-06 18:56:14 +03:00
Ainar Garipov
a3be6a9c19 Pull request 2098: upd-go 
Squashed commit of the following:

commit 83b798475b6d31dde44d2ce3aaa1ef2fc42f7446
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 6 17:35:26 2023 +0300

    all: upd gen, go, i18n, tools
 2023-12-06 17:56:12 +03:00
Eugene Burkov
a0ec0b2b57 Pull request 2095: fix nil deref 
Squashed commit of the following:

commit 74089af1bb05892ac5c1e4dfefde6256e1b55c02
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Dec 5 20:50:12 2023 +0300

    dnsforward: fix nil deref
 2023-12-06 12:10:39 +03:00
Stanislav Chzhen
99af7f46de Pull request 2087: AG-27616-upd-proxy-ratelimit-whitelist 
Squashed commit of the following:

commit 099a2eb11609a07a1cb72d9e15da3e668042de1d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 5 17:25:49 2023 +0300

    all: upd proxy

commit db07130df80ed06b867f6ce6878908b1eb93a934
Merge: 9e6e8e7cf 75cb9d412
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Dec 5 14:44:44 2023 +0300

    Merge branch 'master' into AG-27616-upd-proxy-ratelimit-whitelist

commit 9e6e8e7cfc80507cff81761dd3964cf7777ac58b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 29 19:46:17 2023 +0300

    all: imp tests

commit e753bb53880c2a0791d97079a12960e0b1d667ed
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 29 13:35:21 2023 +0300

    all: upd proxy ratelimit whitelist
 2023-12-05 17:43:50 +03:00
Dimitry Kolyshev
75cb9d412a Pull request: all: upd dnsproxy 
Squashed commit of the following:

commit 65525439e8f8868d4bc2b444bad9e96f702dadda
Merge: a6c507977 2965d1fb6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Dec 1 10:02:29 2023 +0200

    Merge remote-tracking branch 'origin/master' into upd-dnsproxy

commit a6c507977968c15ec024a36adfdbc1323505a574
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 30 14:55:15 2023 +0200

    dnsforward: imp code

commit 5bd6805d54ec5908682481cd942dd1f088e576ff
Merge: 094a9c9b0 0e4e243e8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 30 10:56:58 2023 +0200

    Merge remote-tracking branch 'origin/master' into upd-dnsproxy

commit 094a9c9b091182dadcfcc3a7ef312c1032ac42df
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 30 10:54:39 2023 +0200

    all: upd dnsproxy
 2023-12-01 11:12:03 +03:00
Stanislav Chzhen
2965d1fb6b Pull request 2089: 6420-ipset-header-data-query 
Updates #6420.

Squashed commit of the following:

commit 84a2a457bbb923b53880fc4c08e239696b6bda01
Merge: a578fc29d 0e4e243e8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 30 16:42:48 2023 +0300

    Merge branch 'master' into 6420-ipset-header-data-query

commit a578fc29d7963d819770c7397c2848f815ad4e07
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 30 15:52:42 2023 +0300

    ipset: imp err msg

commit c4673f7e801887b6264bff97271732645fe78d0d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 29 16:45:36 2023 +0300

    ipset: imp log msg

commit abf8977f55b1be7b51140cfc9bfb402e40efe7c0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 29 15:29:36 2023 +0300

    ipset: header data query
 2023-11-30 16:53:39 +03:00
Eugene Burkov
0e4e243e8e Pull request 2088: 6457 pass bootstrap 
Updates #6457.

Squashed commit of the following:

commit c51cb5f26d0d35705fbe02400e106a894c01dbab
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Nov 29 15:20:10 2023 +0300

    dnsforward: fix bootstrap usage
 2023-11-29 15:37:39 +03:00
Eugene Burkov
849abaf25e Pull request 2080: AG-27539 imp upstream test 
Squashed commit of the following:

commit 5a9e8c0c2e4b68c0ff6508c47fbd8abde0d05e95
Merge: 85820c173 c4e69cd96
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 28 16:09:53 2023 +0300

    Merge branch 'master' into AG-27539-imp-upstream-test

commit 85820c173dddb6391dabe9615b821b585b1ecdef
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 28 15:48:53 2023 +0300

    dnsforward: split code

commit dac0148a4d4780bea19fb7622b46ac08fbf1ee74
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 24 15:47:05 2023 +0300

    dnsforward: fix docs

commit 9f0015b255d547f31d34513aa6bb2faf65a39e0e
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 24 14:45:43 2023 +0300

    dnsforward: imp code

commit 49fefc373972b7c8991abcb46d7730288b92c24c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Nov 23 14:12:02 2023 +0300

    dnsforward: imp code

commit 120ba4b1f727bba537471c4a8aa4b412eac30f85
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Nov 22 17:02:01 2023 +0300

    dnsforward: add tests

commit 70775975ced46191a6ba64504c7bac0e3d1eed7f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Nov 22 15:48:05 2023 +0300

    dnsforward: imp code

commit 9487f1fd62b821efb242267d9972f3ae3785ad19
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 21 18:06:00 2023 +0300

    dnsforward: imp code

commit e2612e0e6fd1c9116872939edd0e86f2e9af07d7
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 21 16:12:20 2023 +0300

    dnsforward: add ups checker

commit 09db7d2a604809669affbeef2f0536fa6605a39b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Nov 14 17:31:04 2023 +0300

    dnsforward: separate upstream code
 2023-11-28 16:40:52 +03:00
Stanislav Chzhen
c4e69cd961 Pull request 2086: fix-chlog 
Squashed commit of the following:

commit 58213a20340622cf752261542526672d14d044f8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Nov 27 15:57:34 2023 +0300

    all: imp chlog

commit 0778ac4f69bf0b5dca1b6b44abd27b5a2d078bd0
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Nov 27 15:28:44 2023 +0300

    all: fix chlog
 2023-11-27 16:25:39 +03:00
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
Eugene Burkov
5dd10d9fc6 Pull request 2085: 6438 upd proxy 
Updates #6438.

Squashed commit of the following:

commit dba07508dca51be2a7659be6af5e087fd5010c0b
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Nov 23 19:57:46 2023 +0300

    all: upd proxy
 2023-11-23 20:24:20 +03:00
Ainar Garipov
1320043e95 Pull request 2084: fix-chlog 
Squashed commit of the following:

commit eb318af376731d7ba15132ae863ecaac004c4431
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Nov 22 18:04:02 2023 +0300

    all: fix chlog
 2023-11-22 18:21:12 +03:00
Ainar Garipov
f28dcefa29 Pull request 2082: upd-i18n 
Squashed commit of the following:

commit 655d6a988dfa4b880c636828fda0052d7c887cd8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Nov 22 14:48:08 2023 +0300

    all: upd flts, i18n, svcs
 2023-11-22 15:00:00 +03:00
Ainar Garipov
8b9708b8e0 Pull request 2081: 6447-downgrade-dep 
Closes #6446.
Updates #6447.

* commit '6eba44795886f1d2ccaa29f7065206444d0f404f':
  all: add comment; tidy
  all: downgrade github.com/mdlayher/socket
 2023-11-22 14:32:16 +03:00
Ainar Garipov
6eba447958 Merge branch 'master' into 6447-downgrade-dep 2023-11-22 13:54:19 +03:00
Ainar Garipov
29cc387c5f all: add comment; tidy 2023-11-22 13:53:14 +03:00
Ainar Garipov
73358263e8 Pull request 2076: 1660-disable-plain 
Updates #1660.

Squashed commit of the following:

commit d928a00b7c77a33717fe3e77aace1f1b41a960d2
Merge: 38e401d78 0f5e8ca56
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Nov 22 13:39:34 2023 +0300

    Merge branch 'master' into 1660-disable-plain

commit 38e401d7827ce1ea190b5328cadb3bb0ff5a5cba
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Nov 21 20:17:53 2023 +0300

    dnsforward: imp validation

commit f9e99cec209078128fef1b147294c7abe3f6ae70
Merge: cb7529682 c8f1112d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 20 16:02:31 2023 +0300

    Merge branch 'master' into 1660-disable-plain

commit cb75296821cae594e8c4d17dfdd8be2190aee7f7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Nov 17 14:20:02 2023 +0300

    all: add serve_plain_dns
 2023-11-22 13:49:02 +03:00
Jeffery To
cb9262dced
all: downgrade github.com/mdlayher/socket 
v0.5.0 only supports Go 1.21+[1], and no dependencies require v0.5.0.
This fixes building with Go 1.21.

[1]: 18f45b55db/CHANGELOG.md (v050)

Closes #6446.
 2023-11-22 16:34:44 +08:00
Stanislav Chzhen
0f5e8ca56f Pull request 2074: 6420-ipset-imp-validation 
Closes #6420.

Squashed commit of the following:

commit 5494df6681a3292a770b4faf7be8a88b9d860758
Merge: 5e2ab6c49 db42254d7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 21 16:13:15 2023 +0300

    Merge branch 'master' into 6420-ipset-imp-validation

commit 5e2ab6c4981f13e3c4ea7c9340f559e8e87bf95d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Mon Nov 20 20:45:11 2023 +0300

    ipset: imp err msg

commit 2696372491270ff85925d63d866f8db0656e816b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 17 13:59:33 2023 +0300

    all: imp docs

commit 0cb0e3582844897b18ec912e17079c33e7d1004c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 16 18:20:35 2023 +0300

    all: upd chlog

commit 969f84a7c75cc2a8f44f5350f799b9a60bc546b3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 15 20:11:16 2023 +0300

    ipset: add type name
 2023-11-21 16:22:04 +03:00