[pull] master from AdguardTeam:master #106
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
Squashed commit of the following: commit 099a2eb Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 5 17:25:49 2023 +0300 all: upd proxy commit db07130 Merge: 9e6e8e7 75cb9d4 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 9e6e8e7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Nov 29 19:46:17 2023 +0300 all: imp tests commit e753bb5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Nov 29 13:35:21 2023 +0300 all: upd proxy ratelimit whitelist
Squashed commit of the following: commit 74089af Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 5 20:50:12 2023 +0300 dnsforward: fix nil deref
Squashed commit of the following: commit 83b7984 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Dec 6 17:35:26 2023 +0300 all: upd gen, go, i18n, tools
Updates #6420. Squashed commit of the following: commit 9c08b42 Merge: a9ee2fe 083abaa 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 a9ee2fe Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 6 18:26:01 2023 +0300 all: imp docs commit fabaab0 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 6 15:00:58 2023 +0300 ipset: currently known sets
Squashed commit of the following: commit a205c13 Merge: de289ff 214175e 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 de289ff Merge: b232209 a0ec0b2 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 b232209 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 5 19:20:30 2023 +0300 filtering: imp cognit commit 563aa45 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Dec 4 17:02:56 2023 +0300 all: imp code commit 064a00b Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Nov 28 18:41:07 2023 +0300 all: upd golibs
Squashed commit of the following: commit 1db293f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 7 18:32:52 2023 +0300 all: upd chlog, deps, tools
Squashed commit of the following: commit 5ab6acc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Dec 11 13:52:01 2023 +0300 all: upd proxy
Squashed commit of the following: commit 7fe0f60 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Dec 11 20:41:05 2023 +0300 all: upd chlog
Updates #4923. Squashed commit of the following: commit 762a3f9 Merge: 2af65b4 34a34dc 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 2af65b4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Dec 8 16:22:51 2023 +0300 dhcpsvc: imp code commit 71233b9 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Dec 8 15:26:25 2023 +0300 dhcpsvc: imp docs commit 2949544 Merge: 593e9ed 214175e 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 593e9ed Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Dec 7 16:45:10 2023 +0300 dhcpsvc: imp docs commit cdb1915 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Dec 7 16:33:56 2023 +0300 dhcpsvc: imp code commit a0c423c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 5 20:56:43 2023 +0300 dnspsvc: add opts commit 050ab7f Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 5 20:17:37 2023 +0300 WIP
Merge in DNS/adguard-home from AG-28194-plain-dns to master Squashed commit of the following: commit a033982 Merge: 03fc282 79d7a1e 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 03fc282 Merge: e31a659 34a34dc 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 e31a659 Merge: 0b735eb 7b5cce5 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 0b735eb Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 15:22:27 2023 +0200 Revert "safesearch: imp docs" This reverts commit bab6bf3. commit bab6bf3 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 15:21:23 2023 +0200 safesearch: imp docs commit aa5e6e3 Merge: 5038884 2b62901 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 5038884 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 14:47:23 2023 +0200 home: imp code commit 2b62901 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Dec 8 11:55:25 2023 +0300 client: add plain dns description commit 3d51fc8 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 10:15:53 2023 +0200 all: changelog commit 59697b5 Merge: 81a15d0 b668c04 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 81a15d0 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 0cf2f88 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 2f32c59 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 13:14:04 2023 +0200 home: imp code commit 01e21a2 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 12:14:02 2023 +0200 all: imp docs commit b6beec6 Author: Ildar Kamalov <ik@adguard.com> Date: Thu Dec 7 12:42:21 2023 +0300 client: fix reset settings commit 9344850 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 10:55:25 2023 +0200 home: imp code commit eb32f82 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 7 10:42:23 2023 +0200 home: imp code commit 873d141 Merge: 6276596 214175e 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 6276596 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Dec 6 17:39:14 2023 +0300 client: handle plain dns setting commit ffdbf05 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 1 15:12:50 2023 +0200 home: http dns plain ... and 1 more commit
Updates #6352. Squashed commit of the following: commit 79d24e0 Merge: 04c2759 c908eec 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 04c2759 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 12 11:14:13 2023 +0200 all: fix changelog commit 78d726e Merge: 2d2c174 79d7a1e 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 2d2c174 Merge: 2b1c1ea 7b5cce5 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 2b1c1ea Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 15:24:02 2023 +0200 all: changelog commit 38afdba Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 15:21:23 2023 +0200 safesearch: imp docs commit e941f5e Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 14:43:39 2023 +0200 dnsforward: imp code commit 8dedb4a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 14:26:51 2023 +0200 dnsforward: imp tests commit 8f23ade Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 13:33:50 2023 +0200 all: safesearch cnames commit 061a6de Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 13:09:32 2023 +0200 all: changelog commit 6f7ff7f Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 8 13:07:36 2023 +0200 all: safesearch cnames
Squashed commit of the following: commit e4c2abd Merge: 7411b40 dae304f 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 7411b40 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 12 17:51:51 2023 +0300 all: imp code commit d5edd02 Merge: 371f5b2 c908eec 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 371f5b2 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 12 13:44:38 2023 +0300 client: imp code commit 9aefb14 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 8 17:08:07 2023 +0300 all: imp code commit 3aa51d1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 5 19:20:41 2023 +0300 all: imp docs commit 71d7187 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 1 17:17:06 2023 +0300 all: imp code commit e09f8a0 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Nov 30 14:46:53 2023 +0300 all: imp log msg commit ce0a945 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Nov 28 16:21:01 2023 +0300 all: imp code commit e84f176 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Nov 22 17:40:18 2023 +0300 all: add client runtime
Updates #6541. Squashed commit of the following: commit e79507f Merge: 1a09de9 d328327 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Dec 18 14:29:21 2023 +0300 Merge branch 'master' into 6541-hosts-nodata commit 1a09de9 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Dec 14 18:24:56 2023 +0300 filtering: separate files commit e00d1d2 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Dec 14 18:00:52 2023 +0300 filtering: fix hosts nodata
Squashed commit of the following: commit 2da8c17 Merge: 5cea6a6 4fc6bf5 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 5cea6a6 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 19 17:53:21 2023 +0300 filtering/rulelist: imp docs, tests commit f01434b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 14 19:17:02 2023 +0300 filtering/rulelist: imp names commit fe2bf68 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 14 19:07:53 2023 +0300 all: go mod tidy commit c7081d3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Thu Dec 14 19:03:33 2023 +0300 filtering/rulelist: add filter
Signed-off-by: bakito <github@bakito.ch>
Updates #6564. * commit '9bfad46a6ca813fe1d6e50b7039476351f2c68c6': openapi: upd chlog correct schema type for client upstreams_cache_size
Squashed commit of the following: commit 2c7ee92 Merge: 67313ec 4698579 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 67313ec Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 19 20:02:31 2023 +0300 all: imp docs commit f073dc4 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 19 18:33:51 2023 +0300 upd: chlog commit 109dbb1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Dec 19 17:23:58 2023 +0300 stats: interval
Squashed commit of the following: commit bf6cfdb Merge: 3c532f5 4bc5c34 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Dec 25 13:35:45 2023 +0300 Merge branch 'master' into fix-nil-deref commit 3c532f5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 20 13:59:29 2023 +0300 home: fix nil deref
Squashed commit of the following: commit afb5a0d Merge: 09ac43c abf20c6 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 09ac43c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 14:36:07 2023 +0200 openapi: imp docs commit d0fbd43 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 11:47:10 2023 +0200 all: changelog commit 105f9c5 Merge: 62a2cf1 4bc5c34 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 62a2cf1 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Dec 22 10:52:59 2023 +0200 openapi: imp docs commit 87956c4 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Thu Dec 21 12:08:07 2023 +0200 dnsforward: imp code commit bf74d67 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 15:46:38 2023 +0200 dnsforward: imp code commit 3a98dee Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 15:41:06 2023 +0200 dnsforward: imp code commit 1499da1 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 13:36:28 2023 +0200 dnsforward: imp code commit 228c61a Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Dec 20 13:06:11 2023 +0200 dnsforward: imp code commit 069ee22 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 19 12:39:25 2023 +0200 dnsforward: imp code commit 90919f9 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 19 12:10:43 2023 +0200 confmigrate: fix commit a8c3299 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Dec 19 12:08:05 2023 +0200 dnsforward: imp code commit 58b53cc Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Dec 18 15:10:01 2023 +0200 all: conf upstream mode
Updates #6480. Squashed commit of the following: commit 03d73fe Merge: b6f9bd5 1511fab Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Dec 25 14:50:08 2023 +0300 Merge branch 'master' into 6480-upd-proxy commit b6f9bd5 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 19 19:31:14 2023 +0300 dnsforward: imp code, docs commit db0356c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 19 17:21:53 2023 +0300 all: log changes commit 0cbb0e8 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Dec 19 16:26:34 2023 +0300 all: upd proxy
Updates #6409. Squashed commit of the following: commit 7dea2a3 Merge: 959b618 ad147ac 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 959b618 Merge: ca02da2 4bc5c34 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 ca02da2 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 22 15:12:12 2023 +0300 all: imp docs commit 183eab1 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Dec 21 17:29:39 2023 +0300 all: upd chlog commit 51c7a52 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Dec 18 20:23:13 2023 +0300 all: cache ttl override
Squashed commit of the following: commit 4767b7b Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 27 14:30:10 2023 +0300 all: fix non-anonymized ips in stats
Updates #6568 Squashed commit of the following: commit cea0e91 Merge: 6f4a5b1 b42063e Author: Ildar Kamalov <ik@adguard.com> Date: Thu Dec 28 13:40:47 2023 +0300 Merge branch 'master' into ADG-7953 commit 6f4a5b1 Merge: c574e3f d75712b Author: Ildar Kamalov <ik@adguard.com> Date: Wed Dec 27 16:29:53 2023 +0300 Merge branch 'master' into ADG-7953 commit c574e3f Author: Ildar Kamalov <ik@adguard.com> Date: Wed Dec 27 09:52:20 2023 +0300 ADG-7953 add etc timezones to the timezones list
Squashed commit of the following: commit 6605cd1 Merge: 5b294a2 bec3cab 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 5b294a2 Merge: afe4d5f d75712b 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 afe4d5f Merge: 05dc0bf ad147ac 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 05dc0bf Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 20 19:44:04 2023 +0300 home: imp err msg commit c3b21c7 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Dec 18 15:05:29 2023 +0300 all: imp docs commit a2118f5 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 15 18:27:50 2023 +0300 all: add persistent client uid
Squashed commit of the following: commit 18d865f Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Dec 29 17:32:03 2023 +0500 all: upd proxy
Updates #6570. Squashed commit of the following: commit 92b2723 Merge: 2da1228 0143c3a 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 2da1228 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Tue Jan 9 17:04:54 2024 +0300 all: imp tests commit 1cb404c Merge: 5f7d205 94d437d 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 5f7d205 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Dec 27 15:07:54 2023 +0300 all: imp docs commit 0b17cfc Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Dec 25 20:06:09 2023 +0300 all: querylog size memory
Squashed commit of the following: commit 69d2310 Merge: 76df040 58b47ad Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 16 12:22:52 2024 +0300 Merge branch 'master' into ADG-7965 commit 76df040 Author: Ildar Kamalov <ik@adguard.com> Date: Fri Jan 12 13:18:21 2024 +0300 remove changelog commit e79b7bf Merge: df0f189 1e0ff4d Author: Ildar Kamalov <ik@adguard.com> Date: Fri Jan 12 13:17:50 2024 +0300 Merge branch 'master' into ADG-7965 commit df0f189 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 10 19:21:34 2024 +0300 fix changelog commit 8143087 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 10 18:04:24 2024 +0300 handle empty string commit e9e672c Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 9 16:15:02 2024 +0300 changelog commit 34fb9b7 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
Updates #6321. Squashed commit of the following: commit 033f4d4 Merge: febf5b5 f7995aa Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Jan 16 12:42:50 2024 +0300 Merge branch 'master' into 6321-upd-proxy commit febf5b5 Merge: 7e4b247 58b47ad Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Jan 16 12:34:28 2024 +0300 Merge branch 'master' into 6321-upd-proxy commit 7e4b247 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Jan 12 14:37:28 2024 +0300 all: upd proxy revision commit 0e925c1 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Jan 11 14:24:47 2024 +0300 dnsforward: imp code commit 6f5c271 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Jan 10 16:34:02 2024 +0300 all: use caching resolver more, imp code commit ce3f313 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Jan 10 16:00:08 2024 +0300 all: log changes commit ce90dbc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Jan 10 13:01:25 2024 +0300 dnsforward: use caching resolvers commit 208fbaf Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Jan 10 12:52:15 2024 +0300 all: upd proxy
Squashed commit of the following: commit b3c6c20 Merge: dfd1eff 6dbeb5b Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 16 13:31:45 2024 +0300 Merge branch 'master' into ADG-7988 commit dfd1eff Merge: 2de46aa f7995aa Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 16 12:42:39 2024 +0300 Merge branch 'master' into ADG-7988 commit 2de46aa Merge: ac5a23c 1e0ff4d Author: Ildar Kamalov <ik@adguard.com> Date: Fri Jan 12 13:19:39 2024 +0300 Merge branch 'master' into ADG-7988 commit ac5a23c Author: Ildar Kamalov <ik@adguard.com> Date: Thu Jan 11 10:28:07 2024 +0300 fix error commit d0103f4 Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 10 19:19:22 2024 +0300 ADG-7988 fix client schedule update
Squashed commit of the following: commit a0527b8 Merge: 512edaf 9694f19 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 17 13:15:18 2024 +0300 Merge branch 'master' into AG-27492-client-persistent-ids commit 512edaf Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Mon Jan 15 15:50:28 2024 +0300 home: imp docs commit 4d4b359 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jan 11 20:20:42 2024 +0300 home: imp code commit 8031347 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jan 11 18:46:20 2024 +0300 home: fix typo commit 5932b18 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jan 11 16:52:49 2024 +0300 home: imp code more commit 9412f58 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Jan 11 15:41:23 2024 +0300 home: imp code commit 855d320 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 10 20:24:49 2024 +0300 home: add tests commit 112f1bd Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 29 18:29:11 2023 +0300 home: imp code commit 8b295bf Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Fri Dec 29 14:58:17 2023 +0300 home: persistent client ids
Squashed commit of the following: commit b153bbc Merge: d16da0c 4508ae8 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jan 17 13:56:34 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs commit d16da0c Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jan 17 09:52:03 2024 +0200 all: imp code commit 46aeca7 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed Jan 17 09:50:10 2024 +0200 all: imp code commit 32bc83c Merge: ee51c60 6dbeb5b Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jan 16 15:42:32 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs # Conflicts: # go.mod # go.sum commit ee51c60 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jan 16 10:56:38 2024 +0200 all: upd libs commit 02c1dbd Merge: 1daba83 58b47ad Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue Jan 16 10:53:54 2024 +0200 Merge remote-tracking branch 'origin/master' into AG-28961-upd-golibs commit 1daba83 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jan 15 11:15:05 2024 +0200 all: upd dnsproxy commit b1670e8 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Mon Jan 15 10:46:27 2024 +0200 dnsforward: imp code commit 7b65a50 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Fri Jan 12 14:14:34 2024 +0200 all: upd golibs
Updates #6644. Co-authored-by: Eugene Burkov <E.Burkov@AdGuard.COM> Squashed commit of the following: commit a79f4a3 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 17 19:53:58 2024 +0300 all: upd chlog commit 9106dfb Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 17 19:43:34 2024 +0300 home: fix nil deref
Squashed commit of the following: commit 8fd3ef2 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Jan 19 16:08:37 2024 +0300 all: rm outdated link from readme
Squashed commit of the following: commit 834ed84 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Wed Jan 24 17:40:42 2024 +0300 client: upd filtering syntax links
Squashed commit of the following: commit 857c53d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Jan 25 21:07:29 2024 +0300 all: fix chlog
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )