Commit Graph

3076 Commits

Author SHA1 Message Date
Eugene Burkov 3f1b71fdf3 Pull request: 2981 fix double answers
Merge in DNS/adguard-home from 2981-fix-dnsrewrite to master

Closes #2981.
Updates #2923.

Squashed commit of the following:

commit 578754d194a9a9dd0d47e5af7b6c2f315eaa1d1d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 23 17:07:24 2021 +0300

    all: upd urlfilter
2021-04-26 17:18:42 +03:00
Ainar Garipov 45840948f5 Pull request #1136: dnsforward: lower log level of non-crit err
Updates #3008.

Squashed commit of the following:

commit d02f9befef8db1f1e7f21fb98b59b47c0c275887
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 26 16:30:44 2021 +0300

    dnsforward: lower log level of non-crit err
2021-04-26 16:41:50 +03:00
Ainar Garipov 51372d5c34 Pull request: all: upd dnsproxy, fix root reqs with custom upstreams for domains
Updates #2994.

Squashed commit of the following:

commit e255f1c3af9d5c760a61533b12726b49eb26442a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 23 15:38:37 2021 +0300

    all: upd dnsproxy, fix root reqs with custom upstreams for domains
2021-04-23 16:26:37 +03:00
Ainar Garipov cb01eaa7f7 Pull request: all: imp go version setting and detection
Merge in DNS/adguard-home from imp-make to master

Squashed commit of the following:

commit 9ecb3422a55f5d010000bf4253a2766fefa67173
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 22 19:59:36 2021 +0300

    all: fix spelling

commit c136f6562af80a67e627b472621ac68763f85fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 22 19:50:07 2021 +0300

    all: imp go version setting and detection
2021-04-22 20:06:34 +03:00
Ainar Garipov 138dfaa85b Pull request: home: rm unnecessary func
Merge in DNS/adguard-home from imp-test to master

Squashed commit of the following:

commit 0ef7812e32b74647b43bb1d69b569e9b102e92b3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 22 14:12:00 2021 +0300

    home: rm unnecessary func
2021-04-22 14:18:20 +03:00
Eugene Burkov 4165e0ef3a Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master

Close #2574.

Squashed commit of the following:

commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 22 13:26:25 2021 +0300

    home: imp tests, docs

commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 22 12:20:15 2021 +0300

    home: fix whois test
2021-04-22 13:38:24 +03:00
Eugene Burkov 2d87a0458e Pull request: 2829 rm util
Merge in DNS/adguard-home from 2829-finally to master

Closes #2829.

Squashed commit of the following:

commit 22b287d5c2cbeced1b48747a1c4b6431c1052f12
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 18:39:54 2021 +0300

    util: rm
2021-04-21 18:50:33 +03:00
Ainar Garipov c9a5a5b9c8 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit 63048521bf6df01d1b247a3b1b8b1baf05320720
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 16:38:23 2021 +0300

    client: upd i18n
2021-04-21 16:48:03 +03:00
Ainar Garipov c9c2a79a55 Pull request: bamboo-specs: fix cron
Merge in DNS/adguard-home from labor-code-2 to master

Squashed commit of the following:

commit e69df9f5f1cfa9d2b2593810d4bf4a1e6a7f97d6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 15:28:54 2021 +0300

    bamboo-specs: fix cron
2021-04-21 15:35:58 +03:00
Ainar Garipov 34c87ea709 Pull request: bamboo-specs: no dailies on weekends
Merge in DNS/adguard-home from labor-code to master

Squashed commit of the following:

commit 0e283c60830c66162ff2482eebf2d544139a3eb6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 15:14:32 2021 +0300

    bamboo-specs: no dailies on weekends
2021-04-21 15:24:53 +03:00
Ainar Garipov aee09d29e9 Pull request: dhcpd: fix dbload panic
Closes #2991.

Squashed commit of the following:

commit cd820a9a903d628aa5964f8f973edc7bb7993ae5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 14:34:45 2021 +0300

    dhcpd: fix err handling

commit 775b834683f0edb5954b20fedb896e6af1fa843e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 14:21:41 2021 +0300

    dhcpd: fix build for go1.15

commit 8441d6fffa72cc6890fad2df76559e21819786d6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 21 14:05:08 2021 +0300

    dhcpd: fix dbload panic
2021-04-21 14:42:19 +03:00
Eugene Burkov 2e4e1973d9 Pull request: 2606 substitute nclient4 with fork
Merge in DNS/adguard-home from 2606-rm-nclient4 to master

Closes #2606.

Squashed commit of the following:

commit a9abc3ac27b19ef0ab6c4dea8610d97034b24ec2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 13:22:56 2021 +0300

    nclient4: rm

commit abcd0042a7f0d1fbf7ebb398a06414bbc7fc2528
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 13:19:11 2021 +0300

    all: clear changes

commit d1bc3b83f00be07bf9bb97cfe6ef773e07ae8710
Merge: 1b1ab0b9 c2667558
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 21 12:58:48 2021 +0300

    Merge branch 'master' into 2606-rm-nclient4

commit 1b1ab0b9796552854ecffefe8e79ca24b472fed0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 19 18:53:04 2021 +0300

    dhcpd: subst nclient4 with fork
2021-04-21 13:41:18 +03:00
Eugene Burkov c26675585d Pull request: 2843 upd dnsproxy
Merge in DNS/adguard-home from 2843-upd-dnsproxy to master

Closes #2843.

Squashed commit of the following:

commit c3ffddcbf85cbd2542c5bb111984a8f422113a24
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 20 19:39:11 2021 +0300

    all: fix docs

commit 4b596e4776bfc05e4171bc53e8f9c55c88e1e6a5
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 20 19:25:24 2021 +0300

    all: imp code, docs

commit 8e3655f4f888ccc2c0902373cf8dd2aa4e113857
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 20 18:41:14 2021 +0300

    all: upd dnsproxy
2021-04-21 12:49:41 +03:00
Ainar Garipov 55cd4ae254 Pull request: home: fix 8 to 9 migration
Updates #2988.

Squashed commit of the following:

commit 1b9f145be0dbcca9848e02942cea294315baa9cc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 20 18:41:05 2021 +0300

    home: fix 8 to 9 migration
2021-04-20 18:56:15 +03:00
Ainar Garipov 93638a1936 Pull request: all: add string set
Merge in DNS/adguard-home from add-strset to master

Squashed commit of the following:

commit 2500df1805dee425eafd0503983ec631de02af0b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 20 15:09:59 2021 +0300

    all: add string set
2021-04-20 16:26:19 +03:00
Ainar Garipov 71030bafd8 Pull request: all: imp dhcp host normalization, validation
Updates #2952.

Squashed commit of the following:

commit 45afcab5d33c1ec8176c0ad05423288c8770b772
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 20 15:02:34 2021 +0300

    all: imp docs

commit d844ce1e2bb0b92a892119161774ec95f3e59711
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 20 14:57:49 2021 +0300

    all: more code imp

commit eef08cb69015ead0ffaef866e12a2c6556786d37
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 20 14:52:33 2021 +0300

    all: imp code, docs

commit 20748f20ab9fcc410b11daf0e23eaf156dcdc7cd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 20 14:30:57 2021 +0300

    all: imp dhcp host normalization, validation
2021-04-20 15:07:57 +03:00
Ainar Garipov cd9eb3b3e4 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit b5cb0e164845fafe21964c91d14b804ec0b48606
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 16:21:14 2021 +0300

    client: upd i18n

commit 13ee98d64a4bd1953ea71cd51a15f5dc7cf4cf9e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 16:11:58 2021 +0300

    client: upd i18n
2021-04-19 16:35:01 +03:00
Ainar Garipov d707f8b1d1 Pull request: all: imp dhcp client hostname normalization
Updates #2952.
Updates #2978.

Squashed commit of the following:

commit 20e379b94ccf8140fd9056429315945c17f711a5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 15:58:37 2021 +0300

    all: imp naming

commit ed300e0563fa37e161406a97991b26a89e23903a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 19 15:43:09 2021 +0300

    all: imp dhcp client hostname normalization
2021-04-19 16:04:40 +03:00
Eugene Burkov 91304663b7 Pull request: 2954 wrong logs
Merge in DNS/adguard-home from 2954-wrong-logs to master

Closes #2954.

Squashed commit of the following:

commit 94c77a4dfcadbbf4f44ba4c6b30d4d00d98e659b
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 19:15:18 2021 +0300

    all: log changes

commit b5095715e7ba7fd99a03869a97cf7291daaa4fc4
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 19:09:46 2021 +0300

    go.mod: upd golibs

commit 70ec262f7bf177e4f9c7a9ee345ec2694e27a549
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 17:57:25 2021 +0300

    home: fix config logging

commit f45c407b400431ac0501b915a3070c6071112fee
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 15:00:55 2021 +0300

    home: fix rdns logging
2021-04-16 10:32:41 +03:00
Ainar Garipov d83091fc1f Pull request: all: allow local non-top-level domains
Updates #2961.

Squashed commit of the following:

commit 207eeb85caf6caee81a669302daf4e10a5b61585
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 18:48:50 2021 +0300

    all: allow local non-top-level domains
2021-04-15 19:00:31 +03:00
Ainar Garipov a1450c5595 Pull request: all: do not use dhcp clients when server is off
Closes #2934.

Squashed commit of the following:

commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 17:39:46 2021 +0300

    dnsforward: imp spacing

commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 17:33:44 2021 +0300

    dnsforward: imp code

commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 17:06:03 2021 +0300

    all: do not use dhcp clients when server is off
2021-04-15 17:52:53 +03:00
Eugene Burkov b0013065a2 Pull request: 2723 autogenerate hostnames
Merge in DNS/adguard-home from 2723-dhcp-hostnames to master

Updates #2723.

Squashed commit of the following:

commit f9b9d2269c25cabd225ba712730f04496ab81715
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 16:47:31 2021 +0300

    aghnet: fix test

commit a2845d1003093ce38870b2cc89e9bd98ea2b8249
Merge: 74e450c9 0bcea347
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 16:45:59 2021 +0300

    Merge branch 'master' into 2723-dhcp-hostnames

commit 74e450c919b4c39ed6f8489aea398b225a4c6861
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 16:44:08 2021 +0300

    all: imp code, docs

commit 77cdb1232d18c8a2642b7131f051e318844c2c47
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 15 14:29:40 2021 +0300

    all: add gen func, use it
2021-04-15 16:59:05 +03:00
Ainar Garipov 0bcea34767 Pull request: client: imp setup guide
Merge in DNS/adguard-home from imp-setup-guide to master

Squashed commit of the following:

commit 06c92e34293849bb3c0c2195b69ea7e0aa366f17
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 15 14:54:40 2021 +0300

    client: imp setup guide
2021-04-15 15:43:04 +03:00
Eugene Burkov 69f526b13d Pull request: 2956 fix clients disabling
Merge in DNS/adguard-home from 2956-fix-flag to master

Closes #2956.
Updates #1947.

Squashed commit of the following:

commit ffb98f752f6d4c40ea166ff1e482edcd7f028513
Merge: 800d67db 7be2fc37
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 19:01:34 2021 +0300

    Merge branch 'master' into 2956-fix-flag

commit 800d67db84786c8fe93d38b6aa932aa4dd4dd345
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Apr 14 18:54:26 2021 +0300

    home: fix clients disabling
2021-04-14 19:18:48 +03:00
Ainar Garipov 7be2fc37e6 Pull request: client: imp i18n
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 9befed3c5b1d113972df9fbcc3245b7be1a0eaf5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 18:53:29 2021 +0300

    client: imp en

commit c543428e6302620577ac699701d23967b9b1909d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 18:49:26 2021 +0300

    client: imp i18n
2021-04-14 19:00:29 +03:00
Ainar Garipov b3f6592a5f Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit b264cd4e3de284cc1ed70f07797b4f4510f28018
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 14:51:38 2021 +0300

    client: imp ja

commit cdda71a28e75e5494a9d903001d8f48be109010f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 14 14:12:14 2021 +0300

    client: upd i18n
2021-04-14 14:56:38 +03:00
Ainar Garipov c82080e1a7 Pull request: clear working directory after each build to prevent agent's disk bloat
Merge in DNS/adguard-home from clean-working-directory to master

Squashed commit of the following:

commit cf5908c8bff984544f6d6fcad5bcd0b8e2109225
Author: Константин Замякин <sc@adguard.com>
Date:   Wed Apr 14 02:06:20 2021 +0300

    clear working directory after each build to prevent agent's disk bloat
2021-04-14 12:40:48 +03:00
Ainar Garipov 39b9807f19 Pull request: client: upd i18n
Updates #2643.

Squashed commit of the following:

commit d923a934d9bca757f5abd26abc616197e5f1fec9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 19:10:08 2021 +0300

    client: upd ru

commit 114483ee80a0c850a0c25ce9c419e5d1f69d2fec
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 18:43:03 2021 +0300

    client: imp en

commit 1e57298d66d67ab4a2cbb1c3045094eefb05d667
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:46:07 2021 +0300

    client: fix ru

commit 5baca6561d844fe257ff6f3a70d64c9a7dc2273f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:39:51 2021 +0300

    client: upd i18n
2021-04-13 19:36:55 +03:00
Ainar Garipov 7d8f01b88a Pull request: bamboo-specs: fix notification url
Merge in DNS/adguard-home from bamboo-fix to master

Squashed commit of the following:

commit 8b04bcc350a196cf1a4e98c559b41e9e262ce539
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 17:23:33 2021 +0300

    bamboo-specs: fix notification url
2021-04-13 17:35:58 +03:00
Eugene Burkov d7b2d63e4c Pull request: 1868 fix rdns
Merge in DNS/adguard-home from 1868-rdns-ipv6 to master

Updates #2943.
Updates #2704.

Squashed commit of the following:

commit 53d67ecf17ed4f9c544344288b58f3596c7246e2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 13 16:18:33 2021 +0300

    all: imp code, docs

commit 2bc15941b87f92b6fa0a7568538e02700a4385a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 13 16:09:08 2021 +0300

    all: imp code
2021-04-13 16:23:36 +03:00
Ainar Garipov 773f02cf7d Pull request: dhcpd: normalize client host
Updates #2946.

Squashed commit of the following:

commit f830c03ddee65f7e86c43baa00a7dcc022091d93
Merge: df6c83d7 327e76cd
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:55:58 2021 +0300

    Merge branch 'master' into 2946-norm-dhcp-host

commit df6c83d7d117b718110a035216e708d5131bf71c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:49:03 2021 +0300

    dhcpd: imp docs

commit 1407e9bd7b7694bd3069349faba3ec9ff5eb468b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:27:38 2021 +0300

    dhcpd: normalize client host
2021-04-13 16:00:09 +03:00
Ainar Garipov 327e76cd65 Pull request: 2842 DHCP validation ui
Closes #2842.

Squashed commit of the following:

commit 8580db9d3fd6bdd906bf53ca3696fc497f7573b8
Merge: a5d7187b ab85ad5a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 15:29:06 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit a5d7187bba1ae3595bbc26a362ff27aae81a7048
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 15:08:28 2021 +0300

    fix: revert deleted translation

commit 50169266111032f6de3bc159ba562ee9580532fb
Merge: 46adf2c0 48d702f7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 14:39:40 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit 46adf2c05b6bedd55e60475eac060347db6572b7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 14:13:12 2021 +0300

    fix: no-bitwise

commit 1afc4030a5ea885545e51748976724959f87fb26
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 13:57:43 2021 +0300

    fix: IPv4 in CIDR validation

commit 2035a3f6a2d7026b9055bab64a265ac1b56abd74
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 11:58:03 2021 +0300

    fix: translations

commit 6dd455f7dbf92987663b433b7cb8e21c9d0e5b82
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 11:57:27 2021 +0300

    fix: MAC validation

commit 281e49a2e2b974e0c7eb89547661aed8238a5d0c
Merge: 48b50ce9 65553a29
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 6 18:12:06 2021 +0300

    Merge branch 'master' into 2842-dhcp-validation-ui

commit 48b50ce9ce84479c43c3d6fc824853dc0b17ac1e
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Apr 5 19:04:35 2021 +0300

    Add leases ip validation

commit 8630f3bf5f03451c3a49c4ce4ebee3a86d16b6a1
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Apr 5 13:59:16 2021 +0300

    Add helper for subnet to bitmap mask conversion, write test

commit 80dc7a8d19b27cecc50e2c610619574374f363d3
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Apr 2 17:46:27 2021 +0300

    2842 Update DHCP range validation in UI
2021-04-13 15:29:28 +03:00
Eugene Burkov ab85ad5a55 Pull request: home: fix help
Merge in DNS/adguard-home from fix-help to master

Updates #2893.

Squashed commit of the following:

commit df84e0968c036ad0d1978dc6170214058ef07255
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 13 14:51:53 2021 +0300

    home: fix help
2021-04-13 15:13:28 +03:00
Ainar Garipov 48d702f76a Pull request: all: fix client custom upstream comments
Updates #2947.

Squashed commit of the following:

commit 498a05459b1aa00bcffee490acfeecb567025971
Merge: 6a7a2f87 21e2c419
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:40:29 2021 +0300

    Merge branch 'master' into 2947-cli-ups-comment

commit 6a7a2f87cfd2bdd829b82889890511fef8d84b9b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:34:28 2021 +0300

    all: imp code, tests

commit abc0be239f69cfc3e7d0cde2fc952d9157b2cd5d
Merge: 82fb3fcb 6410feeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:17:09 2021 +0300

    Merge branch 'master' into 2947-cli-ups-comment

commit 82fb3fcb49cbc8d439cb5959c1cb84ae49b2257e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 22:13:41 2021 +0300

    all: fix client custom upstream comments
2021-04-13 13:44:29 +03:00
Ainar Garipov 21e2c419b9 Pull request: client: imp letter case consistency
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 209c0aa8ebaea976558012707154c27813b40fa6
Merge: 758aa913 6410feeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 13 13:16:41 2021 +0300

    Merge branch 'master' into imp-i18n

commit 758aa913f5c1916c40c58ad5e511e0e3b8d57951
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 20:38:25 2021 +0300

    client: imp letter case consistency
2021-04-13 13:39:45 +03:00
Ildar Kamalov 6410feeb45 Merge: client: fix charts height
Closes #2944

Squashed commit of the following:

commit c8c6a0533df0123f458603cc204f1f796b9e59d8
Author: Ildar Kamalov <ik@adguard.com>
Date:   Tue Apr 13 10:56:02 2021 +0300

    client: fix charts height
2021-04-13 11:19:45 +03:00
Ainar Garipov 90f96eafe8 Pull request: all: try reenabling newer github cache action
Merge in DNS/adguard-home from gh-cache to master

Squashed commit of the following:

commit 0134aa2f6f3892064572222819214c2185b1ac58
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 18:38:23 2021 +0300

    all: try reenabling newer github cache action
2021-04-12 19:05:13 +03:00
Eugene Burkov e671f43a2f Pull request: 1947 disable autohosts option
Merge in DNS/adguard-home from 1947-hosts-opt to master

Updates #1947.
Updates #2829.

Squashed commit of the following:

commit d09285c3dbfa7816469eec223b88c320c255c8fe
Merge: cff8c4cd 7c6557b0
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 18:23:20 2021 +0300

    Merge branch 'master' into 1947-hosts-opt

commit cff8c4cdbf4bcd1f5f413c541d7f4a9e42b8b05b
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:46:19 2021 +0300

    home: fix help

commit 1fa01d5b30f5adeda564dcc85a7064e2921d5981
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:40:48 2021 +0300

    home: fix option order

commit 9d83cb604aaddcc8cbe99bafa544636f8f0b7e54
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:28:30 2021 +0300

    aghnet: add important todo

commit 7f1386ff5c3081e07e975b640164a7a05e1319c9
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 17:17:17 2021 +0300

    all: correct naming

commit cbe2b2e4b21d5bceb3ee88e09cad154ba62b5cef
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 15:55:46 2021 +0300

    all: mv functionality from util

commit e82ad53862682d903dd0dd10844db65997a758bc
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 15:41:35 2021 +0300

    home: imp code, docs

commit 9058977f3ff99648fabaebbd7c1c354c71671327
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Apr 12 15:02:34 2021 +0300

    home: add an option to disable autohosts
2021-04-12 18:31:45 +03:00
Ainar Garipov 7c6557b05e Pull request: querylog: more opt
Updates 1273.

Squashed commit of the following:

commit 167c0b5acaab8a2676de2cea556c861dc0efbc72
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 18:12:43 2021 +0300

    querylog: imp naming

commit 5010ad113e46335011a721cbcc9fc9b1fc623722
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 17:53:41 2021 +0300

    querylog: more opt
2021-04-12 18:22:11 +03:00
Ainar Garipov 279350e4a3 Pull request: querylog: opt client search
Updates #1273.

Squashed commit of the following:

commit 6c2cc73e3360ae12aaa6e2c9834fddfdba925e2b
Merge: effe2230 fb72d543
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 14:05:04 2021 +0300

    Merge branch 'master' into 1273-querylog-opt

commit effe22303fb2053dfe22b6242231b40f4d462735
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 13:21:06 2021 +0300

    querylog: opt client search
2021-04-12 14:10:20 +03:00
Ainar Garipov fb72d543a3 Pull request: client: imp en locale
Merge in DNS/adguard-home from imp-i18n to master

Squashed commit of the following:

commit 637cff971fe0823f46ea070f3868d0823bed66a3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Apr 12 13:43:17 2021 +0300

    client: imp en locale
2021-04-12 14:03:28 +03:00
Ainar Garipov 8b8319fca0 Pull request: 2704 local addresses vol.4
Updates #2704.

Squashed commit of the following:

commit bbc292a1c9dc7382e1116cfd85fea22ab8de6949
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Apr 9 19:22:46 2021 +0300

    all: replace exchanger with proxy
2021-04-09 21:01:21 +03:00
Ainar Garipov 0247a2da44 Pull request: all: imp shell code
Merge in DNS/adguard-home from imp-sh to master

Squashed commit of the following:

commit 212f03f3d6e0824428c28ffd79cac8f5ea271d9c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Apr 9 14:51:59 2021 +0300

    all: imp shell code
2021-04-09 15:07:18 +03:00
Ainar Garipov 6a8f6357e2 Pull request: all: mv IsOpenWrt
Updates #2829.

Squashed commit of the following:

commit a284a26ba5df101c78e6f866d1bdfa540d205666
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 20:34:20 2021 +0300

    aghos: fix darwin

commit 9dbd42d75ebb048c83dbd06a1f09d950b3d12181
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 20:11:56 2021 +0300

    all: mv IsOpenWrt
2021-04-08 20:42:04 +03:00
Ainar Garipov 8c7f2b77d5 Pull request: bamboo-specs: push the docker image
Merge in DNS/adguard-home from spec-docker-push to master

Squashed commit of the following:

commit 73c76cf61463e2982911b8407ca368da5a9e8133
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 18:19:27 2021 +0300

    bamboo-specs: push the docker image
2021-04-08 18:24:42 +03:00
Eugene Burkov 7afc692632 Pull request: 2889 internal hosts restriction
Merge in DNS/adguard-home from 2889-imp-autohosts to master

Closes #2889.

Squashed commit of the following:

commit 1d3b649364f991c092851c02d99827769cce8b70
Merge: abc6e1c8 1a214eaa
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 8 17:59:51 2021 +0300

    Merge branch 'master' into 2889-imp-autohosts

commit abc6e1c8830e41a774c6d239ddd7b722b29df93e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 8 17:34:56 2021 +0300

    dnsforward: imp code

commit 4b2b9140d3e2526a935216ba42faba9b86b9ef3f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Apr 8 17:31:34 2021 +0300

    dnsforward: respond with nxdomain

commit 814667417a1b02c152a034852858b96412874f85
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Apr 6 19:16:14 2021 +0300

    dnsforward: restrict the access to intl hosts for ext clients
2021-04-08 18:07:29 +03:00
Ainar Garipov 1a214eaabc Pull request: bamboo-specs: use our docker image in snap stage
Merge in DNS/adguard-home from spec-snap-docker to master

Squashed commit of the following:

commit 2a43d33ba712152b0322f2e7ecdf1167c34d3435
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 17:51:07 2021 +0300

    bamboo-specs: use our docker image in snap stage
2021-04-08 17:56:27 +03:00
Ainar Garipov 1e3fc990eb Pull request: all: fix specs, imp docs
Merge in DNS/adguard-home from fix-specs-2 to master

Squashed commit of the following:

commit 687c5ead52ba4939ea89405a9a326c23e72c502b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:38:34 2021 +0300

    all: fix specs, imp docs
2021-04-08 16:44:01 +03:00
Ainar Garipov c5f4d0ce44 Pull request: bamboo-specs: cd into dist
Merge in DNS/adguard-home from fix-specs to master

Squashed commit of the following:

commit 4a46f6f417e3a82c3adc819dc5428125f97bd747
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 8 16:20:16 2021 +0300

    bamboo-specs: cd into dist
2021-04-08 16:24:59 +03:00
Ainar Garipov 1c87dc577d Pull request: all: add bamboo specs
Merge in DNS/adguard-home from add-specs to master

Squashed commit of the following:

commit 011f9ae643e84b9bcd407cba5d86c586a73f7366
Merge: 856364fb 80ed8be1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 20:20:32 2021 +0300

    Merge branch 'master' into add-specs

commit 856364fb55901f977b6e25fa3cd90be5f680d3ad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 14:35:00 2021 +0300

    all: fix awk invocation

commit 202a04f5dd0860c094c887d7fdb71e6424a6d0ce
Merge: cdd95cfa 00a61fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 20:49:05 2021 +0300

    Merge branch 'master' into add-specs

commit cdd95cfa4e6be74acd4d15a2908504e9e27f29d8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 18:03:55 2021 +0300

    all: fix specs

commit fe2a3017f5c88d429ca6f962dee293338d55919f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:30:45 2021 +0300

    all: use the correct gpg key

commit a28eff00f7a98a078e34c2b16e887c05364b6087
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:14:28 2021 +0300

    all: imp Makefile, specs

commit 6faa3c0687387e4fd60433d326a99da01dd21b02
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 16:50:41 2021 +0300

    all: add bamboo specs
2021-04-08 13:55:12 +03:00