Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[pull] master from AdguardTeam:master (#112)
* Pull request 2138: AG-27492-client-persistent-storage Squashed commit of the following: commit 37e33ec Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Feb 14 15:25:25 2024 +0300 aghalg: imp code commit 6b2f09a Merge: b8ea924 3773628 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 b8ea924 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 13 19:07:52 2024 +0300 home: imp tests commit aa6fec0 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 13 14:54:28 2024 +0300 home: imp docs commit 10637fd Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 8 20:16:11 2024 +0300 all: imp code commit b45c7d8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Feb 7 19:15:11 2024 +0300 aghalg: add tests commit 7abe33d Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Feb 6 20:50:22 2024 +0300 all: imp code, tests commit 4a44e99 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 1 14:59:11 2024 +0300 all: persistent client index commit 66b16e2 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 31 15:06:05 2024 +0300 aghalg: ordered map * Pull request 2150: AG-28455 rc versions Squashed commit of the following: commit 9b80bf2 Merge: 2c18415 fede297 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 2c18415 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Feb 14 13:01:30 2024 +0300 scripts: imp code commit f096505 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Feb 13 14:52:10 2024 +0300 scripts: imp code commit a5bed23 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Feb 12 18:35:52 2024 +0300 scripts: fix typo commit 36e9ea1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Feb 12 15:41:57 2024 +0300 scripts: revert changes, imp docs commit d74c85d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Feb 5 18:12:38 2024 +0300 all: mark rc versions separately * Pull request 2152: 4923 gopacket DHCP vol.7 Updates AdguardTeam#4923. Squashed commit of the following: commit 0f90eb3 Merge: 38b3165 bd99e3e 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 38b3165 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Feb 19 14:52:01 2024 +0300 dhcpsvc: imp docs commit 0a07892 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Feb 19 14:48:19 2024 +0300 dhcpsvc: imp code commit 30691f0 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Feb 15 19:57:41 2024 +0300 dhcpsvc: imp code, dry commit 20f5ef8 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Feb 15 15:57:09 2024 +0300 dhcpsvc: finish leases methods * Pull request 2153: 6610-hostsfile-enabled Updates AdguardTeam#6610. Squashed commit of the following: commit 13522f0 Merge: befa3bd 6fd0a62 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Feb 21 12:53:08 2024 +0300 Merge branch 'master' into 6610-hostsfile-enabled commit befa3bd Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Feb 19 15:56:20 2024 +0300 all: upd chlog commit c195430 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 15 20:52:52 2024 +0300 home: hostsfile enabled * Pull request 2156: 6717-conf-path-logs Updates AdguardTeam#6717. Squashed commit of the following: commit 05a7e18 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Feb 21 16:44:00 2024 +0300 home: imp docs, logs * Fix blank settings page when access clients first * Pull request 2155: AG-27492-client-persistent-index Squashed commit of the following: commit 1f99640 Merge: 5a9211e 9276afd 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 5a9211e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Feb 22 19:08:35 2024 +0300 all: add todo commit a4fc949 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Feb 21 14:48:33 2024 +0300 all: client persistent index * Pull request 2154: 6723 caching bootstrap Updates AdguardTeam#6723. Squashed commit of the following: commit 594286c Merge: 17411a7 31c3d7d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Feb 28 14:01:06 2024 +0300 Merge branch 'master' into 6723-caching-bootstrap commit 17411a7 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Feb 26 20:51:01 2024 +0300 all: up[d finally commit f47491c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Feb 21 14:25:49 2024 +0300 all: log changes commit a04fc78 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Feb 20 16:30:08 2024 +0300 all: upd proxy * Pull request 2161: Upd Go Squashed commit of the following: commit 3047031 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 6 15:42:57 2024 +0300 all: log changes better commit c47f31a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 6 15:33:19 2024 +0300 bamboo-specs: upd img commit 5286ca1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 6 14:59:18 2024 +0300 tools: upd go commit fd5e94f Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 6 14:11:05 2024 +0300 all: upd go * Pull request 2160: AG-30904-fix-ip-in-logs Squashed commit of the following: commit 0a54ca2 Merge: 1d30c09 5565b9e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 6 16:19:36 2024 +0300 Merge branch 'master' into AG-30904-fix-ip-in-logs commit 1d30c09 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 5 17:14:02 2024 +0300 all: missing ip in logs * Pull request 2162: upd-all Squashed commit of the following: commit 206c01e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 6 17:54:21 2024 +0300 all: upd i18n, svcs, tools, trackers * Pull request 2165: upd-chlog Squashed commit of the following: commit 74c903d Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 7 15:44:52 2024 +0300 all: upd chlog * Pull request: fix served from cache label Updates AdguardTeam#6740. Squashed commit of the following: commit a3cb491 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Mar 7 17:15:55 2024 +0300 fix tooltip label commit 4ab301e Merge: 6bc325d 5388ad5 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Mar 7 17:08:45 2024 +0300 Merge branch 'master' into ADG-8259 commit 6bc325d Author: Ildar Kamalov <ik@adguard.com> Date: Thu Mar 7 09:58:35 2024 +0300 fix icon commit 8274faa Author: Ildar Kamalov <ik@adguard.com> Date: Thu Mar 7 09:56:50 2024 +0300 ADG-8259 fix server from cache label * Pull request 2159: Upd proxy Squashed commit of the following: commit 4468e82 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 11 13:50:36 2024 +0300 all: upd dnsproxy commit 7887f52 Merge: 9120da6 36f9fec Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 11 13:50:09 2024 +0300 Merge branch 'master' into upd-proxy commit 9120da6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 5 11:50:16 2024 +0300 all: upd proxy * Pull request 2164: 6712-hourly-graphs Updates AdguardTeam#6712. Squashed commit of the following: commit dd4c822 Merge: 7320786 28a6b9f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Mar 12 12:38:19 2024 +0300 Merge branch 'master' into 6712-hourly-graphs commit 7320786 Merge: ca29ee8 5388ad5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 7 16:25:49 2024 +0300 Merge branch 'master' into 6712-hourly-graphs commit ca29ee8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 7 14:41:45 2024 +0300 all: upd chlog commit 9d6154a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 7 14:10:32 2024 +0300 all: hourly graphs * Pull request 2169: fix-rc Squashed commit of the following: commit 153271c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Mar 12 18:08:26 2024 +0300 all: rm trigger for rc * Pull request 2171: AG-28455 remove checkout Squashed commit of the following: commit 3b90850 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 15:34:11 2024 +0300 version: sort version strings commit 7a9cb73 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 13:02:36 2024 +0300 all: account candidate channel commit 76d2374 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 12 20:02:55 2024 +0300 bamboo-specs: add todo commit f99c726 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 12 20:01:38 2024 +0300 bamboo-specs: revert release commit 70a3b3e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Mar 12 19:58:20 2024 +0300 bamboo-specs: rm explicit checkout * Pull request 2173: upd-all Squashed commit of the following: commit 19b10b5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 13 17:20:52 2024 +0300 client: upd i18n more commit 9f44193 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 13 17:04:55 2024 +0300 all: upd deps, i18n, svcs * Pull request 2174: 6820 Warn local ptrs Squashed commit of the following: commit c231965 Merge: c6162a2 bcd1430 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Mar 14 18:10:20 2024 +0300 Merge branch 'master' into 6820-warn-local-ptrs commit c6162a2 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 19:35:20 2024 +0300 dnsforward: fix doc commit c6cce96 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 19:19:49 2024 +0300 all: fix private conf fail on start commit c11fc3e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Mar 13 18:43:31 2024 +0300 WIP * Pull request 2175: split-snap-docker Squashed commit of the following: commit 895f50c Merge: 5bd2edd 4e3b53f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 14 19:11:32 2024 +0300 Merge branch 'master' into split-snap-docker commit 5bd2edd Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 14 19:00:06 2024 +0300 bamboo-specs: split snap docker, use go-builder * Pull request 2176: AG-20945-rule-list-engine Squashed commit of the following: commit 56756b2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Mar 15 15:40:39 2024 +0300 all: imp code, docs, tests commit 45849e6 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 14 20:18:07 2024 +0300 rulelist: add engine, textengine * Pull request 2178: upd-chlog Squashed commit of the following: commit 026be50 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 17:57:17 2024 +0300 all: upd chlog * Pull request 2179: upd-docker Squashed commit of the following: commit 17e145c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:49:18 2024 +0300 bamboo-specs: upd builder img commit d6399a0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:35:01 2024 +0300 bamboo-specs: fix frontend build commit 9f4cbf5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:21:50 2024 +0300 bamboo-specs: fix yaml commit a26d2ab Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:18:57 2024 +0300 all: use new docker imgs * Pull request 2166: 5829-trusted-ip Updates AdguardTeam#5829. Squashed commit of the following: commit 8a93b30 Merge: 8e4429c 54f77c0 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 20 19:15:07 2024 +0300 Merge branch 'master' into 5829-trusted-ip commit 8e4429c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 20 18:37:26 2024 +0300 all: upd chlog commit b598a8d Merge: 1f58bf8 0542339 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 20 18:34:13 2024 +0300 Merge branch 'master' into 5829-trusted-ip commit 1f58bf8 Merge: ffb4b9a c64a36c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Mar 20 17:09:09 2024 +0300 Merge branch 'master' into 5829-trusted-ip commit ffb4b9a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 14 17:40:07 2024 +0300 home: fix alignment commit 7f11807 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 14 17:35:13 2024 +0300 all: imp code commit 2aee9a6 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 11 18:17:58 2024 +0300 home: real ip in logs * Pull request 2180: fix-docker-build Squashed commit of the following: commit 8713a08 Merge: 7eed5e8 3b12ff2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 20:26:11 2024 +0300 Merge branch 'master' into fix-docker-build commit 7eed5e8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 20:12:16 2024 +0300 bamboo-specs: fix docker build * Pull request 2181: imp-docs Squashed commit of the following: commit 1f7be03 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 21 13:35:37 2024 +0300 all: use standard md style in some docs * Pull request 2182: AG-20945-rule-list-id Squashed commit of the following: commit 87bad8c Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 21 16:39:12 2024 +0300 all: imp lint, names, tests commit 284f8c7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Mar 21 15:37:54 2024 +0300 filtering: imp id handling * Pull request 2184: 6851 upstream mode reset Updates AdguardTeam#6851. Squashed commit of the following: commit ffc50da Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 25 17:55:39 2024 +0300 all: fix changelog commit cdc2193 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 25 17:28:06 2024 +0300 dnsforward: fix upstream mode set * Pull request: 6717-fix-conf-symlink Updates AdguardTeam#6717. Squashed commit of the following: commit d17a6de Merge: 806ff9b 9305c45 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Apr 1 09:22:33 2024 +0800 Merge remote-tracking branch 'origin/master' into 6717-fix-conf-symlink # Conflicts: # CHANGELOG.md commit 806ff9b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Mar 28 09:00:00 2024 +0800 home: imp code commit 06dbcfe Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 27 13:55:30 2024 +0800 all: changelog commit 5476625 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Mar 27 13:43:17 2024 +0800 home: fix conf symlink usage * Pull request 2188: imp-readme Squashed commit of the following: commit 1abd78a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Apr 1 17:53:50 2024 +0300 all: imp readme; add projects * Pull request 2190: 6758-embed-tzdata Closes AdguardTeam#6758. Squashed commit of the following: commit d62b427 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 2 18:25:34 2024 +0300 all: add docs commit bb129d7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 2 17:04:42 2024 +0300 all: upd chlog commit 59573d9 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 2 15:38:42 2024 +0300 all: embed tzdata * Pull request 2187: upd-golibs Squashed commit of the following: commit 63c14cf Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 2 20:10:10 2024 +0300 all: imp code, docs commit 185ccdd Merge: b6ca80a d4fff41 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 2 20:04:23 2024 +0300 Merge branch 'master' into upd-golibs commit b6ca80a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Apr 2 20:01:10 2024 +0300 all: upd to tags commit 474f623 Author: Ainar Garipov <a.garipov@adguard.com> Date: Tue Mar 26 16:33:45 2024 +0300 all: upd golibs * Pull request 2194: upd-all Squashed commit of the following: commit 483b77a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 3 20:41:12 2024 +0300 all: upd docker commit 6fff1f8 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 3 20:25:07 2024 +0300 all: upd go, i18n, flts, svcs * Pull request 2195: upd-go-code Squashed commit of the following: commit a1bd3c2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 4 14:59:37 2024 +0300 all: upd more commit 9e55bbb Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Apr 4 14:12:45 2024 +0300 all: upd go code * Pull request 2183: AG-27492-client-runtime-index Squashed commit of the following: commit d0b37e3 Merge: 025c29b ee619b2 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 4 18:58:08 2024 +0300 Merge branch 'master' into AG-27492-client-runtime-index commit 025c29b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 1 17:20:15 2024 +0300 client: imp code commit 548a15c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Mar 28 13:43:17 2024 +0300 all: add tests commit c9015e7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 25 16:33:30 2024 +0300 all: imp docs commit 81e8b94 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 25 15:33:17 2024 +0300 all: imp code commit 1428d60 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Mar 25 14:45:01 2024 +0300 all: client runtime index * Pull request 2197: upd-chlog Squashed commit of the following: commit 85deb72 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Apr 5 18:30:40 2024 +0300 all: upd chlog * Pull request 2189: 5345-ipset-file-comments Updates AdguardTeam#5345. Squashed commit of the following: commit 66ceac9 Merge: 8be4dce 82247d7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 5 19:05:48 2024 +0300 Merge branch 'master' into 5345-ipset-file-comments commit 8be4dce Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 2 14:56:21 2024 +0300 all: upd chlog commit 53c7213 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 2 14:48:56 2024 +0300 dnsforward: ipset file comments * chore: fix function names in comment Signed-off-by: looklose <shishuaiqun@yeah.net> * Pull request 2193: AGDNS-1982 Upd proxy Closes AdguardTeam#6854.Updates AdguardTeam#6875. Squashed commit of the following: commit b98adbc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 10 19:21:44 2024 +0300 dnsforward: upd proxy, imp code, docs commit 4de1eb2 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 10 16:09:58 2024 +0300 WIP commit afa9d61 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 19:24:09 2024 +0300 all: log changes commit c834067 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 19:06:10 2024 +0300 dnsforward: move code commit 08bb7d4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 18:09:46 2024 +0300 dnsforward: imp code commit b27547e Merge: b7efca7 6f36ebc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 17:33:19 2024 +0300 Merge branch 'master' into AGDNS-1982-upd-proxy commit b7efca7 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 9 17:27:14 2024 +0300 all: upd proxy finally commit 3e16fa8 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Apr 5 18:20:13 2024 +0300 dnsforward: upd proxy commit f3cdfc8 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 20:37:32 2024 +0300 all: upd proxy, golibs commit a79298d Merge: 9feeba5 fd25dca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 20:34:01 2024 +0300 Merge branch 'master' into AGDNS-1982-upd-proxy commit 9feeba5 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 20:25:57 2024 +0300 all: imp code, docs commit 6c68d46 Merge: d8108e6 ee619b2 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 4 18:46:11 2024 +0300 Merge branch 'master' into AGDNS-1982-upd-proxy commit d8108e6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 3 19:25:27 2024 +0300 all: imp code commit 2046156 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Apr 3 17:10:33 2024 +0300 all: remove private rdns logic * Pull request 2206: upd-golibs Squashed commit of the following: commit bb94329 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Apr 15 13:53:23 2024 +0300 all: upd golibs * Pull request 2199: 5812-query-log-client-id Updates AdguardTeam#5812. Squashed commit of the following: commit 43aa147 Merge: 97ab712 36986a8 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 15 15:00:36 2024 +0300 Merge branch 'master' into 5812-query-log-client-id commit 97ab712 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 11 14:22:58 2024 +0300 all: upd chlog commit 525ac91 Merge: 5d4db3f ff7c715 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 11 14:15:28 2024 +0300 Merge branch 'master' into 5812-query-log-client-id commit 5d4db3f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 10 16:19:11 2024 +0300 dnsforward: client id priority * Pull request 2205: AGDNS-1982 Fix RDNS HTTP Squashed commit of the following: commit a7d5023 Merge: 0be18b9 df7f19e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Apr 15 15:11:51 2024 +0300 Merge branch 'master' into AGDNS-1982-fix-rdns-http commit 0be18b9 Merge: 54c1017 36986a8 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Apr 15 15:04:42 2024 +0300 Merge branch 'master' into AGDNS-1982-fix-rdns-http commit 54c1017 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Apr 15 14:00:14 2024 +0300 all: log changes commit 851a1a3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Apr 15 13:44:13 2024 +0300 dnsforward: fix http private rdns * Pull request 2202: Fix access error Squashed commit of the following: commit 5507401 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 16 17:16:41 2024 +0300 all: rm replace commit 983f8d1 Merge: d9fc69d 201ac73 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Apr 16 16:06:28 2024 +0300 Merge branch 'master' into fix-access-error commit d9fc69d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 11 19:18:24 2024 +0300 all: fix before request, upd golibs * Pull request 2201: 6192-access-ipv6-zone Updates AdguardTeam#6192. Squashed commit of the following: commit e98c2f0 Merge: 4dd9218 6f7d5cc Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 16 17:24:38 2024 +0300 Merge branch 'master' into 6192-access-ipv6-zone commit 4dd9218 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 16 16:12:24 2024 +0300 all: upd chlog commit e126e12 Merge: d57c34c 201ac73 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 16 14:34:45 2024 +0300 Merge branch 'master' into 6192-access-ipv6-zone commit d57c34c Merge: decb768 df7f19e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 15 16:26:57 2024 +0300 Merge branch 'master' into 6192-access-ipv6-zone commit decb768 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 11 17:06:54 2024 +0300 all: upd chlog commit c8184be Merge: 5e0059b ff7c715 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Apr 11 16:52:10 2024 +0300 Merge branch 'master' into 6192-access-ipv6-zone commit 5e0059b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 10 16:59:37 2024 +0300 dnsforward: access ipv6 zone * Pull request: AG-31778-fix-safesearch-https Squashed commit of the following: commit 85ea3d9 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 18 15:19:38 2024 +0200 all: imp docs commit b0695da Merge: a79f98f 48c6242 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 17 11:06:49 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https # Conflicts: # CHANGELOG.md commit a79f98f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 17 11:05:34 2024 +0200 dnsforward: imp code commit b901a11 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 11:03:52 2024 +0200 dnsforward: imp code commit fb6e669 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 10:08:51 2024 +0200 all: safesearch rewrites commit 88add21 Merge: b78ad8f 201ac73 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 09:43:20 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https # Conflicts: # CHANGELOG.md commit b78ad8f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Apr 12 13:34:39 2024 +0200 all: safesearch rewrites commit fb3efbb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 13:15:37 2024 +0200 safesearch: imp code commit 1193c70 Merge: 14e823d ff7c715 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 13:13:44 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31778-fix-safesearch-https # Conflicts: # CHANGELOG.md commit 14e823d Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 13:11:43 2024 +0200 all: safesearch https commit cd403a2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Apr 11 12:09:27 2024 +0200 Revert "all: safesearch https" This reverts commit 1c9564b. commit 1c9564b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 12:41:47 2024 +0200 all: safesearch https commit 5f42688 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 09:22:30 2024 +0200 filtering: imp code commit eb9bd9f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 09:19:22 2024 +0200 all: changelog commit 0c77c70 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 10 08:55:22 2024 +0200 safesearch: imp tests commit 492a93f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 9 14:45:16 2024 +0200 all: changelog commit a665e72 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 9 14:41:24 2024 +0200 safesearch: https req * Pull request 2207: 6882 Extend private rDNS Updates AdguardTeam#6882. Squashed commit of the following: commit 80fa6d6 Merge: c0fdf1a 762ef4a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Apr 22 18:53:18 2024 +0300 Merge branch 'master' into 6882-extend-private-rdns commit c0fdf1a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 18 18:19:36 2024 +0300 client: imp ui text commit f07a509 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 18 16:22:11 2024 +0300 all: imp docs, upd proxy commit 0d33079 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 18 12:48:50 2024 +0300 all: upd proxy * Pull request: 6717-freebsd-daemon Updates AdguardTeam#6717. Squashed commit of the following: commit ae80a77 Merge: 73bd061 f85d048 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 23 13:26:05 2024 +0200 Merge remote-tracking branch 'origin/master' into 6717-freebsd-daemon commit 73bd061 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Apr 14 10:23:14 2024 +0200 home: imp freebsd daemon * Pull request: AG-31863-dnsforward-tests Merge in DNS/adguard-home from AG-31863-dnsforward-tests to master Squashed commit of the following: commit cbdad62 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 24 15:00:15 2024 +0200 dnsforward: imp tests commit b71304a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 24 12:53:51 2024 +0200 dnsforward: imp tests commit 3c42fca Merge: 50888df 60f48e2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 24 08:41:19 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests commit 50888df Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 24 08:39:37 2024 +0200 dnsforward: imp code commit dcd5e41 Merge: af2507b f85d048 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 23 10:02:45 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests commit af2507b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 23 10:01:30 2024 +0200 dnsforward: imp tests commit 67fc9d3 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Apr 22 10:37:45 2024 +0200 dnsforward: imp tests commit e7f7df2 Merge: c610a6c 762ef4a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Apr 22 09:51:04 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests commit c610a6c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Apr 19 12:28:49 2024 +0200 dnsforward: imp tests commit ca252e8 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Apr 19 11:58:49 2024 +0200 dnsforward: imp tests commit 9d4de18 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Apr 19 11:38:15 2024 +0200 dnsforward: imp tests commit a349374 Merge: 2243770 48c6242 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Apr 17 11:02:56 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests commit 2243770 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 10:56:40 2024 +0200 dnsforward: imp tests commit 4c4b565 Merge: f1e4b72 201ac73 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Apr 16 10:53:48 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-31863-dnsforward-tests commit f1e4b72 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Apr 15 12:36:21 2024 +0200 dnsforward: imp tests commit 6ee6cc9 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Sun Apr 14 13:55:09 2024 +0200 dnsforward: add test * Pull request 2209: 6422-upd-quic-go Updates AdguardTeam#6422. Squashed commit of the following: commit 6baf47e Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 24 16:37:15 2024 +0300 all: upd again commit 2ad480a Merge: 5b260d0 0cff3db Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 24 16:37:02 2024 +0300 Merge branch 'master' into 6422-upd-quic-go commit 5b260d0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 24 14:39:35 2024 +0300 all: upd quic-go * Pull request 2200: 6312-client-ipv6-zone Updates AdguardTeam#6312. Squashed commit of the following: commit bd9146e Merge: 58d2fd9 856cc40 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 18:09:19 2024 +0300 Merge branch 'master' into 6312-client-ipv6-zone commit 58d2fd9 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 18:00:56 2024 +0300 client: imp naming commit 922a14b Merge: 6f4d58f 60f48e2 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 14:29:00 2024 +0300 Merge branch 'master' into 6312-client-ipv6-zone commit 6f4d58f Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 14:27:55 2024 +0300 client: imp docs commit fa292ee Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 22 19:20:28 2024 +0300 client: fix typo commit 599414b Merge: 5025717 762ef4a Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 22 18:42:06 2024 +0300 Merge branch 'master' into 6312-client-ipv6-zone commit 5025717 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Apr 22 18:39:22 2024 +0300 all: imp code; add tests commit 155b2fe Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 16 19:56:00 2024 +0300 all: upd chlog; imp code commit 7a4426c Merge: e9c1cbb 48c6242 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Apr 16 19:52:00 2024 +0300 Merge branch 'master' into 6312-client-ipv6-zone commit e9c1cbb Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 10 16:23:07 2024 +0300 client: client ipv6 zone * Pull request 2211: fix-i18n Squashed commit of the following: commit 7f15bcb Merge: 0f2efaa c1ee2c7 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 24 20:01:42 2024 +0300 Merge branch 'master' into fix-i18n commit 0f2efaa Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Apr 24 19:54:35 2024 +0300 client: imp i18n * Pull request 2212: 6744 Upd proxy Updates AdguardTeam#6744. Squashed commit of the following: commit 160694a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Apr 26 14:46:04 2024 +0300 all: upd to release commit b7dd961 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 25 20:45:04 2024 +0300 all: fix tags commit 2374845 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Apr 25 19:54:39 2024 +0300 all: upd proxy * dnsforward, home: imp more * Pull request 2210: AG-32341-client-duplicate-uids Squashed commit of the following: commit 6f83ec8 Merge: 2fea9c0 2383ab5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 26 19:23:15 2024 +0300 Merge branch 'master' into AG-32341-client-duplicate-uids commit 2fea9c0 Merge: 672a30c b9d5e5b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 26 14:00:49 2024 +0300 Merge branch 'master' into AG-32341-client-duplicate-uids commit 672a30c Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Apr 26 13:59:59 2024 +0300 all: upd chlog commit 7c2b26e Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 21:08:47 2024 +0300 all: imp chlog commit fcca9af Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Apr 24 18:56:34 2024 +0300 all: fix client duplicate uids * Pull request 2214: 6744 Fix TLD subdomain Updates AdguardTeam#6744. Squashed commit of the following: commit 04894ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu May 2 16:48:37 2024 +0300 all: upd proxy finally commit 0cb063e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu May 2 15:26:17 2024 +0300 all: upd again commit 3deb71c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu May 2 14:46:38 2024 +0300 all: upd proxy * Pull request 2217: Upd Go Squashed commit of the following: commit a5be7f9 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed May 8 15:01:52 2024 +0300 all: upd go --------- Signed-off-by: looklose <shishuaiqun@yeah.net> Co-authored-by: Stanislav Chzhen <s.chzhen@adguard.com> Co-authored-by: Eugene Burkov <e.burkov@adguard.com> Co-authored-by: Ainar Garipov <a.garipov@adguard.com> Co-authored-by: Hoàng Rio <donghoang.nguyen@outlook.com> Co-authored-by: Dimitry Kolyshev <dkolyshev@adguard.com> Co-authored-by: Ildar Kamalov <ik@adguard.com> Co-authored-by: looklose <shishuaiqun@yeah.net>
- Loading branch information