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

..

__locales

Merge branch 'master' into 1680-upstreams-file

2020-09-09 14:51:27 +03:00

__tests__

- client: Count client requests correctly

2020-09-08 14:05:26 +03:00

actions

Merge: - client: Fix delay of custom filter editor

2020-09-09 15:48:41 +03:00

api

- client: Do not redirect to login page from install and login pages

2020-09-02 17:51:38 +03:00

components

Merge: + DNS: "dns.upstream_dns_file" setting

2020-09-09 18:49:26 +03:00

containers

Pull request 743: + client: Query Logs Infinite Scroll

2020-09-01 16:30:30 +03:00

helpers

Merge branch 'master' into 1680-upstreams-file

2020-09-09 14:51:27 +03:00

install

+ client: Refactor DHCP settings

2020-08-20 15:19:59 +03:00

login

+ client: Refactor DHCP settings

2020-08-20 15:19:59 +03:00

reducers

* : merge with master

2020-09-09 14:35:11 +03:00

configureStore.js

+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master

2020-05-22 17:06:05 +03:00

i18n.js

+ client: Refactor DHCP settings

2020-08-20 15:19:59 +03:00

index.js

Pull request #730: + client: Add Hot Module Replacement

2020-08-13 11:15:45 +03:00