mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,544 Commits 96 Branches 201 Tags 57 MiB
Commit Graph

2544 Commits

Author SHA1 Message Date
Andrey Meshkov 052a9ae196 - (home): test upstream shouldn't fail with upstreams file 
Closes: #2212
 2020-10-22 18:20:16 +03:00
Artem Baskal 32b24ce093 + dnsfilter, client: Add qq to blocked services 
Squashed commit of the following:

commit ffb2a1065fc9edd2b840cccbb96a0a2c1334bf00
Merge: 0f966d5b 3acfaa16
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Oct 20 11:19:39 2020 +0300

    Merge branch 'master' into dnsfilter/update_blocked_services

commit 0f966d5b00f96c93bf778e944d68f62ebcdeaa50
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 19 20:47:22 2020 +0300

    Add qq icon to blocked services

commit f9c42551bbb442f83c6354314fc42ea174aacf4b
Author: ifurther <55025025+ifurther@users.noreply.github.com>
Date:   Sun Jun 7 12:19:05 2020 +0000

    Add qq to blocked services
 2020-10-20 11:26:39 +03:00
Andrey Meshkov 3acfaa162f Pull reques: dnsfilter/blocked_services: update netflix with nflxso.net SLD 
Merge in DNS/adguard-home from blocked-service-netflix-nflxso to master

* commit 'e0ddb1c0eacb6b60e61a6bac9e028ffc64debf04':
  dnsfilter/blocked_services: update netflix with nflxso.net SLD
 2020-10-15 11:23:08 +03:00
Andrey Meshkov 345a97c4af Pull request: + client: Update dns examples 
Merge in DNS/adguard-home from client/update-dns-examples to master

* commit 'a7cf717116a78dbbad086ec149584c7f3c45d33f':
  Update DNS
  Update DNS examples
 2020-10-15 11:22:49 +03:00
KizunaH a7cf717116 Update DNS 2020-10-14 18:59:42 +03:00
KizunaH 8315b46f30 Update DNS examples 2020-10-14 18:59:42 +03:00
David Sheets e0ddb1c0ea dnsfilter/blocked_services: update netflix with nflxso.net SLD 2020-10-13 16:42:43 +01:00
Andrey Meshkov 3a96fdd01b Merge: * (home): update locales 
Merge in DNS/adguard-home from update_locales to master

Squashed commit of the following:

commit 2650ebe94614e986a02ca66aab0cca9f6b618eda
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 12 19:14:05 2020 +0300

    Rename MacOs to macOs in setup_dns_privacy_4 string

commit c6d8b49be0bfd13f48b4a5a40323bcaed33a9cab
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Oct 12 18:41:23 2020 +0300

    Update locales

commit 850e87fcc9a40c6560a744363394fe8db351549b
Merge: 5dd23ebe 56e7b2f6
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Oct 12 18:27:38 2020 +0300

    fix filters string

commit 5dd23ebe06809f73760b0b54bae78659e6581837
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Oct 12 17:46:26 2020 +0300

    Update translations

commit 03bf548da40fa7881c26a16f8e7f5793a0d970af
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 12 11:48:42 2020 +0300

    Update link in filters_block_toggle_hint locale

commit 4372229c8c6f61c6efa1322866c4bbce73e29acd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 9 13:25:15 2020 +0300

    Update locales

commit 7c9361fe294f4cb691798b39583e25b8f4e3879e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 17:59:04 2020 +0300

    Update locales

commit 4b36ba65815b311b81c94cb9b6c4890cc8517780
Merge: 0b9adc88 b97f6b3f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 17:37:45 2020 +0300

    Merge branch 'fix/2159' into update_locales

commit 0b9adc88ac7cc0612712d2095a116e0bec48f5bb
Merge: 1a3d98d3 51819408
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 17:37:26 2020 +0300

    Merge branch 'update_locales' of ssh://bit.adguard.com:7999/dns/adguard-home into update_locales

commit b97f6b3f265c4ec8d55e60ef52c316b510e19aa0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 16:35:16 2020 +0300

    Update CheckboxField props

commit 8c4545fc554749d7aaa836cc496b2026073dfc39
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 16:27:17 2020 +0300

    - client: 2159 Fix general settings link to filters

commit 518194088aaa9be40b2b43a2fa3097273d3ecfd8
Author: Andrey Meshkov <am@adguard.com>
Date:   Thu Oct 8 12:10:58 2020 +0300

    * (home): update locales
 2020-10-12 19:28:12 +03:00
Artem Baskal 56e7b2f6b3 - client: 2159 Fix general settings link to filters 
Close #2159

Squashed commit of the following:

commit 5b6b15b43cafd0cbae908b7bf6f0a571add85f51
Merge: b97f6b3f 20226edb
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Oct 12 17:52:56 2020 +0300

    Merge branch 'master' into fix/2159

commit b97f6b3f265c4ec8d55e60ef52c316b510e19aa0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 16:35:16 2020 +0300

    Update CheckboxField props

commit 8c4545fc554749d7aaa836cc496b2026073dfc39
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 8 16:27:17 2020 +0300

    - client: 2159 Fix general settings link to filters
 2020-10-12 18:08:22 +03:00
Artem Baskal 20226edbe3 - client: 2152 Do not show dashboard buttons on mobile screen, fix buttons on DNS block/allow lists pages 
#2152

* commit '72ab51bce0dd0b892acc797689f0cd32d779fd9f':
  - client: 2152 Do not show dashboard buttons on mobile screen, fix buttons on DNS block/allow lists pages
 2020-10-09 19:19:14 +03:00
ArtemBaskal 72ab51bce0 - client: 2152 Do not show dashboard buttons on mobile screen, fix buttons on DNS block/allow lists pages 2020-10-09 13:23:14 +03:00
Artem Baskal 1a3d98d3bf Pull request #796: + client: 2152 Smartphone compatible design for user interface 
#2152

* commit 'be82502ba78d52068184b03db5fd4bb044a26583':
  Fix margins
  Fix markup
  Fix dhcp interfaces markup
  + client: 2152 Smartphone compatible design for user interface
 2020-10-08 12:10:40 +03:00
ArtemBaskal be82502ba7 Merge branch 'master' into fix/2152 2020-10-08 11:35:06 +03:00
Artem Baskal 398da7e2d3 + client, home: 2110 Generate .mobileconfig 
Close #2110

Squashed commit of the following:

commit 3a652a23b21b4eb16dd7b09f149099c93bf7a977
Merge: 5d0d6c5e 65acfb75
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 21:01:54 2020 +0300

    Merge branch 'master' into feature/2110

commit 5d0d6c5e8704c80ae526d92966dfee0c469019bb
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 00:28:25 2020 +0300

    * (home): minor refactoring

commit e1d10252f5b00c94edb9faa85eaefa3d33ac9cbf
Merge: f859ef14 fb7ca942
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 00:18:46 2020 +0300

    Merge branch 'master' into feature/2110

commit f859ef144c54123d8ff262177148959f7b41a5a4
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Oct 6 19:30:18 2020 +0300

    Update ServerURL, generate all uniqie uuid

commit 3ce7c573229f87579ff150f6519077ced9c5ba23
Merge: e80cf6de a7d2dd7b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 2 18:46:03 2020 +0300

    Merge branch 'master' into feature/2110

commit e80cf6ded1c20a4384cb94200134d67b29c0c948
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 2 18:33:12 2020 +0300

    Describe .mobileconfig in openapi, allow unauthorized access for .mobileconfig

commit 9887d1839f8f7e4888fc23bb64cfc43a42b6f58b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 2 16:14:45 2020 +0300

    Change .mobileconfig generation

commit 5298dd706c107f5b02f4278a8773f6af387c36b1
Merge: cd4d1a74 128229ad
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 2 12:01:16 2020 +0300

    Merge branch 'master' into feature/2110

commit cd4d1a748e2471890b31533e4c24272a3d01cbee
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 1 23:10:14 2020 +0300

    Change dot and doh highlight in setup_dns_privacy_4 locale

commit 50e310ef3b988f2aad5accea92c6b34ecef28585
Merge: 92e0e28b 2f6f65a8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 1 23:05:45 2020 +0300

    Merge branch 'master' into feature/2110

commit 92e0e28b757953efbbc211ae43b710b070308573
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 28 16:44:25 2020 +0300

    Add ServerAddresses property

commit c8c4cf88abcb0a76c6024d41d3eafab691ff1e38
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Sep 28 13:51:53 2020 +0300

    Fix .mobileconfig display on SetupGuide

commit 9e4fad3c0ed0bfb980ad1cb030272781c13ebaad
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Sep 25 19:08:50 2020 +0300

    2110 + client, home: Generate .mobileconfig
 2020-10-08 11:34:36 +03:00
Andrey Meshkov 65acfb75dd Merge: + install.sh 
Merge in DNS/adguard-home from install.sh to master
Fix #995

Squashed commit of the following:

commit 81a5b6385574fa5bc14f7e9cc8cd707fcdc491c3
Merge: 825062a9 fb7ca942
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 20:40:30 2020 +0300

    Merge branch 'master' into install.sh

commit 825062a9cb77447bec0967635bde334218437e1f
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 20:04:04 2020 +0300

    minor fixes

commit 22205d80479a1f894fe6c72afe22ba555a9e611e
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 20:01:56 2020 +0300

    * (home): fix install script

commit 073b5fb8e27351094b95d85335dd3d08f65f9ee8
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 19:59:07 2020 +0300

    * (home): update readme and install script

commit d4d2e4c35ca1ea1f365e40081098ee9398196ef3
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 14:43:49 2020 +0300

    disable parallel build

commit a639b9ae44c534c7fdecd34894f5ad4ae6217472
Author: Andrey Meshkov <am@adguard.com>
Date:   Wed Oct 7 02:48:52 2020 +0300

    * (home): improve install.sh

commit 4c564da714850002d1810d4d10dce859f340e3ab
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Oct 1 15:32:53 2020 +0300

    minor

commit 0ecc1a03a41201a632f650ba995f3b07a6539889
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Oct 1 15:08:07 2020 +0300

    * install.sh: use /opt/AdGuardHome output directory

commit fd3ad73606c69e8ede086e67bc557772f9e34406
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Sep 30 12:13:56 2020 +0300

    * install.sh: prompt for an output directory

commit 8917e8cb3d794cfa1fd7b358c89695ff719e7e4d
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Sep 29 18:56:54 2020 +0300

    + install.sh
 2020-10-07 21:01:30 +03:00
ArtemBaskal eb91c6cfe4 Fix margins 2020-10-07 12:48:03 +03:00
ArtemBaskal 8fc1862863 Fix markup 2020-10-07 11:49:30 +03:00
ArtemBaskal fc4a557610 Fix dhcp interfaces markup 2020-10-06 20:52:44 +03:00
ArtemBaskal f3118c5e2a Merge branch 'master' into fix/2152 2020-10-06 20:22:51 +03:00
Artem Baskal fb7ca94243 - client: 1750 Display 0% at the bottom in the statistical chart 
Close #1750

* commit 'd21535683c1dbd981933e9bb6fcb9a1097841092':
  - client: 1750 Display 0% at the bottom in the statistical chart
 2020-10-06 19:32:37 +03:00
ArtemBaskal d21535683c - client: 1750 Display 0% at the bottom in the statistical chart 2020-10-06 12:39:21 +03:00
Artem Baskal 78814064bd + client: 2154 Make renderCheckboxField a controlled input 
Close #2154

* commit '0ae00932e94429d25995114e2ba9a82f71377d79':
  + client: 2154 Make renderCheckboxField a controlled input
 2020-10-06 11:58:41 +03:00
ArtemBaskal c98f18747c + client: 2152 Smartphone compatible design for user interface 2020-10-06 11:54:06 +03:00
ArtemBaskal 0ae00932e9 + client: 2154 Make renderCheckboxField a controlled input 2020-10-05 14:53:20 +03:00
Andrey Meshkov 8856dd6e4c * (ui): fix date format 2020-10-05 11:21:43 +03:00
Artem Baskal a7d2dd7bdb - client: 2144 Fix DNS allowlists tab crash after opening "Choose blocklists" modal 
Close #2144

Squashed commit of the following:

commit 435f17df9ce41e0f56b78cf8b7a390b73f16243b
Merge: 8899d65e 69a74071
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Oct 2 13:02:36 2020 +0300

    Merge branch 'master' into fix/2144

commit 8899d65e9cf320fa07561f1f5a35cd3424a49a32
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Oct 1 23:00:06 2020 +0300

    - client: 2144 Fix DNS allowlists tab crash after opening "Choose blocklists" modal
 2020-10-02 13:30:19 +03:00
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