mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-12-26 08:38:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
3068 commits 95 branches 203 tags 55 MiB
Commit graph

3068 commits

This branch
This branch
All branches
Author SHA1 Message Date
Simon Zolin
69a740714f * DNS: set default blocking mode to Null IP for A/AAAA, empty response for others 
Close #1914

Squashed commit of the following:

commit cb127a9a409b2f228848fb838535f3db6e9d32a9
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Oct 2 12:37:11 2020 +0300

    return empty response if not A/AAAA qtype

commit 175a736d7d69619022db92a9250c382ad7fc9996
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Oct 2 12:21:51 2020 +0300

    fix

commit 03aab89d2da00ede3aad6eb5a5bb2d545444a186
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Oct 2 12:18:11 2020 +0300

    fix tests

commit 4225d511df910aae2df4651231c01a8a13bb937f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Oct 2 12:02:11 2020 +0300

    * DNS: set default blocking mode to Null IP for A/AAAA, NXDOMAIN for others
 2020-10-02 12:51:55 +03:00
Artem Baskal
128229ad73 + client: Add block and unblock buttons to 'check the filtering' result 
Close #1734

Squashed commit of the following:

commit b7e274318aea773b6b7effba0fcf13859a23d45c
Merge: 77c823a4 2f6f65a8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 1 23:36:49 2020 +0300

    Merge branch 'master' into feature/1734

commit 77c823a46ad6e094d332b40375a32511c8f6ff11
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Sep 24 22:36:56 2020 +0300

    Add blocking button

commit bb77029d46ce18e582db04ccf31f7ed7c57de572
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 22:02:45 2020 +0300

    Refactor check info

commit bd8cf052a0458c767aa65d0d8749648f8e10fdba
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 21:15:24 2020 +0300

    Fix prop processingCheck

commit 5a1d696f7e15f2e1367ff3f9a1767ee3c2344b1b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 20:35:21 2020 +0300

    Refactor Check component
 2020-10-02 11:33:12 +03:00
Artem Baskal
2f6f65a81f + dnsfilter: AG-4274 Update ip addresses 
Squashed commit of the following:

commit b63952a7fbd9d33a953ebbfa97a70826a92d4120
Merge: b69646ac 8c411c46
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 28 10:59:48 2020 +0300

    Merge branch 'master' into feature/update_ip

commit b69646ac2647bc7930dba1d77130b9d4f11750ba
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 18:54:54 2020 +0300

    + dnsfilter: AG-4274 Update ip
 2020-09-28 11:39:41 +03:00
Artem Baskal
8c411c4630 2128 + service: Detect config file on service run correctly 
Cose #2128

Squashed commit of the following:

commit cb7a58276fa97ac2e22bdbcb6d56c61415482e40
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Sep 24 21:03:43 2020 +0300

    2128 + service: Detect config file on service run correctly
 2020-09-28 10:57:56 +03:00
Simon Zolin
990f531f54 + DHCP: add ra_slaac_only, ra_allow_slaac config settings 
Close # 2076

Squashed commit of the following:

commit 7a938fc6ffa0adc1e705f59778d7e7442b83d4b9
Merge: 3db2605e 6222d17d
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Sep 24 16:34:23 2020 +0300

    Merge remote-tracking branch 'origin/master' into 2076-dhcp-ra-slaac

commit 3db2605efda79e8d361fb46c32bb9ec753de0e02
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Sep 24 16:21:36 2020 +0300

    minor

commit de31c6aeebd78dce54ca54fbff010f3dd50ce974
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Sep 24 12:23:09 2020 +0300

    don't initialize DHCPv6 server if we must force the clients to use SLAAC

commit 7c4239899c85880641dc5b4826ae34386bc5ee94
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 22 19:34:27 2020 +0300

    minor

commit 2b57688ce4c31d45d2236bd397e0b3041dac68c1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Sep 21 19:50:11 2020 +0300

    + DHCP: add ra_slaac_only, ra_allow_slaac config settings
 2020-09-24 18:33:11 +03:00
Simon Zolin
6222d17d86 + clients: improve logic when processing "disallowed IP" property for a client 
#1925

* commit 'c72cd58f69b71e4981d8b182b2f7d53ea5e30868':
  + client: Move the client access check to the server-side
  Improve the clients/find API response
  + GET /control/clients/find: add "disallowed" property
 2020-09-24 16:30:10 +03:00
Artem Baskal
c72cd58f69 + client: Move the client access check to the server-side 
Squashed commit of the following:

commit 1aab0f62e94ce665a1b996552fac41dc4e769b4d
Merge: cdf5eb6e c1f5fdae
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Sep 24 15:36:05 2020 +0300

    Merge branch '1920-client-find' into feature/1925

commit cdf5eb6ea67a665d21a3155d8cf89bba9a5a9948
Merge: b6c20b1c 10f67bd3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 20:28:51 2020 +0300

    Merge branch 'master' into feature/1925

commit b6c20b1c7359a0e5902405b0551712f936848a80
Merge: 97d388ef 96512433
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 15 10:44:25 2020 +0300

    Merge branch 'master' into feature/1925

commit 97d388ef6571d590f21da00f86d889e881ca0c3d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 15 10:30:50 2020 +0300

    Extract buttons

commit ca45fde11fc2b2812ff2b84dbd67aff0b5341be1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Sep 10 12:46:09 2020 +0300

    Handle errors in updateLogs

commit f15e03c2e5a7115db984f70f72b0ddd870ece73d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Sep 10 12:39:34 2020 +0300

    Update mobile block status on click

commit 033b28db3b324f6d529ac1a0ef657886cdbe02bd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 9 20:53:42 2020 +0300

    Fix mobile block buttons, auto open page on web serve start

commit 2730937b23309167a066b9154728ac53ffe81a49
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 9 13:58:37 2020 +0300

    Disable allow this client button when isNotInAllowedList is true

commit 818cf869d63654c184762ad2701c4429a3e3011e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 9 13:06:01 2020 +0300

    Update client block state on option click

commit a072b8983757f419645c0207ea78e6e867c440cb
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 8 20:17:16 2020 +0300

    Adapt to api changes

commit 28ab2bd8b3f14f60bc822b5a69fa1801db67d816
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 8 14:12:20 2020 +0300

    Change query log block confirm messages

commit 9b0b6f6f9b1ec168fa71dbedd036152da59006e3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 8 12:00:46 2020 +0300

    Refactor inner work with disallowed

commit 05f76154b8f489738d032fdaa835edb371ce70c7
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 7 16:11:37 2020 +0300

    + client: Move the client access check to the server-side
 2020-09-24 15:48:37 +03:00
ArtemBaskal
c1f5fdaee4 Merge branch 'master' into 1920-client-find 2020-09-23 20:29:48 +03:00
Artem Baskal
10f67bd383 + client, querylog: Add blocked service filter support 
Close #2124

Squashed commit of the following:

commit 574726e88e4fe7df745dfc964706e1e26f8da59f
Merge: 3bc770fb dc61744d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 19:32:38 2020 +0300

    Merge branch 'master' into feature/2124

commit 3bc770fba6d06bbd965ee181aed7b0a050175f58
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 11:22:07 2020 +0300

    minor

commit 90c0d739d1bd09dbcf5f27ff9e6c3f761bf81686
Merge: 5d1f2642 1d36abd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Sep 23 11:17:24 2020 +0300

    Merge branch 'master' into feature/2124

commit 5d1f264212686ac7ecab30401b4f0e3c020dbee9
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 17:23:08 2020 +0300

    Display elapsed if there is no service_name in blocked service

commit af86cedc31d566238764e02c5c8e465fa41292c6
Merge: b61976a7 756f97ed
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 16:55:40 2020 +0300

    Merge branch 'master' into feature/2124

commit b61976a7f811e1d01327cad8b0925bd110c6e135
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 16:52:48 2020 +0300

    Rename params to blocked_services, update service name display on client

commit d5b8e5f7b2c4a3d6701cf8845d31b28f55c6a808
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 15:59:46 2020 +0300

    Update docs, return global blocked status

commit adc9a294f76070dea2d845155814c21c52fc6c7f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 15:24:34 2020 +0300

    + querylog: Extract filteringStatusBlockedService

commit ee8c1dce0d7520be0d0fcfe6f798dd11f13c9262
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 13:54:16 2020 +0300

    + client: Add blocked service filter support
 2020-09-23 19:47:02 +03:00
Simon Zolin
dc61744d47 Merge: * doc: "<key>" was treated as "" in a processed .md document 
* commit '805bd41c4d62cf5ecb00dc65ef0d7a72b4380154':
  * doc: "<key>" was treated as "" in a processed .md document
 2020-09-23 13:48:39 +03:00
Simon Zolin
805bd41c4d * doc: "<key>" was treated as "" in a processed .md document 2020-09-23 13:09:14 +03:00
Simon Zolin
1d36abd11a - querylogs: GET /control/querylog: "service_name" field wasn't set 
Squashed commit of the following:

commit a6571d483c8b5af6c051fb2fc08661d609a4e3d0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 22 17:27:54 2020 +0300

    - querylogs: GET /control/querylog: "service_name" field wasn't set
 2020-09-22 17:43:19 +03:00
Artem Baskal
756f97ede1 + upstream: Allow entering comments to the Upstreams box 
Close #2083

Squashed commit of the following:

commit 113ad3c4ae2ca184b3945dcaa357b57303ee5fd6
Merge: 4ca1f005 bf23aa4d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 14:41:30 2020 +0300

    Merge branch 'master' into feature/2083

commit 4ca1f0056708eb23bb751587a0ec284508f35edf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 13:14:31 2020 +0300

    Simplify filterOutComments, use assert in tests

commit bba03568aa979300e0534a2bd2f03086e25b3f87
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 12:05:00 2020 +0300

    Add ValidateUpstreams test cases

commit 181de508cf266e3a47058f2b7e1b4b4accbab827
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 11:47:03 2020 +0300

    Refactor testUpstream

commit 19c189cf7b64f4d252428dec5a608595c8e4cbc7
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 22 10:38:37 2020 +0300

    Move functions to utils

commit 003937e90e0ff02e696d45c21045a27a49cd0202
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 21 19:00:49 2020 +0300

    Review changes

commit b26bf64d8cef0266f33bce51c5bad324c74bb6da
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 21 17:58:01 2020 +0300

    + upstream: Filter out the upstream comments

commit 920975d2ba14fade07282cdb5c72a699c8083463
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 21 17:51:00 2020 +0300

    Trim upstreams, extract comment token

commit a9958eb305ed9af10de68ef3bffe63f216805efe
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 21 10:34:11 2020 +0300

    Fix markup styles

commit 6efa41d944c7b09454a4011d2c9ea52b5ce91bbf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 17:59:57 2020 +0300

    Fix upstream form positioning

commit 6eb12158d0bca49d4b41eb65a3ebed44eafbe486
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 17:16:49 2020 +0300

    Update example_upstream_comment locale

commit aa9317b0243f5d30f0fcb9cbfcdf502547a8e954
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 13:28:30 2020 +0300

    Highlight comments in custom rules form, extract highlight logic

commit dc55245d3db9edbde60fda0a0e50e1e045e71403
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Sep 17 22:48:29 2020 +0300

    + client: Allow entering comments to the Upstreams box
 2020-09-22 15:04:17 +03:00
Artem Baskal
bf23aa4d9b + client: Replace TTL override zeroes with empty strings, update dnsproxy 
Close #2091

Squashed commit of the following:

commit 9acaa0331f3094a2b48c1f0cf846a30e5c9dfc43
Merge: c207ccc9 3a71374f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 17:45:20 2020 +0300

    Merge branch 'master' into fix/2091

commit c207ccc9a12f225a6f0343f5273a3469b2709679
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 17:14:24 2020 +0300

    Remove unused imports

commit 750f60ffc40fd48d4bd09a4e2ac4a3143e0cf126
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 16:47:24 2020 +0300

    Update dnsproxy to v0.32.6

commit 1723267e0e7f512db532cd180a3e9d44182d96b3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 18 16:32:12 2020 +0300

    Replace zeroes with empty string
 2020-09-21 10:19:56 +03:00
Artem Baskal
3a71374f9f - client: Return red background of Disallowed clients on the Dashboard 
Close #2108

* commit '9fd74748bb7ce84bea512c5a52bd927e88a00ed8':
  - client: Return red background of Disallowed clients on the Dashboard
 2020-09-18 17:44:55 +03:00
ArtemBaskal
9fd74748bb - client: Return red background of Disallowed clients on the Dashboard 2020-09-18 17:11:46 +03:00
Andrey Meshkov
f694a40c57 * : query log anonymization tool 2020-09-18 14:42:04 +03:00
Andrey Meshkov
38066151a6 * (ui): translations update 2020-09-17 23:50:31 +03:00
Andrey Meshkov
deeaca5de1 fix typo 2020-09-16 19:47:26 +03:00
Andrey Meshkov
b7607216d2 Merge: + client: Update locales 
Fix #2086
Fix #2106

* commit '835f3b911b66902902f4231913913e8bafdde4e4':
  Added unused translations counter
  Update locales
  Update ru locale
  Update locales
  Update locales
  Change back div to label
  Update Link of port_53_faq_link
  Update upstream_dns_help
  + client: Update locales
 2020-09-16 18:04:36 +03:00
Andrey Meshkov
835f3b911b Added unused translations counter 2020-09-16 17:42:57 +03:00
Andrey Meshkov
d38068289c Merge branch 'master' into feature/update_locales 2020-09-16 13:50:19 +03:00
Andrey Meshkov
ad6c43c4a3 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home 2020-09-16 12:38:46 +03:00
ArtemBaskal
380ce34ce6 Update locales 2020-09-15 11:05:54 +03:00
ArtemBaskal
da1e235052 Merge branch 'master' into 1920-client-find 2020-09-15 10:45:32 +03:00
Artem Baskal
9651243347 - client: Make dashboard card height constant 
Close #2039

Squashed commit of the following:

commit 1d6dd461558403ea0ba813d5f665ecbaab9cd8ed
Merge: 6ca80c91 2a5b0b8d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Sep 15 10:18:19 2020 +0300

    Merge branch 'master' into fix/2039

commit 6ca80c9171da61a4bc02cec409299d0cfb96da49
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 19:58:43 2020 +0300

    Fix mobile media query

commit 239c9ab29aaaef200bd2289fa116507ea5c2bf4c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 13:59:39 2020 +0300

    - client: Make dashboard card height constant
 2020-09-15 10:30:34 +03:00
ArtemBaskal
a5e189bdf3 Merge branch 'master' into feature/update_locales 2020-09-14 20:22:55 +03:00
Artem Baskal
2a5b0b8da1 - client: Allow change minimum TTL override in UI 
Close #2091 #2094 #2056

Squashed commit of the following:

commit a84384bb409bfe60c4bd6477b2249c4431aa3b63
Merge: cdc5f27f a22db5f3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 19:59:47 2020 +0300

    Merge branch 'master' into fix/2091

commit cdc5f27f279f33c7d988f2927adc172e77e0a6af
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 15:41:00 2020 +0300

    Fix uint32 fields validation

commit 0c6fcb90f9741ae8a33bf6c4d53bd954f2033a88
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 14:43:20 2020 +0300

    Validate DNS cache configuration DNS values unit32 range

commit 1f90a1fcbc04f6c7ffb75b453e5c67e117d1c5bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 14 12:11:39 2020 +0300

    Remove the limit on cache-min-ttl

commit 72e961034cc5752a50a4afc57c7be6a93d652f7d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 11 16:50:19 2020 +0300

    Fix translation

commit 6aebf4b87bb806ac0729b40418ba6056b3f71afa
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 11 12:53:01 2020 +0300

    - client: Allow change minimum TTL override in UI
 2020-09-14 20:16:46 +03:00
ArtemBaskal
99b556aab3 Update ru locale 2020-09-14 19:48:59 +03:00
ArtemBaskal
726d8eec2c Update locales 2020-09-14 15:44:35 +03:00
ArtemBaskal
cbc1ef4558 Update locales 2020-09-11 16:52:25 +03:00
Andrey Meshkov
625f1dffe1 * (dnsfilter): minor refactoring, comments 2020-09-11 15:52:46 +03:00
Andrey Meshkov
a22db5f358 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home 2020-09-11 13:22:39 +03:00
Andrey Meshkov
1c88667306 * (home): added tests for no-mem-optimization flag 2020-09-11 13:21:37 +03:00
Andrey Meshkov
b3a68bb806 * (global): added --no-mem-optimization flag 
This commit adds a new command-line argument that disables memory
optimizations AGH is using. These memory optimizations might be
necessary on low-memory devices, but they aren't free and there's a
performance hit (see #2044). Now they can be disabled - just pass
--no-mem-optimization when you run AGH or when you install the service
-- ./AdGuardHome -s install --no-mem-optimization

Closes: #2044
 2020-09-11 13:19:37 +03:00
Artem Baskal
6fddccfb65 - client: Fix dashboard client names display 
Close #2090

* commit '8533081da7632cca634e400c5b14b3bf52a55b61':
  - client: Fix dashboard client names display
 2020-09-11 12:35:29 +03:00
ArtemBaskal
8533081da7 - client: Fix dashboard client names display 2020-09-11 12:06:52 +03:00
Andrey Meshkov
cb8afde629 * (dnsforward): fix reverse lookups from /etc/hosts 
There was a bug with empty PTR responses for IPs that are in the hosts
file

Closes: #2085
 2020-09-11 11:53:36 +03:00
Andrey Meshkov
caee4b86fa * (dnsforward): upgrade dnsproxy to v0.32.5 2020-09-10 23:54:15 +03:00
Andrey Meshkov
67e6b7d3e8 * (dnsforward): upgrade dnsproxy to v0.32.4 2020-09-10 18:19:09 +03:00
ArtemBaskal
bce69809bc Change back div to label 2020-09-10 12:54:36 +03:00
Andrey Meshkov
75d680ff30 * (dnsforward): added some hosts to disallowed by default 2020-09-10 12:32:36 +03:00
ArtemBaskal
c5773577bc Update Link of port_53_faq_link 2020-09-09 22:12:56 +03:00
ArtemBaskal
071a1f77a4 Update upstream_dns_help 2020-09-09 21:51:02 +03:00
ArtemBaskal
7177361016 + client: Update locales 2020-09-09 20:13:29 +03:00
Andrey Meshkov
b6e5863058 Merge: + DNS: "dns.upstream_dns_file" setting 
Merge in DNS/adguard-home from 1680-upstreams-file to master
Fix #1680

* commit '88c67764b9515902514b0a8e4f00af29a353c584':
  * (dnsforward): don't fail when default upstream is not set
  * (dnsforward): upgrade dnsproxy to v0.32.1
  * (ui): fix strings
  + client: Display upstreams list loaded from a file
  + DNS: "dns.upstream_dns_file" setting
 2020-09-09 18:49:26 +03:00
Andrey Meshkov
88c67764b9 * (dnsforward): don't fail when default upstream is not set 2020-09-09 18:12:11 +03:00
Andrey Meshkov
f8010902ce * (dnsforward): upgrade dnsproxy to v0.32.1 2020-09-09 17:50:39 +03:00
Andrey Meshkov
0818d51493 Merge: - client: Fix delay of custom filter editor 
Merge in DNS/adguard-home from fix/1657 to master
Fix #1657

* commit '474306d46546097700d5c767c7283f33f63f53d7':
  - client: Fix delay of custom filter editor
 2020-09-09 15:48:41 +03:00
Andrey Meshkov
7720d0dfbc Merge branch 'master' into 1680-upstreams-file 2020-09-09 14:51:27 +03:00