Commit Graph

533 Commits

Author SHA1 Message Date
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 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
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
Ildar Kamalov 9694f19efe Pull request: fix client schedule update
Squashed commit of the following:

commit b3c6c20aa5196053754e73db613c1c459ef9236b
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 dfd1eff37f5f2c02f2053bffbec4cc2e524429c3
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 2de46aaf6834389fa71806089663e72479f72717
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 ac5a23c199cee65150029a307f9398e5022dd62f
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Jan 11 10:28:07 2024 +0300

    fix error

commit d0103f4556a39b7c285f216f7453178439b92165
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 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
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 a2118f5aedd93c16ffeb35d14dbcd2b3a1cdb4a4
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 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
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
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 1a09de91dc211e03a104ee7c58b7ea39498b73dd
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 14 18:24:56 2023 +0300

    filtering: separate files

commit e00d1d26c79c85d9266ccdb5e5b4c4a4fde2c90c
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
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
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
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
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
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
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 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
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
Ainar Garipov 1c0bf95b5a Pull request 2075: 1660-refactor-dns
Updates #1660.

Squashed commit of the following:

commit ed4923372bad717403c6f593586580daf00a90da
Merge: 85e82520a 388583cef
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Nov 17 16:00:13 2023 +0300

    Merge branch 'master' into 1660-refactor-dns

commit 85e82520a45c30a659af8b43879ca059e7a6755f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Nov 17 14:55:11 2023 +0300

    home: imp dns conf

commit bd255a77a77d0552f0a8306a045a98200a4ffb58
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Nov 17 14:30:50 2023 +0300

    all: imp dns conf
2023-11-17 16:52:41 +03:00
Dimitry Kolyshev 388583cefe Pull request: custom upstreams cache
Merge in DNS/adguard-home from custom-ups-cache to master

Squashed commit of the following:

commit 98428a87520f70cb522701d8eccfe4c529be1e40
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 17 10:53:32 2023 +0200

    all: upd dep

commit 775a639af4a2a45220b17e8b0037edc126ff62e4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 17 09:52:31 2023 +0200

    dnsforward: imp test

commit e9e2a58b48e8588dfcb28df319d4651e1fe77af5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 17 09:44:46 2023 +0200

    docs: changelog

commit a6d67218f037c8fec29e5fa2967476d63c3cfc32
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 17 09:37:17 2023 +0200

    all: upd dep

commit b101ff6e0cf393dacdee6fb68d33ba8f11c36280
Merge: d61f4eb88 8bb1aad73
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 16 15:54:05 2023 +0200

    Merge remote-tracking branch 'origin/master' into custom-ups-cache

commit d61f4eb8871f8ae8504259998bf9015b29001cfb
Merge: 567a8a4af fdf60eeed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Nov 13 10:32:22 2023 +0200

    Merge remote-tracking branch 'origin/master' into custom-ups-cache

commit 567a8a4af34ad001d0e6d7d2efdc123205569e8c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Mon Nov 13 10:30:24 2023 +0200

    home: imp code

commit a3c16facbebc166e5c0c731c1e892b61c0950d9e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 10 14:34:04 2023 +0200

    all: imp code

commit 84160eafee1d0f2d0cd3f025f2d5070e4f597ad6
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 10 14:31:26 2023 +0200

    all: conf custom ups cache

commit b7f6581901ebad96c87e765a305a1fa5b336efbb
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 10 14:29:47 2023 +0200

    all: conf custom ups cache

commit d07df945d4e7614a679ef5dc77756096abf1e66c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 10 09:26:29 2023 +0200

    all: docs

commit 998124bac08889c7d354dd1a099929726725bccc
Merge: f665e2f85 53170d871
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 10 09:24:28 2023 +0200

    Merge remote-tracking branch 'origin/master' into custom-ups-cache

commit f665e2f85bce12d95f80aba6614b6bfd4874b122
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Fri Nov 10 09:22:46 2023 +0200

    all: conf custom ups cache

commit a4b26973bef4f3b339198ffbe52a50baca303daf
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Thu Nov 9 12:46:39 2023 +0200

    all: conf custom ups cache
2023-11-17 15:51:51 +03:00
Stanislav Chzhen 94bceaa84d Pull request 2065: 6369-ratelimit-settings-ui
Closes #6369.
Co-authored-by: IldarKamalov <ik@adguard.com>

Squashed commit of the following:

commit efc824667a88765d5a16984fd17ecda2559f2b1e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 15 19:10:47 2023 +0300

    all: imp docs

commit 9ec59b59000f005006ea231071329a586d9889ac
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 15 17:21:03 2023 +0300

    dnsforward: imp err msg

commit d9710dfc1dcf74d5ee8386b053d7180316f21bce
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 15 15:33:59 2023 +0300

    all: upd chlog

commit 29e868b93b15cfce5faed4d0c07b16decbce52f9
Merge: 1c3aec9f1 ebb06a583
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 15 15:26:32 2023 +0300

    Merge branch 'master' into 6369-ratelimit-settings-ui

commit 1c3aec9f1478f71afa4d0aa9ba1c454e9d98b8db
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 14 21:21:22 2023 +0300

    dnsforward: imp docs

commit 486bf86e5a2b51b6014a231386337a2d1e945c23
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 09:57:21 2023 +0300

    fix linter

commit aec088f233737fdfa0e7086148ceb79df0d2e39a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Sun Nov 12 16:13:46 2023 +0300

    client: validate rate limit subnets

commit d4ca4d3a604295cdfaae54e6e461981233eabf3e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 10 20:08:44 2023 +0300

    dnsforward: imp code

commit 5c11a1ef5c6fcc786d8496b14b9b16d1de1708cd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 10 15:07:56 2023 +0300

    all: ratelimit settings
2023-11-15 19:27:13 +03:00
Ildar Kamalov f44faa9be3 Pull request: pre-filling the new static lease window with data
Updates #6402

Squashed commit of the following:

commit 17c1c65b4e0bda827466cd882f8debbec92e0f9f
Merge: 056f5ce4c b1b5c41cf
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 14 14:20:34 2023 +0300

    Merge branch 'master' into ADG-7719

commit 056f5ce4cd00d82b1883cd6c7d5e331f34ac167f
Merge: 99bc4af7d 37b69b218
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 14 10:28:39 2023 +0300

    Merge branch 'master' into ADG-7719

commit 99bc4af7d80d6f4dd04ad103352882a1629cd44c
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:16:19 2023 +0300

    fix lint

commit 3aa6525203f7c882484689fd7b61347124812154
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:15:43 2023 +0300

    fix payload check

commit 9f5fbf9643e69e9b7e2c3bbfad8377f79e02027b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:14:14 2023 +0300

    fix changelog

commit 5b002d0dac064d2ab7144d268142335c9e006767
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 19:12:43 2023 +0300

    ADG-7719 filling the new static lease window with data
2023-11-14 14:44:46 +03:00
Ildar Kamalov b1b5c41cfe Pull request: request disabled protection duration on tab change
Updates #5759

Squashed commit of the following:

commit 970f88b142ba06eb328ed648f69e0547a5a46902
Merge: e2b624e44 37b69b218
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Nov 14 10:30:47 2023 +0300

    Merge branch 'master' into ADG-7199

commit e2b624e4473a9c42c60502dfa878abbc8393bdd6
Merge: ba79dedc6 fdf60eeed
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 13:08:10 2023 +0300

    Merge branch 'master' into ADG-7199

commit ba79dedc6551f5025b88c94897dcc7e65a314779
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Nov 13 10:56:36 2023 +0300

    changelog

commit a0c13fd1704198460c3c907beb17df77243a243b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Sun Nov 12 16:51:26 2023 +0300

    ADG-7199 request disabled protection duration on tab change
2023-11-14 14:18:38 +03:00
Ainar Garipov 37b69b2180 Pull request 2072: upd-chlog-deps
Squashed commit of the following:

commit fc63c08a89a3eb51da5a31cbb5f15aebb6a498f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 13 19:22:57 2023 +0300

    all: imp chlog

commit 5005d897c2c6128a9b7bc17901d6080870191d4e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 13 19:18:54 2023 +0300

    all: upd chlog, deps
2023-11-13 19:49:05 +03:00
Ainar Garipov b1b7b1cfe9 Pull request 2069: upd-all
Squashed commit of the following:

commit 7c37a6d8ad0d896cf4723859ba38c998c5f3a345
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Nov 13 14:31:07 2023 +0300

    all: upd go, flts, i18n, svcs, tools
2023-11-13 16:01:03 +03:00
Ildar Kamalov 4b9947da88 Pull request: fix schedule timezone
Updates #6401

Squashed commit of the following:

commit 0ed83fd52fe8cf9bd5a8d438e81534799a7fdd83
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Nov 10 16:09:04 2023 +0300

    ADG-7720 fix schedule timezone
2023-11-10 17:04:56 +03:00
Stanislav Chzhen 53170d8711 Pull request 2060: 6368-conf-ratelimit-subnet-len
Updates #6368.

Squashed commit of the following:

commit def3bd7c746c671efaf655c3cfbb1a7664becd85
Merge: 59d678c95 d3862614e
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 9 16:27:36 2023 +0300

    Merge branch 'master' into 6368-conf-ratelimit-subnet-len

commit 59d678c95978d4ab21b952ef0cae70cad1ad50d8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 8 18:16:40 2023 +0300

    all: imp chlog

commit 69d6a57d7facbdc6038612f31796f727adcb107f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 8 17:48:19 2023 +0300

    all: upd chlog

commit fa1998352618c839e248eb86c84e75933e0a5d0f
Merge: 236ba3bce f8fe9bfc8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 8 16:22:31 2023 +0300

    Merge branch 'master' into 6368-conf-ratelimit-subnet-len

commit 236ba3bceefbe6f9eeb6c70150f5a371f014f60d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 8 16:21:09 2023 +0300

    all: upd dnsproxy

commit 771af632f7795af6cdd53ffd81d0294165441439
Merge: 5a23b039e cbcc17a58
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 7 17:51:56 2023 +0300

    Merge branch 'master' into 6368-conf-ratelimit-subnet-len

commit 5a23b039e59d1ec5cb2bfea3942da7104db3b9bd
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 7 17:49:27 2023 +0300

    all: upd dnsproxy

commit 8b7aca3fbd21897183378470fd687380630602eb
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 3 16:37:41 2023 +0300

    all: upd chlog

commit bd7d23bacc08d8f907e0e7e07a48259bb9ed17e8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 3 15:52:06 2023 +0300

    all: conf ratelimit subnet len
2023-11-09 16:44:28 +03:00
Stanislav Chzhen d3862614e5 Pull request 2054: 6220-average-processing-time
Updates #6220.

Squashed commit of the following:

commit 2ad87979b4f8ade2cad8a1b86b8e0663dd53b098
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 9 13:55:09 2023 +0300

    all: upd go

commit 387200c3de899e6f59e8d2455cb2aa2b7194b311
Merge: 37f2855ed f8fe9bfc8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 9 13:49:59 2023 +0300

    Merge branch 'master' into 6220-average-processing-time

commit 37f2855ed104c20faa3f4d57d48bd221a59cacb3
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Nov 8 17:08:13 2023 +0300

    client: upd locales

commit a09be4183811cef29b594f9916dc76b87f89d304
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Nov 7 20:46:24 2023 +0300

    all: imp docs

commit f0b85ac1fef366da37b996d53e29d76d6279691f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 3 14:17:32 2023 +0300

    all: add todo

commit 48a5879865a1625410787edef6d78b309056af7b
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 3 13:38:14 2023 +0300

    all: add upstream time

commit 4d7431c00e24f8a9d3e86160851b5ef3bd9d03fa
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 31 17:27:19 2023 +0300

    all: upd chlog

commit 040b6b9cdebea2c9789d4d38f2a0a40ef4cb26d7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 31 15:42:04 2023 +0300

    all: imp average processing time
2023-11-09 16:14:05 +03:00
Ildar Kamalov cbcc17a58b Pull request 2055: ADG-7651 fix dashboard client cell ellipsis
Merge in DNS/adguard-home from ADG-7651 to master

Updates #6338.

Squashed commit of the following:

commit 21acb7a02ef39de478d894dfedaba5f2e32eff93
Merge: 1c0ba2c78 6a3906aa9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 3 17:12:55 2023 +0300

    Merge branch 'master' into ADG-7651

commit 1c0ba2c789289035aab236c1df5560185e80ef46
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Nov 2 10:06:48 2023 +0300

    changelog

commit 14d8a2c261d11eb65a540f6e45ed52cedcf43fd8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 31 18:04:18 2023 +0300

    fix changelog

commit bfc3f455380583592bfbc676a150c55276c201eb
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 31 18:03:24 2023 +0300

    changelog

commit 64cc673449ac20d015cda4c93129de60c1866aab
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 31 18:00:50 2023 +0300

    ADG-7651 fix dashboard client cell ellipsis
2023-11-03 17:24:30 +03:00
Ildar Kamalov 6a3906aa95 Pull request 2056: ADG-7673 fix filters list height
Merge in DNS/adguard-home from ADG-7673 to master

Updates #6358.

Squashed commit of the following:

commit c7fc33de1e8f32c526e3820e022556227a3e2d3c
Merge: 82368de34 ffdebc7b2
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 3 16:52:26 2023 +0300

    Merge branch 'master' into ADG-7673

commit 82368de34afbba5ca875f7402f53e84686bf8d5d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Nov 2 10:07:55 2023 +0300

    changelog

commit e8514638fb87b56a5598faec049afe105dcbed25
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Oct 31 18:31:35 2023 +0300

    ADG-7673 fix filters list height
2023-11-03 17:11:22 +03:00
Ildar Kamalov ffdebc7b2d Pull request 2058: ADG-7652 fix table titles scroll issue
Merge in DNS/adguard-home from ADG-7652 to master

Updates #6337.

Squashed commit of the following:

commit 3b10beacb3d2f44152c73412ec6e2ae1e77dafc3
Merge: 241c5ea18 f3817e441
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Nov 3 16:29:48 2023 +0300

    Merge branch 'master' into ADG-7652

commit 241c5ea18ab7ae0b4d945768a9dc5fc60309d0d6
Author: Ildar Kamalov <ik@adguard.com>
Date:   Thu Nov 2 10:12:23 2023 +0300

    changelog

commit 18afa19abf3a4fa08549b802e97e554199143ee7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Nov 1 11:31:11 2023 +0300

    ADG-7652 fix table titles scroll issue
2023-11-03 16:47:30 +03:00
Stanislav Chzhen f3817e4411 Pull request 2053: 6357-auth-log-remote-ip
Updates #6357.

Squashed commit of the following:

commit 0d375446204d126d3fc20db0a0718e849112450b
Merge: 61858bdec 52713a260
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 3 14:47:10 2023 +0300

    Merge branch 'master' into 6357-auth-log-remote-ip

commit 61858bdec27f9efb35c6fa5306ace1c0053300ca
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Nov 3 14:44:58 2023 +0300

    all: upd chlog

commit 1eef67261ff1e4eb667e11a58a5fe1f9b1dbdd7c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 2 19:20:41 2023 +0300

    home: imp code

commit 2956aed9054309ab15dc9e61bcae59b76ccd5930
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Thu Nov 2 16:10:07 2023 +0300

    home: imp docs

commit ca0f53d7c28d17287d80c0c5d1d76b21506acb64
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Tue Oct 31 15:08:37 2023 +0300

    home: imp code

commit 6b11b461180f1ee7528ffbaf37d5e76a1a7f208a
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 27 19:45:55 2023 +0300

    home: auth log remote ip
2023-11-03 16:07:15 +03:00
Stanislav Chzhen 62ec0d5adc Pull request 2052: 4977-multiple-domain-specific-upstreams
Updates #4977.

Squashed commit of the following:

commit da28c1b508b1aa4838d753fbb5fcac64a5fcebb9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 27 17:24:38 2023 +0300

    all: fix typo

commit d6bca6b252c9bd264737c93072869499afa24864
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Fri Oct 27 14:44:20 2023 +0300

    all: add todo

commit 30875515942c58881305aa963220d57d31e0e67d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Oct 25 20:00:17 2023 +0300

    all: imp docs

commit 04003c342fcf82aeb671938fb89592fd6baff16d
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date:   Wed Oct 25 16:59:14 2023 +0300

    all: multiple domain specific upstreams
2023-10-27 20:18:29 +03:00
Dimitry Kolyshev 2a56c78f26 Pull request: all: upd dep
Merge in DNS/adguard-home from 6204-dnsrewrite-important to master

Squashed commit of the following:

commit 379a1c4f3ec3784bc88a3250623e9f4852ef4cb2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:09:00 2023 +0300

    all: upd dep

commit 40485f9b791a22218bae76b0aa6cb8d87173ccb2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:07:58 2023 +0300

    all: upd dep

commit 8c09fe9d937be2c603c9632907edbcde60dd6680
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:04:25 2023 +0300

    docs: changelog

commit 33451738f5dd4b16bbba73bfe1cb495cb976abf9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:01:27 2023 +0300

    docs: changelog

commit cc94b4232c2990234d0bdfc510af58aef10d61a5
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 14:00:58 2023 +0300

    docs: changelog

commit adea5117cb0ca820556a8f00aafb8fd56f471e24
Merge: b90197e87 c0588146e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 13:58:13 2023 +0300

    Merge remote-tracking branch 'origin/master' into 6204-dnsrewrite-important

commit b90197e871e238404a27f43f51b12248a8cff79e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Oct 25 11:21:05 2023 +0300

    all: upd dep
2023-10-25 14:36:54 +03:00
Ildar Kamalov c0588146e7 Pull request: 6329 fix dark mode rewrite background
Updates #6329

Squashed commit of the following:

commit 4634d78971302cb757c20e007b9110e6f770017f
Merge: 681b7f6a2 f6e34adee
Author: Ildar Kamalov <ik@adguard.com>
Date:   Wed Oct 25 10:41:02 2023 +0300

    Merge branch 'master' into ADG-7627

commit 681b7f6a272686c93e6c3b54a430e2394d27488d
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 20 10:40:03 2023 +0300

    changelog

commit 1b00a8f770f42140de0be0eaf8e639cfdb253ad5
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 20 10:31:53 2023 +0300

    fix

commit ec6f9a55a2e8add51fcf9d47508c670088492db9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Oct 20 10:30:08 2023 +0300

    ADG-7627 fix rewrite background
2023-10-25 13:41:17 +03:00
Ainar Garipov f6e34adee7 Pull request 2050: all: upd quic-go
Updates #6335.

Squashed commit of the following:

commit b76b55862c9d8bec4dcc648f813c9f78c6475025
Merge: dda2c9f7f e3cc3b064
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 24 19:43:03 2023 +0300

    Merge branch 'master' into 6335-try-ecn-fix

commit dda2c9f7f5dbde7a5edb925654c65be029c61199
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 24 19:32:32 2023 +0300

    all: upd quic-go
2023-10-24 19:53:59 +03:00
Ainar Garipov 1d1de1bfb5 Pull request 2047: Upd chlog deps
Squashed commit of the following:

commit 3485c5bd6e0e93049723bd38a8e35cf99a61f653
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 18 19:45:19 2023 +0300

    all: upd chlog, deps
2023-10-18 19:54:42 +03:00
Ainar Garipov 763bbb5e6b Pull request 2046: fix-chlog
Squashed commit of the following:

commit 248ecfb16d5aaaa7b18b5210181ef433035b3c39
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Oct 17 18:35:14 2023 +0300

    all: fix chlog
2023-10-17 18:42:25 +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