Merge: fix #822 - Whitelist filter rules
Squashed commit of the following: commit 350c6d5fadd77145b801df8887284bf4d64fbd19 Author: Ildar Kamalov <i.kamalov@adguard.com> Date: Wed Feb 26 15:43:29 2020 +0300 * client: update translations commit a884dffcd59f2259e2eee2c1e5a3270819bf8962 Author: Ildar Kamalov <i.kamalov@adguard.com> Date: Mon Feb 17 17:32:10 2020 +0300 + client: handle whitelist filters commit a586ec5bc614ffb0e01584a1fbdc7292b4865e68 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Jan 29 18:16:59 2020 +0300 + client: add whitelist commit a52c3de62cf2fa34be6394771fb8bb56b4ee81e3 Author: Simon Zolin <s.zolin@adguard.com> Date: Thu Feb 20 17:50:44 2020 +0300 * change /filtering/refresh commit 7f8f2ecccb9f7fa65318c1717dc6a7bd61afccf4 Author: Simon Zolin <s.zolin@adguard.com> Date: Thu Feb 20 16:17:07 2020 +0300 * fix race-detector issue commit ac4b64c4a52c5b364a4b154bf18dea0fdf45647f Author: Simon Zolin <s.zolin@adguard.com> Date: Mon Jan 20 20:08:21 2020 +0300 + whitelist filters
This commit is contained in:
@@ -137,7 +137,26 @@ export const CLIENT_ID = {
|
||||
IP: 'ip',
|
||||
};
|
||||
|
||||
export const SETTINGS_URLS = ['/encryption', '/dhcp', '/dns', '/settings', '/clients'];
|
||||
export const MENU_URLS = {
|
||||
root: '/',
|
||||
logs: '/logs',
|
||||
guide: '/guide',
|
||||
};
|
||||
|
||||
export const SETTINGS_URLS = {
|
||||
encryption: '/encryption',
|
||||
dhcp: '/dhcp',
|
||||
dns: '/dns',
|
||||
settings: '/settings',
|
||||
clients: '/clients',
|
||||
};
|
||||
|
||||
export const FILTERS_URLS = {
|
||||
dns_blocklists: '/filters',
|
||||
dns_allowlists: '/dns_allowlists',
|
||||
dns_rewrites: '/dns_rewrites',
|
||||
custom_rules: '/custom_rules',
|
||||
};
|
||||
|
||||
export const SERVICES = [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user