mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-25 14:35:48 +03:00
Code Issues Projects Releases Packages Wiki Activity
2350 commits 94 branches 201 tags 51 MiB
Commit graph

605 commits

Author SHA1 Message Date
Ildar Kamalov
4f3d503916 Merge: - client: fix query log on edge legacy 
Closes #1976

* commit '552280e9a36a15c7c2347af75d97fe2943f80093':
  - client: fix query log not load on edge legacy
 2020-08-03 15:45:31 +03:00
Ildar Kamalov
6bb6c700d6 Merge: - client: fix empty log error 
Closes #1983

* commit '3ff0c964dc05c0b393b6b7140cf59bffb8f70806':
  - client: fix empty log error
 2020-08-03 15:44:55 +03:00
Ildar Kamalov
ed76a3cb8b Merge: - client: check touch events for tooltips 
Closes #1922

* commit 'ce21514246dfc89f1178d9346769317f1fff4d05':
  - client: check touch events for tooltips
  - client: tooltip show delay
 2020-08-03 15:41:46 +03:00
Ildar Kamalov
ce21514246 - client: check touch events for tooltips 2020-08-01 16:25:56 +03:00
Ildar Kamalov
3ff0c964dc - client: fix empty log error 2020-08-01 16:14:50 +03:00
Ildar Kamalov
552280e9a3 - client: fix query log not load on edge legacy 2020-08-01 15:35:57 +03:00
Ildar Kamalov
d154456ae5 - client: tooltip show delay 2020-08-01 13:38:26 +03:00
Imre Kristoffer Eilertsen
cecf848364 * client: Corrects the provided homepage for "The Big List of Hacked Malware Web Sites" 2020-07-27 12:28:30 +03:00
Ildar Kamalov
cfdfd250a0 Merge: - client: show filter name on mobile for whitelisted entry 
Closes #1934

Squashed commit of the following:

commit 5127467acfeec1d8a37736ecce7e92ff9f7b30c9
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jul 24 19:10:10 2020 +0300

    - client: show filter name if rule present

commit f3a3399682b2d842ec399f856e2b586aae9b3ec5
Merge: 63f4c965 3c91b8c7
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jul 24 19:09:32 2020 +0300

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

commit 3c91b8c70c0e0830a180ed1445e7c0994bc300ad
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jul 24 18:54:01 2020 +0300

    - client: show filter name for whitelisted entry

commit 63f4c9655ed5efe2bf35f1174c6c2b0af52403b5
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jul 24 18:54:01 2020 +0300

    - client: show filter name for whitelisted entry
 2020-07-24 19:19:51 +03:00
Ildar Kamalov
c7e7b76cec - client: fix escape 2020-07-24 18:42:49 +03:00
Ildar Kamalov
f5128d27f1 - client: fix host validation rule 2020-07-24 18:36:59 +03:00
Ildar Kamalov
005f8fb279 - client: fix host validation rule 2020-07-24 18:35:03 +03:00
Ildar Kamalov
244fe093cd - client: fix host validation rule 2020-07-24 17:45:24 +03:00
Ildar Kamalov
1c9d3acaa8 - client: fix whois wrap and vertical alignment 2020-07-24 17:17:11 +03:00
Ildar Kamalov
0dab36a108 - client: revert table paginations 2020-07-24 16:45:59 +03:00
Ildar Kamalov
611ed94884 Merge: - client: show tooltips on tap for mobile devices 
Closes #1922

* commit 'dd2c9d96e7f164e5295cf9ca7b68695dd7bc46c1':
  - client: show tooltips on tap for mobile devices
 2020-07-24 16:29:14 +03:00
Ildar Kamalov
1ab650bb86 - client: show all available information in the response tooltip 2020-07-24 16:14:21 +03:00
Ildar Kamalov
4743743b1f Merge: - client: fix container padding 
Closes #1921

Squashed commit of the following:

commit b893ddf31e2251c9d0a77d14c0bc86d1d8608c0a
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jul 24 14:41:50 2020 +0300

    - client: fix container padding

commit 111f53bed2b944febc1f55de24e99cd49801120b
Author: Ildar Kamalov <ik@adguard.com>
Date:   Fri Jul 24 14:40:36 2020 +0300

    - client: npm audit fix
 2020-07-24 16:13:58 +03:00
Ildar Kamalov
dd2c9d96e7 - client: show tooltips on tap for mobile devices 2020-07-24 16:11:45 +03:00
Andrey Meshkov
946bda37a3 - (ui): improved client access check performance 
This is still not ideal and if the disallowed clients list is huge
enough, the slowdown is considerable. But it's at least x10 or x100
times faster than it was.

Closes: #1920
 2020-07-24 13:45:46 +03:00
Andrey Meshkov
1e5419714d * (ui): fix the version check - strip the v prefix 2020-07-23 12:27:14 +03:00
Andrey Meshkov
f2edcca54b *(global): update anti-ad filter URL 
Closes: #1903
 2020-07-22 20:59:42 +03:00
Andrey Meshkov
0662769696 Fix version change check 2020-07-20 17:29:13 +03:00
Andrey Meshkov
4fef0c32cb Merge: Update locales 
Squashed commit of the following:

commit 4d14f3a3f483a17ddd6aee3e082560d81802e5bc
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 20 15:46:54 2020 +0300

    update locales

commit 5d70bef97b98f4c7d8c360db2e0d8c1ce8200b8f
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 20 15:41:41 2020 +0300

    update locales

commit 35b28b1e606885853e55fa8bcf6693e7c07f6151
Merge: 051f6263 c131ac44
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 20 15:35:07 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 051f62630f33ca06d814d7e646f58a3e0cdaa074
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:31:51 2020 +0300

    + client: Update locales

commit 7c88f1fbf5721098e92a3765b96b2f169afc7d43
Merge: 6d743bb1 c1e56c83
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:29:47 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 6d743bb15974a85fedb004a3c639b1f849756e2d
Merge: 1f6c5091 7d2c7a61
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:10:51 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 1f6c50915e63c18834d63d3f8535d24a4e894647
Merge: 1a861a98 4df02714
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 11:23:08 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 1a861a98326a749a347c184bb2b9aff663b3dd09
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 11:22:47 2020 +0300

    Update locales

commit 3f4850822c95b1147f39df939eca568f13b2c0dc
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 16:07:40 2020 +0300

    Update locales

commit 0f06bd8f188130e97394c8f20f27b66f263612cc
Merge: 5abae336 38366ba8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 12:59:22 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 5abae33603e84dc410f77e7ec622314e85e03951
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 12:57:36 2020 +0300

    Update locales

commit 717455ecf42135077a7dae31281b1da0d89b27e3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 17:45:15 2020 +0300

    Rename label

commit b399ef33eed3c0447d5c651d3b678d482dddbb5b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 17:43:08 2020 +0300

    Replace 'All responses' with 'All queries'

commit 1f5a62a3d95906057c862b55d2ba91d67b346604
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 16:18:54 2020 +0300

    + client: Update locales
 2020-07-20 15:55:15 +03:00
Ildar Kamalov
c131ac445a Merge: - client: fix names of clients in the top clients list 
Closes #1893

Squashed commit of the following:

commit e5de0c4f53558e1ad89dc0069192e534f244f120
Author: Ildar Kamalov <ik@adguard.com>
Date:   Mon Jul 20 14:29:23 2020 +0300

    - client: fix names of clients in the top clients list
 2020-07-20 15:25:28 +03:00
Artem Baskal
4175d82279 + client: 1889 Show a link to the FAQ article about Ubuntu when port 53 is in use 
Close #1889

Squashed commit of the following:

commit 4fa57f692d0a66d20e9ba9d235ec423e5118db20
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:28:38 2020 +0300

    Revert "Update locales"

    This reverts commit dd88f8047e612022678dfabe8dda446c4b8f201b.

commit dd88f8047e612022678dfabe8dda446c4b8f201b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:26:00 2020 +0300

    Update locales

commit 954ae2e97e988b53856766100c873e6d40b75123
Merge: 28f205a8 c1e56c83
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:23:50 2020 +0300

    Merge branch 'master' into feature/1889

commit 28f205a858281811af7d708356e10108983c7292
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 15:39:57 2020 +0300

    Rename systemdns-resolved ---> systemd-resolved

commit 3d62e26984f73285a7b788b6f42efcb3376ae562
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 15:15:10 2020 +0300

    Add commas to port 53 locale

commit 457563085186244dca36a80a959e5a9486558299
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 13:34:13 2020 +0300

    minor

commit 7aacf879951f8ab619824730cb28ea5cd2518812
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 13:27:55 2020 +0300

    + client: Show a link to the FAQ article about Ubuntu when port 53 is in use
 2020-07-17 17:59:34 +03:00
Artem Baskal
c1e56c837b + client: Update locales 
Squashed commit of the following:

commit 6d743bb15974a85fedb004a3c639b1f849756e2d
Merge: 1f6c5091 7d2c7a61
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 17:10:51 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 1f6c50915e63c18834d63d3f8535d24a4e894647
Merge: 1a861a98 4df02714
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 11:23:08 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 1a861a98326a749a347c184bb2b9aff663b3dd09
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 11:22:47 2020 +0300

    Update locales

commit 3f4850822c95b1147f39df939eca568f13b2c0dc
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 16:07:40 2020 +0300

    Update locales

commit 0f06bd8f188130e97394c8f20f27b66f263612cc
Merge: 5abae336 38366ba8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 12:59:22 2020 +0300

    Merge branch 'master' into feature/update_locales

commit 5abae33603e84dc410f77e7ec622314e85e03951
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 12:57:36 2020 +0300

    Update locales

commit 717455ecf42135077a7dae31281b1da0d89b27e3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 17:45:15 2020 +0300

    Rename label

commit b399ef33eed3c0447d5c651d3b678d482dddbb5b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 17:43:08 2020 +0300

    Replace 'All responses' with 'All queries'

commit 1f5a62a3d95906057c862b55d2ba91d67b346604
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 16:18:54 2020 +0300

    + client: Update locales
 2020-07-17 17:21:20 +03:00
Artem Baskal
7d2c7a61f1 - client: Use the same tooltip style everywhere 
Close #1866

Squashed commit of the following:

commit 3347832caa33b01a0155b212987f02dc4824ab08
Merge: 7766502d d794b11e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 15:12:45 2020 +0300

    Merge branch 'master' into fix/1866

commit 7766502d4a904ad0a4d240481f7eabf0e25cfb62
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 12:16:59 2020 +0300

    Fix icon color classes

commit 90191bf74b5eb1855c733c226f7acb4e906c7ad9
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 17 11:46:22 2020 +0300

    Use logs icons, use pointer cursor, fix review markup formatting

commit 0ba50fcd956101f5054ce38c2329df3e8abdfcd2
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 18:05:30 2020 +0300

    Use help cursor on tooltips

commit bf4e14afe69f874d29be73d8cd4cfbe240ca0304
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 17:41:47 2020 +0300

    Use tooltip in logs, rename tooltip classes

commit 00568fdc8e8484c5bae67c51ee8189a3a558e219
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 16 17:01:49 2020 +0300

    - client: Use the same tooltip style everywhere
 2020-07-17 15:24:39 +03:00
Artem Baskal
e46db985e8 - client: Fix query logs UI issues 
Close #1828

Squashed commit of the following:

commit bf96b9f2cc99a94a1289c47b04cde136cf0c9f37
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 20:44:22 2020 +0300

    Remove field domain from response tooltip

commit bba35fdbed6d1e2e532c8effaf2da69de3f2c078
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 20:29:24 2020 +0300

    Unify mobile modal

commit 5ee2da41594497fd64eadf0fd64c24afdad94e44
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 19:02:47 2020 +0300

    Delete unnecessary comment

commit ac3a3f13009ad508ddd7eb31aadf7e590a5c2829
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 18:59:44 2020 +0300

    minor

commit 4b1969a53ce2fcfc859c228b27816459bd8bd1d0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 18:56:51 2020 +0300

    Fix safari mediaQuery change listener issue

commit d85de5c4e90d2460632e593cffe3ceea3137e92c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 18:10:30 2020 +0300

    Fix logs input search markup (for different locales)

commit 6d704399c5379dfda663503b3a5b1d12a92732b2
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 16:05:35 2020 +0300

    Fix whois_info markup, fix domain name overflow

commit 4c900f60a9c6b71b427d968177252eb168c424c0
Merge: a3955c98 38366ba8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 13:42:43 2020 +0300

    Merge branch 'master' into fix/1828

commit a3955c989a939866c6772b147547344b3f8769c4
Merge: c91c41cb 2759d81a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 15:14:47 2020 +0300

    Merge branch 'master' into fix/1828

commit c91c41cbc5f616e0af1092424e42b909d2f43f7c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 13:48:54 2020 +0300

    Fix cell overflow

commit 19e1d31a40f2e1bb1189a85b72507bcc364d4e0c
Merge: af31f48c a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 12:36:44 2020 +0300

    Merge branch 'master' into fix/1828

commit af31f48c4d2699ebfbd2034711c51499b42e40f5
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 10:45:57 2020 +0300

    minor

commit d9507c5f3f5758e587766ae0fa45f1b9ad703ccf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 10 18:34:22 2020 +0300

    - client: Fix query logs UI issues
 2020-07-15 20:55:13 +03:00
Artem Baskal
a32c1f2ee0 - client: Fix client Access settings normalization 
Close #1820

Squashed commit of the following:

commit 5aadec2e6e126588313ff006d6f95223ba19a526
Merge: a4db6b42 95f41285
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 15 11:15:31 2020 +0300

    Merge branch 'master' into fix/1820

commit a4db6b42ab9cbf43d96c783a72a99e0a2c594108
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jul 14 19:08:09 2020 +0300

    Remove textarea comma splitting

commit bb34797aac6602b405941dbd90fe6a81b663bb92
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jul 14 18:21:18 2020 +0300

    Fix client Access settings normalization

commit ac4fb536514f54c5722077d78dbbd981c4e906a8
Merge: 0c758ddc b9fca8d0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jul 14 18:14:38 2020 +0300

    Merge branch 'master' into fix/1820

commit 0c758ddcd738136b92e6f947a8068ecc59f7ec25
Merge: 15650db3 f5a1f311
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:22:00 2020 +0300

    Merge branch 'master' into fix/1820

commit 15650db35323009001fd427a74a312705b54ac86
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 29 12:01:51 2020 +0300

    '- client: Don't normalise disallowed domains'
 2020-07-15 12:35:37 +03:00
ArtemBaskal
61981a927b Change getVersionSuccess reducer 2020-07-14 18:42:24 +03:00
Artem Baskal
da4a1ec23d +client: "Drill down" to activity reports 
Close #1625

Squashed commit of the following:

commit a01f12c4e5831c43dbe3ae8a80f4db12077dbb2a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 15:50:15 2020 +0300

    minor

commit b8ceb17a3b12e47de81af85fa30c2961a4a42fab
Merge: 702c55ed fecf5494
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 13 15:32:44 2020 +0300

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

commit 702c55edc1ba2ab330eda8189498dfff33c92f5f
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 13 15:32:41 2020 +0300

    fix makefile when there's no gopath

commit fecf5494b8c1719cb70044f336fe99c341802d25
Merge: d4c811f9 8a417604
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 15:30:21 2020 +0300

    Merge branch 'master' into feature/1625

commit d4c811f9630dee448012434e2f50f34ab8b8b899
Merge: b0a037da a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 12:35:16 2020 +0300

    Merge branch 'master' into feature/1625

commit b0a037daf48913fd8a4cda16d520835630072520
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 12:34:42 2020 +0300

    Simplify sync logs action creators

commit eeeb620ae100a554f59783fc2a14fad525ce1a82
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 11:17:08 2020 +0300

    Review changes

commit 4cbc59eec5c794df18d6cb9b33f39091ce7cfde9
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 10 15:23:37 2020 +0300

    Update tracker tooltip class

commit 0a705301d4726af1c8f7f7a5776b11d338ab1d54
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 10 13:46:10 2020 +0300

    Replace depricated addListener

commit 2ac0843239853da1725d2e038b5e4cbaef253732
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 10 13:39:45 2020 +0300

    Validate response_status url param

commit 2178039ebbd0cbe2c0048cb5ab7ad7c7e7571bd1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 10 12:58:18 2020 +0300

    Fix setting empty search value, use strict search on drill down, extract refreshFilteredLogs action

commit 4b11c6a34049bd133077bad035d267f87cdec141
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 9 19:41:48 2020 +0300

    Normalize input search

commit 3fded3575b21bdd017723f5e487c268074599e4f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 9 18:20:05 2020 +0300

    Optimize search

commit 9073e032e4aadcdef9d826f16a10c300ee46b30e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 9 14:28:41 2020 +0300

    Update url string params

commit a18cffc8bfac83103fb78ffae2f786f89aea8ba1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 9 12:55:50 2020 +0300

    Fix reset search

commit 33f769aed56369aacedd29ffd52b527b527d4a59
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 8 19:13:21 2020 +0300

    WIP: Add permlinks

commit 4422641cf5cff06c8485ea23d58e5d42f7cca5cd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Jul 8 14:42:28 2020 +0300

    Refactor Counters, add response_status links to query log

commit e8bb0b70ca55f31ef3fcdda13dcaad6f5d8479b5
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jul 7 19:33:04 2020 +0300

    Delete unnecessary file

commit b20816e9dad79866e3ec04d3093c972967b3b226
Merge: 6281084e d2c3af5c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jul 7 19:30:44 2020 +0300

    Resolve conflict

commit d2c3af5cf227d76f876d6d94ca016d4b242b2515
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jul 7 17:14:51 2020 +0300

    + client: Add git hooks

... and 5 more commits
 2020-07-13 16:06:56 +03:00
Artem Baskal
8a417604a9 - client: Fix query logs UI issues 
Close #1828

Squashed commit of the following:

commit a3955c989a939866c6772b147547344b3f8769c4
Merge: c91c41cb 2759d81a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 15:14:47 2020 +0300

    Merge branch 'master' into fix/1828

commit c91c41cbc5f616e0af1092424e42b909d2f43f7c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 13:48:54 2020 +0300

    Fix cell overflow

commit 19e1d31a40f2e1bb1189a85b72507bcc364d4e0c
Merge: af31f48c a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 12:36:44 2020 +0300

    Merge branch 'master' into fix/1828

commit af31f48c4d2699ebfbd2034711c51499b42e40f5
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 10:45:57 2020 +0300

    minor

commit d9507c5f3f5758e587766ae0fa45f1b9ad703ccf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 10 18:34:22 2020 +0300

    - client: Fix query logs UI issues
 2020-07-13 15:23:13 +03:00
Artem Baskal
af5cb5aa5d Merge pull request #691 in DNS/adguard-home from agneevX-patch-1 to master 
Squashed commit of the following:

commit 47f1bef1f584eb02a3ddcf048de7cc62dbc7ddf3
Merge: a7ff1f23 a33164bf
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 12:36:28 2020 +0300

    Merge branch 'master' into agneevX-patch-1

commit a7ff1f236ad53d7e6b30bb683443b77ebe405690
Merge: 304a51f1 b5aa42fc
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 13 11:42:28 2020 +0300

    Merge branch 'patch-1' of git://github.com/agneevX/AdGuardHome into agneevX-patch-1

commit b5aa42fc28
Author: Agneev Mukherjee <19761269+agneevX@users.noreply.github.com>
Date:   Fri Jun 26 17:50:22 2020 +0530

    Update index.html

commit 15f0e5e5bc
Author: Agneev Mukherjee <19761269+agneevX@users.noreply.github.com>
Date:   Fri Jun 26 17:49:37 2020 +0530

    Update install.html

commit bef3adc381
Author: Agneev Mukherjee <19761269+agneevX@users.noreply.github.com>
Date:   Thu Jun 25 18:04:07 2020 +0530

    Update login.html
 2020-07-13 13:10:05 +03:00
Andrey Meshkov
304a51f17e *(home): added anti-AD regional filter list 
Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1357
 2020-07-08 10:57:46 +03:00
Andrey Meshkov
49646cf706 + client: Add choosing filter lists 
Fix #1325

Squashed commit of the following:

commit d8f7de72226855a961051e09b4b78f4dd71baadd
Merge: f9bbe861 36f3218b
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 6 19:34:53 2020 +0300

    Merge branch 'master' into feature/1325

commit f9bbe861c9dbd631b5708f8eb073270b83a3f70f
Merge: 99710fef 4f8138bd
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 6 19:33:53 2020 +0300

    Merge branch 'master' into feature/1325

commit 99710fef0825966b224e4a30a979e4d45f929af1
Merge: 8329326d a5380ead
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 6 18:04:32 2020 +0300

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

commit 8329326d6470dfcf2cdc4479e0290f7cc56ddca4
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 6 18:03:56 2020 +0300

    Update locales, add title for select modal

commit a5380ead56d15eba3f36c38f8fc0eedc89c2c57a
Author: Andrey Meshkov <am@adguard.com>
Date:   Mon Jul 6 17:26:37 2020 +0300

    Update readme

commit dfe6e254d909ee6994cacef53d417bb073dfd802
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 6 13:44:19 2020 +0300

    Change info icon width

commit 06120cf3da9065fc9cc3a2864b976563d4cfe06a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 6 13:38:58 2020 +0300

    Review changes

commit ae3c6cacc5610a0f95bec2f6ef8a63e90041e4dd
Merge: dd56a3bb 73c5d9ea
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 6 12:01:57 2020 +0300

    Merge branch 'master' into feature/1325

commit dd56a3bbb851687823242fa653cc3bb63dedf5e4
Author: Andrey Meshkov <am@adguard.com>
Date:   Fri Jul 3 15:52:01 2020 +0300

    Added blocklists

commit f08f0eb0cdd8cd488d3a8f1182854b72775cf06e
Merge: 854d4f88 21dfb5ff
Author: Andrey Meshkov <am@adguard.com>
Date:   Fri Jul 3 14:06:19 2020 +0300

    Merge branch 'master' into feature/1325

commit 854d4f88017a33dc7f788835dc98591cec9b213f
Merge: 23946266 2c47053c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 22 14:09:31 2020 +0300

    Merge branch 'master' into feature/1325

commit 23946266d4913479bcecfcb7702a096983d20685
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 26 19:00:26 2020 +0300

    Math filters by url

commit 661e0482f01ffea0d0f5aa81b3b253143d0ca112
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon May 25 21:07:21 2020 +0300

    Change data format

commit ac4ff483b6b06ec0be49a41b5ddd3329f4ae2bbb
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu May 14 19:52:45 2020 +0300

    + client: Add choosing filter lists
 2020-07-06 19:58:44 +03:00
ArtemBaskal
036ab4128d - client: Fix mobile query log 2020-07-06 19:28:07 +03:00
Artem Baskal
73c5d9eaef - client: Improve DNS Rewrites 
Close #1764

Squashed commit of the following:

commit 76af537597b2f3c0860716a45e4e23662cde22c8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jul 6 10:59:44 2020 +0300

    - client: Improve DNS Rewrites
 2020-07-06 11:23:23 +03:00
ArtemBaskal
7dd3d944e8 Merge branch 'master' into 1587-cache-settings 2020-07-03 22:30:56 +03:00
Artem Baskal
6b134469d4 - client: Clear input field when switching from logs page 
Close #1523

Squashed commit of the following:

commit 9ae9b0e480c2ec6bd835faf4caccacd8c1fdfe9f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 17:56:34 2020 +0300

    Setup babel and apply everywhere nullish coalescing and optional chaining operators

commit 0966063842a79078e1d61a54c271e18c9427b2b1
Merge: 42a54f2b 21dfb5ff
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 16:59:34 2020 +0300

    Merge branch 'master' into fix/1523

commit 42a54f2ba0d8f5f4e4c04f16abc507b5d9009035
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 13:30:25 2020 +0300

    Center mobile tooltip buttons

commit 9cdd501a863b596f1d903f8dd3c449ffbe4c1604
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 13:21:37 2020 +0300

    Add cross icon to clear input on click

commit 1308b93c42ffea2ffb7457c34aef96e5cdaccaf2
Merge: 265fec7c da546790
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 29 19:42:04 2020 +0300

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

commit 265fec7c72656b0c4738623cb470f1c14736230a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 29 19:41:37 2020 +0300

    - client: Clear input field when switching from logs page
 2020-07-03 19:17:58 +03:00
ArtemBaskal
0c4905fa2b Extract validation functions in the separate file 2020-07-03 19:10:05 +03:00
ArtemBaskal
c12309a1b2 Resolve conflict 2020-07-03 16:58:23 +03:00
ArtemBaskal
2d5287fcf3 Add DNS cache setting UI 2020-07-03 16:53:53 +03:00
Artem Baskal
9df7aba9e1 - client: Fix client tracker source links 
Close #1813

Squashed commit of the following:

commit 7f2286cb6e36f90ca19f2830b341d34af513c9a3
Merge: e9f2e08b 9640752d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:55:46 2020 +0300

    Merge branch 'master' into fix/1813

commit e9f2e08b608ad14e5b327ab86d8faa66784bae44
Merge: ecee0977 f5a1f311
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:49:52 2020 +0300

    Merge branch 'master' into fix/1813

commit ecee0977ab5439d3be2a99447a771871f0340a2e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:35:10 2020 +0300

    Capitalize category names

commit b4b47ce0177369fb4da5ad2e10a78b2d96bd81c6
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 2 18:11:40 2020 +0300

    - client: Fix client tracker source links
 2020-07-03 12:01:03 +03:00
Artem Baskal
9640752d20 - client: Don't normalise disallowed domains 
Close #1820

Squashed commit of the following:

commit 0c758ddcd738136b92e6f947a8068ecc59f7ec25
Merge: 15650db3 f5a1f311
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:22:00 2020 +0300

    Merge branch 'master' into fix/1820

commit 15650db35323009001fd427a74a312705b54ac86
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 29 12:01:51 2020 +0300

    '- client: Don't normalise disallowed domains'
 2020-07-03 11:45:56 +03:00
Artem Baskal
f5a1f31103 - client: Display DomainCell popover 
Close #1817

Squashed commit of the following:

commit 203d52e9b23013cb516765c3d41c288f8ce9d90c
Merge: 5c78d918 205680b7
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:15:28 2020 +0300

    Merge branch 'master' into fix/1817

commit 5c78d918ee2901ff138d5d06046e74ed00dc230d
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 2 17:50:59 2020 +0300

    - client: Display DomainCell popover
 2020-07-03 11:21:23 +03:00
Artem Baskal
205680b71b - client: Make language tag in HTML same as setting language 
Close #1797

Squashed commit of the following:

commit b822a83cb05cc5ba92000cdb7d1c12629471bc57
Merge: e2fa24fb 72ce5f57
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jul 3 11:02:56 2020 +0300

    Merge branch 'master' into fix/1797

commit e2fa24fb9fa0c15f8411e186e90e0ffb1c705fb2
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 2 18:21:30 2020 +0300

    Extract helper

commit ba8473e7b16ab8b1abbee4b42a4ef2b0de8c136b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jul 2 15:31:42 2020 +0300

    - client: Make language tag in HTML same as setting language
 2020-07-03 11:14:54 +03:00
Andrey Meshkov
4b2c33d12e Update translations 2020-06-29 17:24:16 +03:00
ArtemBaskal
caf78ae3a0 Merge with master 2020-06-19 14:48:10 +03:00
ArtemBaskal
679b79a89d minor 2020-06-19 14:44:23 +03:00