Artem Baskal
b7bf7f78df
client: 2353 sort ip in dns rewrites
...
Close #2353
Squashed commit of the following:
commit 1072b124c68ff09c6d718acb3aea625fd7b38c4f
Merge: 77e9a6f10 6aacb2105
Author: Artem Baskal <a.baskal@adguard.com>
Date: Tue Dec 8 14:27:06 2020 +0300
Merge branch 'master' into 2353-fix-sort-ip
commit 77e9a6f1013e200346b0dc332fd6b7e9e88c8ade
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 7 17:38:24 2020 +0300
client: 2353 sort ip in dns rewrites
2020-12-08 15:31:20 +03:00
Artem Baskal
6aacb2105c
client: 2368 Allow to enable DHCP even if there's another DHCP found on the network
...
Squashed commit of the following:
commit 2411b36b07b263c9a752f17f676bae93c15e430d
Merge: 8b8740fd3 88d44b437
Author: Artem Baskal <a.baskal@adguard.com>
Date: Tue Dec 8 14:11:15 2020 +0300
Merge branch 'master' into fix/2368
commit 8b8740fd3f379ed1b17c3da27c748df9238efc77
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 7 16:51:45 2020 +0300
+ client: 2368 Allow to enable DHCP even if there's another DHCP found on the network
2020-12-08 14:26:44 +03:00
Artem Baskal
88d44b4370
client: 2367 Show SSL Certificate Expire Banner in 5 Days
...
Squashed commit of the following:
commit 290b3fbc5e18a2cc8694fb2d5f777952d971dfd6
Merge: fe5c67e62 2313eda12
Author: Artem Baskal <a.baskal@adguard.com>
Date: Tue Dec 8 13:57:38 2020 +0300
Merge branch 'master' into fix/2367
commit fe5c67e624280d7fc08192ed3e953a09ca10a9ee
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Dec 7 16:44:41 2020 +0300
- client: 2367 Show SSL Certificate Expire Banner in 5 Days
2020-12-08 14:08:39 +03:00
Eugene Burkov
2313eda123
Pull request: 2302 static ip
...
Merge in DNS/adguard-home from 2302-static-ip to master
Closes #2302 .
Squashed commit of the following:
commit e62b7b033861f1c55f0d06811ca005b3934ddc5b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 19:38:15 2020 +0300
all: format changelog
commit 4127aa7630674ddcfe84f712e6c7c8d06b1cab9a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 19:24:53 2020 +0300
all: fix changelog typo
commit f8a432056d3682facae0cdec99d7d80a5c2bd9b5
Merge: b809a866e e4383189a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 19:22:27 2020 +0300
Merge branch 'master' into 2302-static-ip
commit b809a866e49147354f9c6952b2f958b6b56ad873
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 19:20:05 2020 +0300
all: log changes
commit 248c35ba411af731d6eae755a901cdbc77980628
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 18:57:15 2020 +0300
sysutil: use bufio.Scanner
commit 0dc19dd5c232fbe9552a2b0d846e048274d73a74
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 17:26:18 2020 +0300
sysutil: fix linux tests
commit 91202d6763595cff187040516dd1db10a20762b7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 17:15:29 2020 +0300
sysutil: fix linux files
commit 40fbdbb95876322ebaeef1cbdaa8e3299b83ca7e
Merge: d9a43ffb6 9b963fc77
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 16:52:35 2020 +0300
Merge branch 'master' into 2302-static-ip
commit d9a43ffb68a2ddbbcf185b69fc75aed139cd6919
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 16:49:22 2020 +0300
sysutil: add main test
commit bfef89186035ab0423d23246d46511584c26534c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Dec 7 16:21:59 2020 +0300
sysutil: improve code quality
commit a5f57a373f736971fdeb0c03371da7c8138b3a82
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Dec 4 14:14:08 2020 +0300
all: move system functionality from dhcpd package to sysutil.
commit 020b51864f85a39ca80e2b4e06faeb47cf318e11
Merge: 967e111a6 ab8defdb0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Dec 2 14:53:43 2020 +0300
Merge branch 'master' into 2302-static-ip
commit 967e111a663c18b5f4a87f3ae38d076f3ab6c200
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Dec 2 13:52:17 2020 +0300
all: improve code quality
2020-12-07 19:48:24 +03:00
Ainar Garipov
e4383189a5
Pull request: all: fix github action result reporting
...
Merge in DNS/adguard-home from fix-gh-action-on-fail to master
Squashed commit of the following:
commit e8d48ee022772e0741de56dd955103efa27db0f6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 18:54:14 2020 +0300
all: remove tests
commit ecdcea9c3a2ee3adda3aca57c761963678547cb2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 18:44:47 2020 +0300
all: fix github action result reporting
2020-12-07 19:00:52 +03:00
Ainar Garipov
09b6eba7d9
Pull request: all: add dnscrypt support
...
Merge in DNS/adguard-home from 1361-dnscrypt to master
Closes #1361 .
Squashed commit of the following:
commit 31b780c16cc6b68336b95275f62381cee2e822a2
Merge: c2ce98aaf 9b963fc77
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 17:48:41 2020 +0300
Merge branch 'master' into 1361-dnscrypt
commit c2ce98aaf24bd5ed5b5cd7da86aae093866ab34e
Merge: 3bf3d7b96 63e513e33
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 4 19:32:40 2020 +0300
Merge branch 'master' into 1361-dnscrypt
commit 3bf3d7b96530c86b54545462390562ebedc616b2
Merge: 5de451996 4134220c5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 3 17:31:59 2020 +0300
Merge branch 'master' into 1361-dnscrypt
commit 5de451996d48ab3792ce78291068f72785303494
Merge: 60d7976f7 ab8defdb0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 2 19:07:56 2020 +0300
Merge branch 'master' into 1361-dnscrypt
commit 60d7976f7c7ad0316751b92477a31f882c1e3134
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 30 19:11:14 2020 +0300
all: add dnscrypt support
2020-12-07 17:58:33 +03:00
Ainar Garipov
9b963fc777
Pull request: all: fix lint and naming issues vol. 3
...
Merge in DNS/adguard-home from 2276-fix-lint-3 to master
Updates #2276 .
Squashed commit of the following:
commit 6ee94cc6ed2a9762b70ef395b58b496434244b80
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 15:55:45 2020 +0300
all: fix lint and naming issues vol. 3
2020-12-07 16:04:53 +03:00
Ainar Garipov
7f29d4e546
Pull request: all: fix lint and naming issues vol. 2
...
Merge in DNS/adguard-home from 2276-fix-lint-2 to master
Updates #2276 .
Squashed commit of the following:
commit 24760b9586bb31be134ef9518dbece485560b1a0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 14:39:50 2020 +0300
all: fix lint and naming issues vol. 2
2020-12-07 15:38:05 +03:00
Ainar Garipov
a572876775
Pull request: all: fix lint and naming issues
...
Merge in DNS/adguard-home from 2276-fix-lint to master
Updates #2276 .
Squashed commit of the following:
commit 433f44cc7b674a20ed60a9d29466ba888b3ef66e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 14:14:28 2020 +0300
querylog: improve code and documentation
commit 851df97d2a87de5e7180a502055ee6f1a6defdca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 4 20:36:32 2020 +0300
all: fix lint and naming issues
2020-12-07 14:32:06 +03:00
Ainar Garipov
63e513e33e
Pull request: Add security to openapi spec
...
Merge in DNS/adguard-home from 2392-docs to master
Closes #2392 .
* commit 'a86172fda426ab24dc5e82c84b380fe110f169fc':
Add security to openapi spec
2020-12-04 19:30:11 +03:00
Ainar Garipov
dfd28b45ab
Pull request: all: improve changelog
...
Merge in DNS/adguard-home from doc-fix to master
Squashed commit of the following:
commit 266940fce08a3694d771ab0a4643757ee1fa9c5f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Dec 1 16:29:15 2020 +0300
all: improve changelog
2020-12-04 19:16:01 +03:00
shopeonarope
a86172fda4
Add security to openapi spec
2020-12-04 09:15:48 -07:00
Eugene Burkov
8501a85292
Pull request: fix binding capability defining
...
Merge in DNS/adguard-home from 2391-updating-bug to master
Updates #2391 .
Updates #2231 .
Squashed commit of the following:
commit b321884e6ade04375dad3b981c2920500ff6f645
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Dec 4 16:54:20 2020 +0300
all: log changes
commit 5aa0202a6f6d2abdfc37daee4b0d64f8cee8a62c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Dec 4 14:42:10 2020 +0300
sysutil: fix binding capability defining
2020-12-04 17:06:19 +03:00
Ainar Garipov
4134220c54
Pull request: all: try using a different plug for snap
...
Merge in DNS/adguard-home from 2228-different-plug to master
Squashed commit of the following:
commit 4b4da208e90fb00088a51c9abf599e6634c1ca1f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Dec 2 20:24:03 2020 +0300
all: try using a different plug for snap
2020-12-02 20:34:03 +03:00
Eugene Burkov
ab8defdb08
Pull request: fix zero-length ip addresses list bug
...
Merge in DNS/adguard-home from 2304-fix-panic to master
Updates #2304 .
Squashed commit of the following:
commit bd7742eb144b46e16c751f98f6a4a6f15fbfa60e
Merge: 26313926e 7d1d87d6e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Dec 2 14:29:37 2020 +0300
Merge branch 'master' into 2304-fix-panic
commit 26313926e827d1f5ceb4eec744b814ce7c32663d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Dec 2 14:09:16 2020 +0300
all: add gitignore rule
commit 5a8521bd9b4014972107e8de352e20144f8187fb
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Dec 2 14:03:26 2020 +0300
dhcpd: fix zero-length ip addresses list bug
2020-12-02 14:42:59 +03:00
Ainar Garipov
7d1d87d6ec
Pull request: + client: 2358 Make the mobileconfig API parameterized and more robust
...
Merge in DNS/adguard-home from feature/2358 to master
Updates #2358 .
Squashed commit of the following:
commit b2b91ee3b7303d20b94265d43d785e77260b2210
Author: Artem Baskal <a.baskal@adguard.com>
Date: Tue Dec 1 14:54:35 2020 +0300
+ client: 2358 Make the mobileconfig API parameterized and more robust
2020-12-01 15:51:35 +03:00
Eugene Burkov
641db73a86
Pull request: 2231 autoupdate
...
Merge in DNS/adguard-home from 2231-autoupdate to master
Updates #2231 .
Squashed commit of the following:
commit 4ee9148ee7a38f2759898302a2109aa982fb4ee9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 30 19:08:14 2020 +0300
sysutil: provide os-independent interface
commit 778097c5fdeb1dec94f4cfc6443d08f92d9db0ba
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 30 16:40:33 2020 +0300
all: add sysutil package
2020-11-30 19:23:14 +03:00
Ainar Garipov
6e615c6eaa
Pull request: querylog: resort buffers
...
Merge in DNS/adguard-home from 2293-log-sort to master
Updates #2293 .
Squashed commit of the following:
commit f8961e5c52f82befe23ab1f7603a867243186498
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sat Nov 28 17:19:15 2020 +0300
all: document changes
commit c92c53307f1ed4a1c3196bdc19d23a775876b106
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sat Nov 28 16:44:01 2020 +0300
querylog: resort buffers
2020-11-30 13:32:58 +03:00
Ainar Garipov
60d72fb9c3
Pull request: all: update changelog
...
Merge in DNS/adguard-home from update-docs to master
Squashed commit of the following:
commit 177ce523ecc31405837eaad46d894bdce4cbee00
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 27 16:45:44 2020 +0300
all: update changelog
2020-11-27 17:03:00 +03:00
Ainar Garipov
a6e18c4700
Pull request: dhcpd: wait for interfaces' ip addresses to appear
...
Merge in DNS/adguard-home from 2304-dncp-backoff to master
Updates #2304 .
Squashed commit of the following:
commit c9bff8b27c6b031d43a7dd98152adcde7f49fff1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 27 14:08:03 2020 +0300
dhcpd: try for 5s instead of 10s
commit 983cf471832de0e7762b8b6e0a4ba9bb76ecadfc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 19:58:41 2020 +0300
dhcpd: wait for interfaces' ip addresses to appear
2020-11-27 14:39:43 +03:00
Eugene Burkov
f9e4e7b024
Pull request: fix querylog bug
...
Merge in DNS/adguard-home from 2345-querylog-bug-fix to master
Closes #2345 .
Squashed commit of the following:
commit 3ebd13e059242b041f3c4d77583a077f9e619b48
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 27 12:14:49 2020 +0300
all: make changelog more humanly readable.
commit 3c9bb1be6aec113ebebdb40c976dbdb821f75638
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:43:14 2020 +0300
all: log changes
commit 08c67da926aa085fabdec31c092285a351eb0e08
Merge: 650d2241e 96e83a133
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:42:18 2020 +0300
Merge branch 'master' into 2345-querylog-bug-fix
commit 650d2241e02cf54a7e1f7a611199e770fd119953
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 26 14:02:57 2020 +0300
querylog: fix json parsing bug
2020-11-27 12:33:25 +03:00
Ainar Garipov
96e83a133f
Pull request: home: improve mobileconfig http api
...
Merge in DNS/adguard-home from 2358-mobileconfig to master
Updates #2358 .
Squashed commit of the following:
commit ab3c7a75ae21f6978904f2dc237cb84cbedff7ab
Merge: fa002e400 b4a35fa88
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 16:11:06 2020 +0300
Merge branch 'master' into 2358-mobileconfig
commit fa002e40004656db08d32c926892c6c820fb1338
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 15:19:00 2020 +0300
home: improve mobileconfig http api
2020-11-25 18:09:41 +03:00
Eugene Burkov
b4a35fa887
Pull request: 2343 http server
...
Merge in DNS/adguard-home from 2343-http-server to master
Closes #2343 .
Squashed commit of the following:
commit f4ebfc129484fc3489409069b3580eb70d71cc74
Merge: b13ec7002 36c7735b8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:37:27 2020 +0300
Merge branch 'master' into 2343-http-server
commit b13ec70024f24f6b68b13a1ec6f27c89535feaf8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 15:31:36 2020 +0300
all: record changes
commit ce44aac9d43e32db3f68746dec7a4f21b0a9dea4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 25 14:00:45 2020 +0300
home: set http servers timeouts
commit 7f3e7385d1df39b39713b8ec443da5d9374d0bc8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 24 19:58:56 2020 +0300
home: replace default ServeMux with custom one.
2020-11-25 15:50:59 +03:00
Ainar Garipov
36c7735b85
Pull request: dhcpd: fix interface ipv6 check
...
Merge in DNS/adguard-home from 2355-dhcpcheck-ipv6 to master
Updates #2335 .
Squashed commit of the following:
commit 5ce1cc7bc244ba5dd4a065d47dec8884fa3d45e7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 14:03:24 2020 +0300
dhcpd: fix loop exit condition
commit 32b4b946bfa30159326dc295fa1a2607b78172af
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 25 13:26:50 2020 +0300
dhcpd: fix interface ipv6 check
2020-11-25 14:26:26 +03:00
Ainar Garipov
284da7c91b
Pull request: improve docs
...
Merge in DNS/adguard-home from update-docs to master
Squashed commit of the following:
commit 228c432adecf9f7927a692780a4762f1135b8cd6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 20 18:18:10 2020 +0300
improve docs
2020-11-25 12:02:21 +03:00
Ainar Garipov
e685d81c92
Pull request #847 : dnsfilter: add $dnstype handling
...
Merge in DNS/adguard-home from 2337-dnstype to master
Updates #2102 .
Updates #2337 .
Squashed commit of the following:
commit ac4b7522c732c0bf8ee06539fd4c95b5dc1c87b8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 24 17:50:33 2020 +0300
dnsfilter: add $dnstype handling
2020-11-24 19:55:05 +03:00
Eugene Burkov
1cf9848044
Pull request: update snap core version
...
Merge in DNS/adguard-home from 2306-update-snap-core to master
Closes #2306 .
Squashed commit of the following:
commit e02c083ede35e27e1273d3fa2c1d033ccd749718
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 23 16:15:59 2020 +0300
all: update snap core version
2020-11-23 18:05:45 +03:00
Ainar Garipov
c129361e55
Pull request: 2305 limit message size
...
Merge in DNS/adguard-home from 2305-limit-message-size to master
Closes #2305 .
Squashed commit of the following:
commit 6edd1e0521277a680f0053308efcf3d9cacc8e62
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 23 14:03:36 2020 +0300
aghio: fix final inaccuracies
commit 4dd382aaf25132b31eb269749a2cd36daf0cb792
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 23 13:59:10 2020 +0300
all: improve code quality
commit 060f923f6023d0e6f26441559b7023d5e5f96843
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 23 13:10:57 2020 +0300
aghio: add validation to constructor
commit f57a2f596f5dc578548241c315c68dce7fc93905
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 19:19:26 2020 +0300
all: fix minor inaccuracies
commit 93462c71725d3d00655a4bd565b77e64451fff60
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 19:13:23 2020 +0300
home: make test name follow convention
commit 4922986ad84481b054479c43b4133a1b97bee86b
Merge: 1f5472abc 046ec13fd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 19:09:01 2020 +0300
Merge branch 'master' into 2305-limit-message-size
commit 1f5472abcfa7427f389825fc59eb4253e1e2bfb7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 19:08:21 2020 +0300
aghio: improve readability
commit 60dc706b093fa22bbf62f13b2341934364ddc4df
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 18:44:08 2020 +0300
home: cover middleware with test
commit bedf436b947ca1fa4493af2fc94f1f40beec7c35
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 17:10:23 2020 +0300
aghio: improved error informativeness
commit 682c5da9f21fa330fb3536bb1c112129c91b9990
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 13:37:51 2020 +0300
all: limit readers for ReadAll dealing with miscellanious data.
commit 78c6dd8d90a0a43fe6ee3f9ed4d5fc637b15ba74
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 19 20:07:43 2020 +0300
all: handle ReadAll calls dealing with request's bodies.
commit bfe1a6faf6468eb44515e2b0ecffa8c51f90b7e8
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 19 17:25:34 2020 +0300
home: add middlewares
commit bbd1d491b318e6ba07f8af23ad546183383783a8
Merge: 7b77c2cad 62a8fe0b7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 19 16:44:04 2020 +0300
Merge branch 'master' into 2305-limit-message-size
commit 7b77c2cad03154177392460982e1d73ee2a30177
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 15:33:33 2020 +0300
aghio: create package
2020-11-23 14:14:08 +03:00
Ainar Garipov
046ec13fdc
Pull request: all: reformat yaml, add yaml formatting standard
...
Merge in DNS/adguard-home from 2297-yaml to master
Closes #2297 .
Squashed commit of the following:
commit 85df3a38a14adb1965944ddf14b197c12a213057
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 20 17:52:22 2020 +0300
all: improve HACKING.md
commit 079acdfe41cc12ab6aa13d7c28dcbf7b7b3c8380
Merge: 202ea078e 3045da174
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 20 17:50:34 2020 +0300
Merge branch 'master' into 2297-yaml
commit 202ea078e29d88871a32ac6e668dfae6db802bab
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 12 20:25:42 2020 +0300
all: reformat yaml, add yaml formatting standard
2020-11-20 18:06:07 +03:00
Eugene Burkov
3045da1742
Pull request: 2271 handle nolint
...
Merge in DNS/adguard-home from 2271-handle-nolint to master
Closes #2271 .
Squashed commit of the following:
commit fde5c8795ac79e1f7d02ba8c8e369b5a724a000e
Merge: fc2acd898 642dcd647
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 20 17:12:28 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit fc2acd89871de08c39e80ace9e5bb8a7acb7afba
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 11:55:29 2020 +0300
dnsforward: fix test output strings
commit c4ebae6ea9c293bad239519c44ca5a6c576bb921
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 22:43:20 2020 +0300
dnsfilter: make package pass tests
commit f2d98c6acabd8977f3b1b361987eaa31eb6eb9ad
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 20:05:00 2020 +0300
querylog: make decoding pass tests
commit ab5850d24c50d53b8393f2de448cc340241351d7
Merge: 6ed2066bf 8a9c6e8a0
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 19:48:31 2020 +0300
Merge branch 'master' into 2271-handle-nolint
commit 6ed2066bf567e13dd14cfa16fc7b109b59fa39ef
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 18:13:45 2020 +0300
home: fix tests naming
commit af691081fb02b7500a746b16492f01f7f9befe9a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:15:49 2020 +0300
home: impove code quality
commit 2914cd3cd23ef2a1964116baab9187d89b377f86
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 11 15:46:39 2020 +0300
* querylog: remove useless check
commit 9996840650e784ccc76d1f29964560435ba27dc7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 11 13:18:34 2020 +0300
* all: fix noticed defects
commit 2b15293e59337f70302fbc0db81ebb26bee0bed2
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 20:15:53 2020 +0300
* stats: remove last nolint directive
commit b2e1ddf7b58196a2fdbf879f084edb41ca1aa1eb
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 18:35:41 2020 +0300
* all: remove another nolint directive
commit c6fc5cfcc9c95ab9e570a95ab41c3e5c0125e62e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 18:11:28 2020 +0300
* querylog: remove nolint directive
commit 226ddbf2c92f737f085b44a4ddf6daec7b602153
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 16:35:26 2020 +0300
* home: remove nolint directive
commit 2ea3086ad41e9003282add7e996ae722d72d878b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 16:13:57 2020 +0300
* home: reduce cyclomatic complexity of run function
commit f479b480c48e0bb832ddef8f57586f56b8a55bab
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 15:35:46 2020 +0300
* home: use crypto/rand instead of math/rand
commit a28d4a53e3b930136b036606fc7e78404f1d208b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 14:11:07 2020 +0300
* dnsforward: remove gocyclo nolint directive
commit 64a0a324cc2b20614ceec3ccc6505e960fe526e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 10 11:45:49 2020 +0300
all *: remove some nolint directives
Updates #2271 .
2020-11-20 17:32:41 +03:00
Ainar Garipov
642dcd647c
Pull request: all: update backend tools and dependencies
...
Merge in DNS/adguard-home from 2275-update-tools to master
Squashed commit of the following:
commit 4de1cf91dc7accabeb2103d3c8ec424bee2a89ce
Merge: 06b302c62 62a8fe0b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 16:22:30 2020 +0300
Merge branch 'master' into 2275-update-tools
commit 06b302c62958aa8ab4a9da423a32cd71037d58d7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 11:29:19 2020 +0300
all: update backend tools and dependencies
2020-11-20 13:44:21 +03:00
Ainar Garipov
62a8fe0b73
Pull request: home: add a patch against the global pprof handlers
...
Merge in DNS/adguard-home from 2336-pprof to master
Closes #2336 .
Squashed commit of the following:
commit 855e133b17da4274bef7dec5c3b7db73486d97db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 14:49:22 2020 +0300
home: add a patch against the global pprof handlers
2020-11-19 14:59:30 +03:00
Ainar Garipov
b1c71a1284
Pull request: all: prepare for v0.104.2
...
Merge in DNS/adguard-home from prepare-release to master
Squashed commit of the following:
commit cf4cad216fa259b260bc9cfbd99938979b10623c
Merge: 5434ab5c1 4690229d8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 13:08:50 2020 +0300
Merge branch 'master' into prepare-release
commit 5434ab5c178942e8db9e99758c86d22e977d092f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 13:01:43 2020 +0300
all: prepare for v0.104.2
2020-11-19 13:14:52 +03:00
Ainar Garipov
4690229d81
Pull request: querylog: use better error signaling
...
Merge in DNS/adguard-home from 2325-querylog-suffering to master
Closes #2325 .
Squashed commit of the following:
commit 90388050ed495286cdfed6574dd438abd4a33baa
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 12:37:00 2020 +0300
all: changelog
commit bbdeabbb550c7e98f579e2a68c71de7a66624203
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 19 12:33:21 2020 +0300
querylog: improve error reporting
commit 807b23aa74d0e39f5ef51910e5b91c9b95a8c341
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 18 19:39:22 2020 +0300
querylog: improve docs
commit 65a8f4f3323192c872b3389d2b3420e072a01297
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Nov 18 19:36:28 2020 +0300
querylog: use better error signaling
2020-11-19 12:53:31 +03:00
Eugene Burkov
de257b73aa
Pull request: update golangci-lint and golangci-lint-actions versions
...
Merge in DNS/adguard-home from linter-version-update to master
Squashed commit of the following:
commit 3ab2cb198dd924d86f5e6b92d101846acc747e9b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 16:42:13 2020 +0300
all: update golangci-lint and golangci-lint-actions versions
2020-11-18 18:42:26 +03:00
Eugene Burkov
40614d9a7b
Pull request: querylog bug fix
...
Merge in DNS/adguard-home from 2324-querylog-bug-fix to master
Closes #2324 .
Squashed commit of the following:
commit fdd584a218e1edc3e45ab5b00ceed0a3be681e32
Merge: 8103f9e42 f2eda6d19
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 15:35:42 2020 +0300
Merge branch 'master' into 2324-querylog-bug-fix
commit 8103f9e42a398f43682ee30d09b3afdab0e9e177
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 14:28:29 2020 +0300
querylog: fix the file ordering bug
commit 2c4e8fcc5b8593be1614480508dfd600fc676e64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 20:57:45 2020 +0300
querylog: wrap errors to clarify error trace
commit 3733062b494817696e4443f153774bb01cea1b06
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 18:55:17 2020 +0300
querylog: fix logger output bug
2020-11-18 15:43:28 +03:00
Ainar Garipov
f2eda6d192
Pull request: - client: 2326 Fix dhcp bug interfaces bug
...
Merge in DNS/adguard-home from fix/2326 to master
Closes #2326 .
Squashed commit of the following:
commit 31f24d733eda747e161ddd44055591dbbc0752d7
Author: Artem Baskal <a.baskal@adguard.com>
Date: Tue Nov 17 18:16:19 2020 +0300
- client: 2326 Fix dhcp bug interfaces bug
2020-11-17 19:56:58 +03:00
Eugene Burkov
8a9c6e8a02
Pull request: cover with tests
...
Merge in DNS/adguard-home from 2271-cover-with-tests to master
Updates #2271 .
Squashed commit of the following:
commit db6440efe05171bc15367a2996521848ca348053
Merge: db7fa726b bf4c256c7
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 19:23:09 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit db7fa726bb91b08ec7aaa6c0c818c88b5feb87cd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 18:26:51 2020 +0300
all: clean dependencies sum
commit b8dc6078c4bcc0de1b7e9073832de122f6fe38a4
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:46:00 2020 +0300
testutil: improve code quality
commit 001b7194682b1f00aa54dc5a28236faed5a5b02d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 16:29:49 2020 +0300
testutil: enhance functionality
commit f6ccd91a4df6c56778eab8ae50e88e3818b20dd3
Merge: 43fa2eefb 6358240e9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:57:37 2020 +0300
Merge branch 'master' into 2271-cover-with-tests
commit 43fa2eefbc10ef361603cacc1ca12092b12a057a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 14:55:15 2020 +0300
querylog: replace fake log with real in tests
commit b95bee7565a14a02c80c78131b3ced224663dd8a
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:38:59 2020 +0300
dnsfilter: replace thoughtless declaration with idiomatic one
commit a210b1586092e7ae91a9e67c972fa2d2f6baded6
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 19:00:25 2020 +0300
all: refresh golibs dependencies
commit 4ff97bd1ade6c80e274ff5716e44df4eba55bdd9
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 18:38:47 2020 +0300
all: remove std log
commit 542dbda10fefce9f46d15489712b163d919b1291
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 13:46:39 2020 +0300
querylog: improve test logic and readability
commit 796d402385925e8e62a1b4c7bf56e4ceec22418c
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 19:06:42 2020 +0300
all: improve code quality
commit e81894c11ef15b0453e8e5297f1349936a32f9dd
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 18:32:30 2020 +0300
all: cover with tests
commit 252d81fc8a50a91b02cf0f6f35cc22178a2a4d90
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 17:32:01 2020 +0300
all: cover with tests
2020-11-16 19:45:31 +03:00
Ainar Garipov
bf4c256c72
Pull request: return 501 when we don't support features
...
Merge in DNS/adguard-home from 2295-dhcp-windows to master
Updates #2295 .
Squashed commit of the following:
commit 3b00a90c3d9bc33e9af478e4062c0f938d4f327d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 16 16:45:43 2020 +0300
all: use the 501 handlers instead of the real ones, revert other changes
commit 0a3b37736a21abd6181e0d28c32069e8d7a576d0
Merge: 45feba755 6358240e9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 16 15:59:15 2020 +0300
Merge branch 'master' into 2295-dhcp-windows and update
commit 45feba755dde37e43cc8075b896e1576157341e6
Merge: cd987d8bc a19523b25
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 16 15:51:16 2020 +0300
Merge branch 'master' into 2295-dhcp-windows
commit cd987d8bc2cd524b7454d9037b595069714645f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 15:55:23 2020 +0300
all: improve tests and refactor dhcp checking code even more
commit 3aad675443f325b5909523bcc1c987aa04ac61d9
Merge: 70c477e61 09196118e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 14:44:43 2020 +0300
Merge branch 'master' into 2295-dhcp-windows
commit 70c477e61cdc1237603918f1c44470c1549f1136
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 14:34:06 2020 +0300
home: fix dhcpd test on windows
commit e59597d783fb9304e63f94eee2b5a5d67a5b2169
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 13:38:25 2020 +0300
all: mention the feature in the changelog
commit 5555c8d881b1c20b5b0a0cb096a17cf56e209c06
Merge: c3b6a5a93 e802e6645
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 13:35:35 2020 +0300
Merge branch 'master' into 2295-dhcp-windows
commit c3b6a5a930693090838eb1ef9f75a09b5b223ba6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 12 20:37:09 2020 +0300
util: fix comment
commit ed92dfdb5d3a6c4ba5d032cbe781e7fd87882813
Author: ArtemBaskal <asbaskal@miem.hse.ru>
Date: Thu Nov 12 20:24:14 2020 +0300
Adapt client
commit e6f0494c20a4ad5388492af9091568eea5c6e2d6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 12 13:35:25 2020 +0300
return 501 when we don't support features
2020-11-16 19:01:12 +03:00
Eugene Burkov
6358240e9b
Pull request: 2273 clean tests output
...
Merge in DNS/adguard-home from 2273-clean-tests-output to master
Closes #2273 .
Squashed commit of the following:
commit 7571a33fc1f76300bd256578b3afa95338e399c4
Merge: f17df0f9c a19523b25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:45:30 2020 +0300
Merge branch 'master' into 2273-clean-tests-output
commit f17df0f9ce2a3ed25db33fbc6a2e7cabd33f657b
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:35:42 2020 +0300
home: move build constraint on top line
commit 3717c8ef5a51f9dcaa7e524bfa7b0f1d90bec93d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:24:50 2020 +0300
all: add improvements to changelog
commit de6d5afe39d74a3c3d3e0bbe6d0e09aea0214d56
Merge: 43d4f7acf 394fc5a9d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 15:04:38 2020 +0300
Merge branch 'master' into 2273-clean-tests-output
commit 43d4f7acf188e810aa7277cb6479110c9842e8be
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 13:38:13 2020 +0300
dnsfilter: remove redundant test logging
commit 7194c1413006b8f52fc454e89ab052bf52e4e517
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Nov 16 12:19:14 2020 +0300
testutil: improve comments
commit 9f17ab08e287fa69ce30d9e7eec8ea8880f87716
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Nov 14 01:22:08 2020 +0300
nclient4: fix wrong function name
commit f355749149b2a4485792ba2bdcbc0bb4b629d726
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Sat Nov 14 01:07:22 2020 +0300
testutil: fix comments and naming
commit f8c50a260bfae08d594a7f37d603941d3680a45e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Fri Nov 13 14:09:50 2020 +0300
testutil: create a package and include it
commit f169cdc4084b719de65aa0cdc65200b48785322e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 20:15:58 2020 +0300
agherr: discard loggers output
commit 360e736b5a2a30f2c5350448234f14b841e3ea27
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Thu Nov 12 20:09:55 2020 +0300
all: replace default log writer with ioutil.Discard
Closes #2273 .
2020-11-16 15:52:05 +03:00
Artem Baskal
a19523b258
- client: 2237 Update graph drawing library
...
Squashed commit of the following:
commit 980e9c2f37640ee204ce0365f6c3bcc74741cc7c
Merge: cb4cae82b 394fc5a9d
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Nov 16 14:52:26 2020 +0300
Merge branch 'master' into fix/2237
commit cb4cae82b5b605894d123d6442ea23b24cc90c12
Author: ArtemBaskal <asbaskal@miem.hse.ru>
Date: Thu Nov 12 12:07:49 2020 +0300
minor
commit 5c07dac48067b4ed201aeb59a44e8592ed2b0b67
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Nov 11 19:47:38 2020 +0300
minor
commit 53f60762e520427a080bdfcd94b08b9ed3a63ca4
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Nov 11 19:06:06 2020 +0300
Adapt mobile version
commit 7659ac733ce4606f6fadf30e0eaddbeefd6095d6
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Wed Nov 11 18:31:53 2020 +0300
Fix empty graph offset, return background area below graph
commit 45499adb20a90024dba4b0b4e44ad4f01a1782d5
Author: ArtemBaskal <a.baskal@adguard.com>
Date: Tue Nov 10 17:46:47 2020 +0300
- client: 2237 Update graph drawing library
2020-11-16 15:22:30 +03:00
Artem Baskal
394fc5a9d8
- client: 2300 Fix block client bug when clients values are empty in config
...
Close #2300
Squashed commit of the following:
commit 7222a03ebf3bf8aa93fbd819227e1d5caacce92b
Merge: 91b06b10e 09196118e
Author: Artem Baskal <a.baskal@adguard.com>
Date: Mon Nov 16 12:46:26 2020 +0300
Merge branch 'master' into fix/2300
commit 91b06b10e5d46472c9474032d0ae11dc8d0e4609
Author: Artem Baskal <a.baskal@adguard.com>
Date: Fri Nov 13 15:12:31 2020 +0300
- client: 2300 Fix block client bug when clients values are empty in config
2020-11-16 12:56:55 +03:00
Ainar Garipov
09196118e9
Pull request: dhcpd: fix possible infinite loop, set timeouts better
...
Merge in DNS/adguard-home from 2301-dhcp-check to master
Closes #2301 .
Squashed commit of the following:
commit bf5c31b8592f909a372fcdaebacc491d310cc3e6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Nov 13 14:28:54 2020 +0300
dhcpd: fix possible infinite loop, set timeouts better
2020-11-13 14:40:22 +03:00
Ainar Garipov
e802e6645e
Pull request: all: add a changelog and a developer guide
...
Merge in DNS/adguard-home from 2294-changelog to master
Closes #2294 .
Squashed commit of the following:
commit 25ffc9786d23d83448b916a81f0b20135b051169
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Nov 12 19:40:48 2020 +0300
all: add a changelog and a developer guide
2020-11-13 13:01:07 +03:00
Ainar Garipov
13f708b483
Pull request: * querylog: fix end of log handling
...
Merge in DNS/adguard-home from 2229-query-log to master
Closes #2229 .
Squashed commit of the following:
commit 32508a3f3b1e098869e1649a2774f1f17d14d41f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 10 16:51:25 2020 +0300
* querylog: add test
commit 774159cc313a0284a8bb8327489671e5d7a3e4eb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 10 15:26:26 2020 +0300
* querylog: better errors
commit 27b13a4dcaff9e8f9b08aec81c0c03f62ebd3fa5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 10 15:18:51 2020 +0300
* querylog: fix end of log handling
2020-11-10 19:00:55 +03:00
Ainar Garipov
979874c92b
Pull request: * all: update dnsproxy
...
Merge in DNS/adguard-home from update-dnsproxy to master
Closes #2252 .
Squashed commit of the following:
commit e66b2a0a2555d8ae75b42fd64b83b654810a65c2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Nov 10 11:56:22 2020 +0300
* all: update dnsproxy
2020-11-10 15:19:25 +03:00
Ainar Garipov
3cc5bf210d
Pull request: * dhcpd: send secondary dns as well
...
Merge in DNS/adguard-home from 1708-secondary-dns to master
Updates #1708 .
Squashed commit of the following:
commit 4529452e31131763f00c9c834cc95638f1a3d142
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 18:12:57 2020 +0300
* dhcpd: send secondary dns as well
2020-11-09 19:27:04 +03:00
Ainar Garipov
1e583315a8
Pull request: * all: update dnsproxy
...
Merge in DNS/adguard-home from update-dnsproxy to master
Squashed commit of the following:
commit 6ed03c2131b93e3882e8f820e110696a41223267
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 9 13:13:36 2020 +0300
* all: update dnsproxy
2020-11-09 14:44:21 +03:00
Andrey Meshkov
ee8a033472
Merge branch 'master' of git://github.com/gontazaka/AdGuardHome into gontazaka-master
2020-11-09 11:55:45 +03:00
Andrey Meshkov
b85c0b3bf7
Merge branch 'docker-workflow' of git://github.com/crazy-max/AdGuardHome into crazy-max-docker-workflow
2020-11-09 11:28:27 +03:00