a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,777 Commits 3 Branches 0 Tags 192 MiB
Commit Graph

2777 Commits

Author SHA1 Message Date
Andrey Meshkov 3e9edd9eac Pull request: Minor code improvement - added tests for safebrowsing and parental control services 
Merge in DNS/adguard-home from sbpctests to master

Squashed commit of the following:

commit 56df4dac20fcdba319543e8b15d9420ec247b68d
Merge: 0dcec1d8 1c1a7683
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Jan 27 15:06:53 2021 +0300

    Merge branch 'master' into sbpctests

commit 0dcec1d85362142b51443ab2ae0de0b4fd2a9676
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Jan 27 14:13:18 2021 +0300

    applied suggestion

commit 166b659458a68e0c395028aa3dea580c5118544c
Merge: e15e5cf6 dde5d798
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Jan 27 14:02:47 2021 +0300

    merge

commit e15e5cf6a7a9cbf4ffdb24197fc7062e931bdf34
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Jan 27 14:00:27 2021 +0300

    Fix review comments

commit dde5d798faa0f20b41f9252acfd4a83f9b8b19e3
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Jan 27 13:10:03 2021 +0300

    fixed comment style

commit 3a77bc89cc0d1994d7a9de450b2796b6c27bd3dc
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Jan 27 12:57:11 2021 +0300

    Minor code improvement - added tests for safebrowsing and parental control services
 2021-01-27 15:21:39 +03:00
Ainar Garipov 1c1a7683ef Pull request: all: imp github issue template 
Merge in DNS/adguard-home from imp-issue-tmpl to master

Squashed commit of the following:

commit bc918f70367d2b1f0e9531068f0a60b4dc123807
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 27 14:12:06 2021 +0300

    all: imp github issue template
 2021-01-27 14:24:41 +03:00
Eugene Burkov c215b82004 Pull request: 2552 rm context.TODO() instances 
Merge in DNS/adguard-home from 2552-context to master

Closes #2552.

Squashed commit of the following:

commit 3d1cef33da529f4611869c4a0f2f294a3c8afcaf
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 26 19:28:23 2021 +0300

    all: fix docs

commit d08c78cf4b96419b928e73c497768f40c9e47bc2
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 26 19:22:00 2021 +0300

    all: doc changes

commit c2814f4d0025be74f38299e7e66e7c0193b6c15f
Merge: 100a1a09 44c7221a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 26 19:12:55 2021 +0300

    Merge branch 'master' into 2552-context

commit 100a1a0957bc22bfaccb1693e6b9b1c5cb53ed13
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 26 19:10:03 2021 +0300

    home: imp docs, fix naming

commit 22717abe6c0e4c1016a53ff2fac1689d0762c462
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 26 18:14:07 2021 +0300

    home: improve code quality

commit 5c96f77a2b315e2c1ad4a11cc7a64f61bdba52a3
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 25 20:28:51 2021 +0300

    home: add docs

commit 323fc013a57a5c06ec391003133b12f4eb2721cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 25 14:50:11 2021 +0300

    home: rm context.TODO() instances
 2021-01-26 19:44:19 +03:00
Ainar Garipov 44c7221ae9 Pull request: all: rm ignored test, outdated tag 
Merge in DNS/adguard-home from rm-outdated to master

Squashed commit of the following:

commit 38669542f98a8267b06197518078a8c06de670b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 26 18:04:08 2021 +0300

    all: rm ignored test, outdated tag
 2021-01-26 18:35:51 +03:00
Ainar Garipov abf8f65f05 Pull request: Remove Docker VOLUME instruction for more flexibility 
Merge in DNS/adguard-home from 2589-docker-volumes to master

Squashed commit of the following:

commit 5bff6ffa3138e9c09b786e4ff26fe286daa78c05
Merge: f0e9a74c e71019a1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jan 25 14:45:15 2021 +0300

    Merge branch 'master' into 2589-docker-volumes

commit f0e9a74cc3d8baecaac68730b684e65ec3178886
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jan 25 14:44:07 2021 +0300

    all: doc changes

commit 76e538ca5f086fa99328dc10a05e7ca581457192
Author: Alex Povel <alex.povel@tuhh.de>
Date:   Thu Jan 21 15:07:11 2021 +0100

    Remove Docker VOLUME instruction for more flexibility

    Inheriting from the base image is made easier without
    the VOLUME instruction, since it cannot be reverted.
    All guides contain `--volume` explanations/usage
    examples anyway, so the VOLUME instructions in the
    Dockerfile aren't necessary.

    See also https://stackoverflow.com/a/62068396/11477374 for more
    examples for why that instruction can be harmful.
 2021-01-25 18:07:49 +03:00
Ainar Garipov e71019a1f3 Pull request: all: imp dev version handling 
Merge in DNS/adguard-home from fix-version to master

Squashed commit of the following:

commit ecef63315fb49ae33b4c3f13c0e0be0668340e2b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 22 18:59:17 2021 +0300

    updater: imp tests

commit f5243918567430e467c44a48e45169db4560b58b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 22 18:48:10 2021 +0300

    all: imp dev version handling
 2021-01-25 14:09:29 +03:00
Eugene Burkov fb9acf4cbd Pull request: 2509 type-safety logs 
Merge in DNS/adguard-home from 2509-type-safety-log to master

Updates #2509.

* commit '684017a75f918aa0dcd76792c34aecd35fa01b01':
  all: log changes
 2021-01-22 18:29:58 +03:00
Eugene Burkov 684017a75f all: log changes 2021-01-22 17:58:46 +03:00
Ainar Garipov 5dffef53cd Pull request: scripts: add doq, dnscrypt, and beta client ports to docker 
Merge in DNS/adguard-home from docker-ports to master

Squashed commit of the following:

commit 8f4f7cbd321d415634880fc1c23f50c488be907b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 22 16:05:29 2021 +0300

    scripts: add more ports, imp docs

commit 758a95a20cfecdaa098589b95f2a938f8610c7d4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 22 15:17:21 2021 +0300

    scripts: add doq, dnscrypt, and beta client ports to docker
 2021-01-22 17:30:08 +03:00
Eugene Burkov ecd9ef47b0 Pull request: 2509 type-safety vol.3 
Merge in DNS/adguard-home from 2509-type-safety-vol2-1 to master

Squashed commit of the following:

commit d58efb32396328247e1bb044f2b01145530cd84c
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Jan 22 14:27:54 2021 +0300

    home: imp JSON encoding
 2021-01-22 15:00:45 +03:00
Eugene Burkov d9482b7588 Pull request: 2509 type-safety vol.2 
Merge in DNS/adguard-home from 2509-type-safety-vol2 to master

Updates #2509.

Squashed commit of the following:

commit c944e4e0a9949fc894c90b4bc1f739148a67fd9d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jan 21 19:36:20 2021 +0300

    all: imp docs

commit e8ac1815c492b0a9434596e35a48755cac2b9f3b
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 20 12:38:48 2021 +0300

    all: imp JSON encoding, decoding
 2021-01-21 19:55:41 +03:00
Eugene Burkov 7fab31beae Pull request: 2508 ip conversion vol.2 
Merge in DNS/adguard-home from 2508-ip-conversion-vol2 to master

Closes #2508.

Squashed commit of the following:

commit 5b9d33f9cd352756831f63e34c4aea48674628c1
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 20 17:15:17 2021 +0300

    util: replace net.IPNet with pointer

commit 680126de7d59464077f9edf1bbaa925dd3fcee19
Merge: d3ba6a6c 5a50efad
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 20 17:02:41 2021 +0300

    Merge branch 'master' into 2508-ip-conversion-vol2

commit d3ba6a6cdd01c0aa736418fdb86ed40120169fe9
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 19 18:29:54 2021 +0300

    all: remove last conversion

commit 88b63f11a6c3f8705d7fa0c448c50dd646cc9214
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 19 14:12:45 2021 +0300

    all: improve code quality

commit 71af60c70a0dbaf55e2221023d6d2e4993c9e9a7
Merge: 98af3784 9f75725d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 18 17:13:27 2021 +0300

    Merge branch 'master' into 2508-ip-conversion-vol2

commit 98af3784ce44d0993d171653c13d6e83bb8d1e6a
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 18 16:32:53 2021 +0300

    all: log changes

commit e99595a172bae1e844019d344544be84ddd65e4e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 18 16:06:49 2021 +0300

    all: fix or remove remaining net.IP <-> string conversions

commit 7fd0634ce945f7e4c9b856684c5199f8a84a543e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Jan 15 15:36:17 2021 +0300

    all: remove redundant net.IP <-> string converions

commit 5df8af030421237d41b67ed659f83526cc258199
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jan 14 16:35:25 2021 +0300

    stats: remove redundant net.IP <-> string conversion

commit fbe4e3fc015e6898063543a90c04401d76dbb18f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Thu Jan 14 16:20:35 2021 +0300

    querylog: remove redundant net.IP <-> string conversion
 2021-01-20 17:27:53 +03:00
Eugene Burkov 5a50efadb2 Pull request: 2509 type-safety vol.1 
Merge in DNS/adguard-home from 2509-type-safety to master

Updates #2509.

Squashed commit of the following:

commit 535968eb7de3a9e0817ddb57bc2320e5c5a55086
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 20 15:06:16 2021 +0300

    dhcpd: fix comments

commit dc79b80381fe7a8ecec6f9659fd23710c9229f59
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 20 14:08:10 2021 +0300

    all: improve docs

commit 156ebf6c9bad95f82cd121f019f3b59b77b18ba6
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 19 17:08:15 2021 +0300

    all: improve JSON encoding and decoding
 2021-01-20 15:59:24 +03:00
Ainar Garipov 715df4cd92 Pull request: all: don't close recurrent issues as stale 
Merge in DNS/adguard-home from fix-stale to master

Updates #2275.

Squashed commit of the following:

commit 01cc5b85c2cb4905bb964d6b3e949e33f56d4763
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 20 13:21:14 2021 +0300

    all: don't close recurrent issues as stale
 2021-01-20 13:35:09 +03:00
Ildar Kamalov 9f75725dfa Merge: client: fix mobile layout for install page 
Squashed commit of the following:

commit 5e620f2d8576b08ebfee08e9781cd4927c4dcf2a
Merge: d82d5a902 679bbcdc2
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Jan 18 14:57:00 2021 +0300

    Merge branch 'master' into 2554-mobile-install

commit d82d5a9028be0be72e612fc4c375d2be81c6c8c3
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Jan 18 14:09:25 2021 +0300

    client: fix mobile layout for install page
 2021-01-18 15:09:04 +03:00
Ainar Garipov 679bbcdc26 Pull request: home: don't miss blocked clients in client search api 
Merge in DNS/adguard-home from 2428-blocked-runtime-fix to master

Updates #2428.

Squashed commit of the following:

commit 8aaa3e22a894f0335ced93339655771989846c94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 15 16:32:53 2021 +0300

    home: don't miss blocked clients in client search api
 2021-01-15 20:30:48 +03:00
Ainar Garipov 56cb8a4dde Pull request: dnsforward: add dnsrewrite tests 
Merge in DNS/adguard-home from 2102-dnsrewrite-tests to master

Updates #2102.

Squashed commit of the following:

commit 894ff4baf8378d6e3386e09c416d55241a01f79e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jan 14 14:49:28 2021 +0300

    dnsforward: add dnsrewrite tests
 2021-01-14 15:30:39 +03:00
Ainar Garipov f2c6e1c682 Pull request: openapi: fix more docs issues 
Merge in DNS/adguard-home from fix-openapi to master

Squashed commit of the following:

commit bd95a502666372443b937cbcb690e307cd943342
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jan 14 13:23:37 2021 +0300

    openapi: fix more docs issues
 2021-01-14 13:48:52 +03:00
Ainar Garipov 4474e9fcf9 Pull request: all: imp http handlers, imp docs 
Merge in DNS/adguard-home from fix-openapi to master

Squashed commit of the following:

commit 0e7530472fb566e5cab73d178c8ec16e5ef11dcb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 13 17:02:06 2021 +0300

    all: imp http handlers, imp docs
 2021-01-13 17:26:57 +03:00
Eugene Burkov e8c1f5c8d3 Pull request: 2508 ip conversion vol.1 
Merge in DNS/adguard-home from 2508-ip-conversion to master

Updates #2508.

Squashed commit of the following:

commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 13 16:21:34 2021 +0300

    Merge branch 'master' into 2508-ip-conversion

commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 13 12:00:11 2021 +0300

    all: replace conditions with appropriate functions in tests

commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Jan 13 10:47:10 2021 +0300

    Merge branch 'master' into 2508-ip-conversion

commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 12 18:55:53 2021 +0300

    sysutil: fix linux tests

commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 12 18:41:20 2021 +0300

    all: improve code quality

commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 12 17:33:26 2021 +0300

    sysutil: fix linux net.IP conversion

commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Jan 12 14:57:26 2021 +0300

    dnsforward: remove redundant net.IP <-> string conversion

commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 11 18:04:25 2021 +0300

    dhcpd: remove net.IP <-> string conversion
 2021-01-13 16:56:05 +03:00
Ainar Garipov 0d67aa251d Pull request: 2546 updater fix 
Merge in DNS/adguard-home from 2546-updater-fix to master

Closes #2546.

Squashed commit of the following:

commit af243c9fad710efe099506fda281e628c3e5ec30
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 13 14:33:37 2021 +0300

    updater: fix go 1.14 compat

commit 742fba24b300ce51c04acb586996c3c75e56ea20
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Jan 13 13:58:27 2021 +0300

    util: imp error check

commit c2bdbce8af657a7f4b7e05c018cfacba86e06753
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jan 11 18:51:26 2021 +0300

    all: fix and refactor update checking
 2021-01-13 16:18:51 +03:00
Ainar Garipov bba74859e2 Pull request: openapi: fix incorrect parameter name 
Merge in DNS/adguard-home from fix-openapi to master

Squashed commit of the following:

commit a448b80a57851d44634c00f0fd986f58b35dae80
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Jan 12 17:27:32 2021 +0300

    openapi: fix incorrect parameter name
 2021-01-12 17:45:19 +03:00
Ainar Garipov 18097edee1 Pull request: scripts: ignore unchecked errors in generated code 
Merge in DNS/adguard-home from fix-errcheck to master

Squashed commit of the following:

commit 1cc4e12c1d49612046ce6f0a1b56920ffcad2526
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Jan 11 15:28:42 2021 +0300

    scripts: ignore unchecked errors in generated code
 2021-01-11 15:59:42 +03:00
Eugene Burkov 18be0ad80b Pull request: beta client on development channel 
Merge in DNS/adguard-home from beta-client-channels to master

Squashed commit of the following:

commit c65611c1743aedd14779c95ed587330aff611b1d
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 11 14:09:21 2021 +0300

    home: activate beta client on development channel by default
 2021-01-11 15:06:54 +03:00
Eugene Burkov 89915e35bd Pull request: fix beta client bug 
Merge in DNS/adguard-home from beta-client-bug to master

Squashed commit of the following:

commit 641f8b5eb3827e1fd9b15e60773e365206dc1f49
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Jan 11 11:54:17 2021 +0300

    home: fix beta client bug
 2021-01-11 13:17:22 +03:00
Andrey Meshkov ce55625d70 Fix #2519 2021-01-06 12:41:53 +03:00
Andrey Meshkov d1434408e5 Merge branch 'Wuodan-patch-1' 2021-01-06 12:02:29 +03:00
Stefan Kuhn 76d9560292
Fix typo in README.md 2021-01-05 18:49:28 +01:00
Ainar Garipov 2298a9ed09 Pull request: scripts: zip output dir recursively 
Merge in DNS/adguard-home from 2276-fix-zip to master

Updates #2276.
Updates #2507.

Squashed commit of the following:

commit 9bd2c53d0aea98fd735655315c33336546f86ccb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 31 17:12:53 2020 +0300

    scripts: zip output dir recursively
 2020-12-31 17:37:19 +03:00
Ainar Garipov 933ca2af2a Pull request: scripts: don't use features not guaranteed by posix 
Merge in DNS/adguard-home from 2276-fix-portability to master

Updates #2276.

Squashed commit of the following:

commit 3019099f2498923495575873daf372598aa72478
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 31 14:31:02 2020 +0300

    scripts: don't use features not guaranteed by posix
 2020-12-31 15:12:46 +03:00
Ainar Garipov cfd492cf7c Pull request: scripts: fix build-release 
Merge in DNS/adguard-home from 2276-fix-release-3 to master

Updates #2276.
Updates #2507.

Squashed commit of the following:

commit 1f756975922b403e06dca3e9d44d9ed2edccb97c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 31 13:45:25 2020 +0300

    scripts: fix build-release
 2020-12-31 13:55:39 +03:00
Ainar Garipov 3706f559c1 Pull request: scripts: fix Dockerfile, build-release.sh 
Merge in DNS/adguard-home from 2276-fix-release-2 to master

Updates #2276.

Squashed commit of the following:

commit cc7edffca6862579a745600b4008428d4c9a73d9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 22:56:01 2020 +0300

    scripts: fix Dockerfile, build-release.sh
 2020-12-30 23:18:15 +03:00
Ainar Garipov e20e94ddd4 Pull request: all: fix gpg_key, release 
Merge in DNS/adguard-home from 2276-fix-release to master

Updates #2276.

Squashed commit of the following:

commit d7b4af6aa867159c5ced8b421a20606f5ee11fd6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 20:26:33 2020 +0300

    all: remove comment

commit cd779699159c4efee4b64184b331add94a7ba57e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 20:25:24 2020 +0300

    all: fix gpg_key, release
 2020-12-30 20:36:57 +03:00
Ainar Garipov 0e84962fde Pull request: all: add a new Makefile and scripts, remove goreleaaser 
Merge in DNS/adguard-home from 2276-releases to master

Updates #2276.

Squashed commit of the following:

commit 84961947c51477aae53606ec6e2e0cce0bdfc139
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 14:36:13 2020 +0300

    all: fix github build

commit 54af2adbf2f433e80393fb142e66ba6b3a78b13e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 14:34:02 2020 +0300

    all: remove old Dockerfile, improve build scripts

commit 99bb2f2ba1458d32074ac0911b5c02ce6669e43e
Merge: 2292b677a 5e20ac7ed
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 13:47:19 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit 2292b677a20ce8e93d9e6e2bb042cd468606fec3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 13:30:10 2020 +0300

    all: improve docker build

commit 0bcc97c41f105ee4a4363f20fa4775c7643bf0cc
Merge: c7d3f12ef aef4659e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 17:47:45 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit c7d3f12ef2b63ddfa2acf46e3129fcbc56fb0a90
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 16:28:25 2020 +0300

    all: improve build scripts

commit 55de1e5d7ef0fbdbd1a76cfb71362d16ca0a1966
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 15:36:47 2020 +0300

    all: fix Makefile

commit d11b1fe28d0fde1efeaf6160a614951b19d0ef94
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 14:16:19 2020 +0300

    scripts: fix build-release

commit ecc0577e2451afa86c37da7283a63a9d26fb37ba
Merge: dde64ed8e 483f02c92
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Dec 29 13:59:32 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit dde64ed8e456f73559f21c2ca549dc3b46724add
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 18:04:46 2020 +0300

    all: imp docs, other improvements

commit be8574408db79901bb15c1d31916db3ca352a35f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 14:48:30 2020 +0300

    all: imp docker build

commit fc1876f34b93d667bf166226f4bc666d394f10c7
Merge: fa5a304c8 955b735c8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 13:54:29 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit fa5a304c83d86145796a2de4141de6d18f7c56bf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 19:10:51 2020 +0300

    all: improve scripts

commit 3f32e3fd5e658d058d5c5172519384efc6cfef83
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:50:01 2020 +0300

    all: improve scripts

commit 2d38b81421acab4b90a7a19da7598c75063e8e93
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:25:21 2020 +0300

    all: fix shell for windows, improve go-lint.sh

commit d695285cd6dc476c0d972cfe0c49bbeea5f5a049
Merge: 313b020e9 9fb6bf82c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:14:38 2020 +0300

    Merge branch 'master' into WIP-2276-releases

commit 313b020e9dfcdab736670cee72b2171eac8c32b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 18:13:31 2020 +0300

    Makefile: use npm ci again

commit 5acee9d6a6c8cd2a7dd04b173a73929650882bad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 17:57:54 2020 +0300

    all: try fixing windows build

commit c63a2a54641ac8cd032a3306bb35e49b9ae74728
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 17:39:30 2020 +0300

    all: imp scripts, try another goproxy and direct

commit 423229e8b63ee73caeee8e84c23f67d145aff9df
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 17:25:29 2020 +0300

    all: imp HACKING.md, try a new proxy

... and 1 more commit
 2020-12-30 18:26:25 +03:00
Eugene Burkov 5e20ac7ed5 Pull request: beta client squashed 
Merge in DNS/adguard-home from beta-client-2 to master

Squashed commit of the following:

commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Dec 29 19:23:09 2020 +0300

    Merge branch 'master' into beta-client-2

commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Tue Dec 29 17:25:14 2020 +0300

    all: upgrade github actions node version

commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <v.abdulmyanov@adguard.com>
Date:   Tue Dec 29 16:57:14 2020 +0300

    all: beta client squashed
 2020-12-29 19:53:56 +03:00
Artem Baskal aef4659e93 2487 Fix the remaining stylint issues 
* commit 'fa96d49dcb690131d4a559ab16b27453c147a4c9':
  Fix the remaining stylint issues
 2020-12-29 17:07:45 +03:00
Artem Baskal 455efd60f4 2469 allow zoom 
* commit '18b5f6e5e468548b9006f163b3ebf0ba237688a0':
  Allow scroll
  Allow users to zoom
 2020-12-29 17:07:26 +03:00
jvoisin fa96d49dcb Fix the remaining stylint issues 2020-12-29 12:22:02 +03:00
Eugene Burkov 483f02c92a Pull request: doc the Question[0] inspection 
Merge in DNS/adguard-home from 2465-question-0 to master

Closes #2465.

Squashed commit of the following:

commit 0dbcaf7eea4f582cedc31f37d1b20162fe1c38df
Merge: 0d7c22cd0 8a1d86aa7
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Dec 28 19:09:25 2020 +0300

    Merge branch 'master' into 2465-question-0

commit 0d7c22cd0eb930bd301a4bb7b8f23e9fd78a2ccd
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Wed Dec 23 14:17:13 2020 +0300

    dnsforward: doc the Question[0] inspection
 2020-12-28 19:26:37 +03:00
Eugene Burkov 8a1d86aa7d Pull request: data race 
Merge in DNS/adguard-home from 2489-data-race to master

Closes #2489.

Squashed commit of the following:

commit 7745b79f0489970f3ba1bb11bb757b998fa6369c
Merge: d070cfd53 93ffed780
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Mon Dec 28 19:00:07 2020 +0300

    Merge branch 'master' into 2489-data-race

commit d070cfd53e72b609f305cd8d79d747fbf47dc5f4
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Dec 25 20:31:21 2020 +0300

    util: fix ignoring write events bug

commit 725850bdbd96eaf65fb3228fcaeba51a3ec95905
Author: Eugene Burkov <e.burkov@adguard.com>
Date:   Fri Dec 25 17:38:29 2020 +0300

    util: simpl hosts upd algo
 2020-12-28 19:07:29 +03:00
Ainar Garipov 93ffed7809 Pull request: dnsfilter: improve cname rewrite validation 
Merge in DNS/adguard-home from 2492-dnsrw-host to master

Closes #2492.

Squashed commit of the following:

commit 7128ed15de86c926ea4cff9fd8d3d3821657254f
Merge: e678c64e6 338209f32
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 28 18:42:25 2020 +0300

    Merge branch 'master' into 2492-dnsrw-host

commit e678c64e656ccf69c6818e9165ff1451f7c8fde6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 28 18:04:52 2020 +0300

    dnsfilter: improve cname rewrite validation
 2020-12-28 18:49:36 +03:00
Ainar Garipov 338209f32b Pull request: all: improve dnsrewrite handling 
Merge in DNS/adguard-home from 2491-dnsrewrite-log to master

Closes #2491.

Squashed commit of the following:

commit bfe3cb599ed0a921285fb1a6ea27aaefdcc0d093
Merge: 95c5ffe43 15d8f979b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 28 18:33:32 2020 +0300

    Merge branch 'master' into 2491-dnsrewrite-log

commit 95c5ffe4360b732556455f24b844dad27047e64b
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Dec 28 18:11:01 2020 +0300

    Add RewriteRule for client

commit b9096c8789009dac1838b542d3409fef54b59aa5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 28 17:22:44 2020 +0300

    all: imp naming, docs

commit 4e00de0d613e4740451e4c8eb5a1de35a70a5896
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 28 17:16:35 2020 +0300

    all: imp naming, add todo

commit 67e4045f627a9569f382309705963640dcf3454a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Mon Dec 28 16:53:00 2020 +0300

    all: improve dnsrewrite handling
 2020-12-28 18:41:50 +03:00
Artem Baskal 15d8f979b1 client: 2451 Remove empty rules label 
Close #2451

* commit '67ad07d69ad3d8805c3d42f836b0759bc0b95a4e':
  client: 2451 Remove empty rules label
 2020-12-28 16:53:36 +03:00
Artem Baskal 67ad07d69a client: 2451 Remove empty rules label 2020-12-28 16:39:15 +03:00
Andrey Meshkov ace7c1c892 fixed comparison 2020-12-28 12:28:47 +03:00
Andrey Meshkov e5780fa308 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home 2020-12-28 12:25:27 +03:00
Artem Baskal 644a9b5565 client: 2451 Support multiple matched rules in the UI 
Close #2451

Squashed commit of the following:

commit f6d0a8fe4fa575dff67b2d2f4c9f6aaf6a6414d3
Merge: 3b13e529d 955b735c8
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Dec 25 14:53:16 2020 +0300

    Merge branch 'master' into feature/2451

commit 3b13e529da01823cbc674d81be065b68cd08bbd3
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Thu Dec 24 12:53:13 2020 +0300

    Update JSXElement in jsdocs

commit f0749cd0466ef69d964b1c2575dffacb33f71b31
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Dec 21 13:23:48 2020 +0300

    minor

commit bd014b00e762a1895c132bc962c06f107c50fe17
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Dec 21 12:49:29 2020 +0300

    Minor helper update

commit 260a66b7b78eb80596b88fec14f409838727e4bb
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Dec 21 12:31:08 2020 +0300

    Rule locale update

commit c960cf9f658e52cb587676dceb97506880a9db94
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Dec 21 12:27:50 2020 +0300

    Add styles for filters list

commit 6f3b2176fd52598cddb147ad7828adb95abf08f0
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Dec 18 18:34:17 2020 +0300

    client: 2451 Support multiple matched rules in the UI
 2020-12-25 15:03:37 +03:00
Ainar Garipov 955b735c8b Pull request: all: add depracation section to CHANGELOG.md, imp HACKING.md 
Merge in DNS/adguard-home from doc-deprecated to master

Squashed commit of the following:

commit c189404164af25786eea83fcee635c497f0cfe00
Merge: 108097cda 1191a9acb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 13:40:11 2020 +0300

    Merge branch 'master' into doc-deprecated

commit 108097cda62866ea78a55b9ddbbba1fdc68cef09
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Dec 25 13:05:03 2020 +0300

    all: imp markup and wording

commit 05a630da77b9b8491ba07cd647d9379c63b9c64e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Dec 24 20:57:43 2020 +0300

    all: add depracation section to CHANGELOG.md, imp HACKING.md
 2020-12-25 13:50:52 +03:00
Ainar Garipov 1191a9acb7 Pull request: 2473 update backoff 
Merge in DNS/adguard-home from 2473-update-backoff to master

Updates #2473.

* commit 'cbdf80727f3cfb7f7908393c194cf8d5f0fb90c5':
  home: imp naming
  home: improve error handling
  Use a simple backoff for retrying the update
 2020-12-25 13:38:26 +03:00
Ainar Garipov cbdf80727f Merge branch 'master' into 2473-update-backoff 2020-12-25 12:57:44 +03:00