a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,876 Commits 3 Branches 0 Tags 148 MiB
ee5456cf8c
Commit Graph

1876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ildar Kamalov
ee5456cf8c Revert remove locales from js bundle 2020-02-04 13:37:35 +03:00
Ildar Kamalov
8330f40d51 Merge: Remove locales from js bundle 
* commit 'd633e45a064e94029d5e659efa07aeb685794a8b':
  + client: add eslint-import-resolver-webpack
  + client: remove locales from js bundle
  + http: allow access to /__locales/ when not authenticated
  * http: allow access to /__locales/ while installing
 2020-02-03 18:34:40 +03:00
Andrey Meshkov
d062acc149 *(global): update trackers db 2020-02-03 14:17:39 +03:00
Ildar Kamalov
d633e45a06 + client: add eslint-import-resolver-webpack 2020-01-31 16:01:02 +03:00
Ildar Kamalov
4d55f51fee + client: remove locales from js bundle 2020-01-31 15:57:20 +03:00
Simon Zolin
2151563757 + http: allow access to /__locales/ when not authenticated 2020-01-31 14:15:11 +03:00
Simon Zolin
f3b41efff3 * http: allow access to /__locales/ while installing 2020-01-31 14:09:04 +03:00
Andrey Meshkov
207e0236f7 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home 2020-01-30 19:18:20 +03:00
Simon Zolin
1a88a63415 Merge: - filtering: fix host rules matching 
Close #1365

Squashed commit of the following:

commit 9cbca2d330ae12b222633201f4864abb7f7cd7a3
Merge: 8ce6b015 be93dc34
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Jan 30 19:03:21 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1365-hostrules

commit 8ce6b0151a2b552c4ccb3ee1f7e36ce260ba96ea
Merge: c752ab33 5c814b29
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Jan 30 18:57:20 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1365-hostrules

commit c752ab33b074312f10772467436a27a90339a919
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Jan 30 14:18:58 2020 +0300

    use new Match()

commit ce2f628aca9f934c776c8c690813efeed5d5427b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Jan 30 12:03:21 2020 +0300

    minor

commit ebebe02a63821fedd3904db384406c30de52d515
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu Jan 30 11:21:47 2020 +0300

    * dnsfilter: use new version of urlfilter's Match()

commit 84edc44f2ee5a67316114f048740825259cc87ff
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jan 24 14:10:41 2020 +0300

    - filtering: fix host rules matching

    Match by both IPv4 and IPv6 rules, not just the first one in list.
 2020-01-30 19:06:09 +03:00
Ildar Kamalov
be93dc3482 Merge: - client: add initial flag for getLogs 
* commit 'dd37c9651a0a5914a5e8c9be4c2f6ad23faf1a13':
  - client: add initial flag for getLogs
 2020-01-30 18:59:28 +03:00
Andrey Meshkov
6faf2ce931 *(global): update trackers db 2020-01-30 18:40:58 +03:00
Ildar Kamalov
5c814b29e1 Merge: + client: handle client block and unblock from the top clients table 
Closes #896

Squashed commit of the following:

commit 776de2ae0a62823b8968cff79a9fa7ba350d7f1c
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Thu Jan 30 11:13:41 2020 +0300

    - client: fix normalizeTextarea and blocking button

commit 399e6bc3893093632b09247eaf6493521a668c84
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Wed Jan 29 17:19:50 2020 +0300

    + client: handle client block and unblock from the top clients table
 2020-01-30 13:58:54 +03:00
Andrey Meshkov
76be272787 Merge branch 'master' of ssh://bit.adguard.com:7999/dns/adguard-home 2020-01-30 13:06:38 +03:00
Andrey Meshkov
327030789d *(global): updated trackers database 2020-01-30 12:28:01 +03:00
Simon Zolin
e27cbdf81b Merge: + DNS: Ability to check from UI if a host name is filtered 
Close #856

* commit '8ec7c37715e410c5564c512162be03383b577e39':
  + client: handle check host
  + GET /filtering/check_host: Check if host name is filtered
 2020-01-30 12:16:17 +03:00
Ildar Kamalov
8ec7c37715 + client: handle check host 2020-01-30 12:08:46 +03:00
Simon Zolin
0d7c01d50f + GET /filtering/check_host: Check if host name is filtered 2020-01-30 12:08:46 +03:00
Ildar Kamalov
dd37c9651a - client: add initial flag for getLogs 2020-01-30 11:57:51 +03:00
Simon Zolin
dcc575402b Merge: * clients: update runtime clients of type DHCP by event from DHCP module 
Close #1378

Squashed commit of the following:

commit e45e2d0e2768fe0677eee43538d381b3eaba39ca
Merge: bea8f79d 5e9c21b0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Jan 29 20:08:20 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1378-dhcp-clients

commit bea8f79dd6f8f3eae87649d853917b503df29616
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Jan 29 20:08:06 2020 +0300

    minor

commit 6f1da9c6ea9db5bf80acf234ffe322a4cd2d8d92
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Jan 29 19:31:08 2020 +0300

    fix

commit a88b46c1ded2b460ef7f0bfbcf1b80a066edf1c1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Jan 29 12:53:22 2020 +0300

    minor

commit d2897fe0a9b726fcd97a04906e3be3d21f6b42d7
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Jan 28 19:55:10 2020 +0300

    * clients: update runtime clients of type DHCP by event from DHCP module

commit 3aa352ed2372141617d77363b2f2aeaf3a7e47a0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Jan 28 19:52:08 2020 +0300

    * minor

commit f5c2291e39df4d13b9baf9aa773284890494bb0a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Jan 28 19:08:23 2020 +0300

    * clients: remove old entries of source type /etc/hosts or ARP
 2020-01-30 10:25:02 +03:00
Ildar Kamalov
5e9c21b0a7 Merge: + client: show filter name for blocked items in the query log 
Closes #993

Squashed commit of the following:

commit 4c5e17226c6efa8a7847a8c565c491a7bae2db59
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Wed Jan 29 12:21:40 2020 +0300

    - client: use constant

commit 818c07d1cfb210965a6413dc8370fc8867979c7b
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Wed Jan 29 12:18:31 2020 +0300

    - client: fix filter find

commit 1f9132151c843dacbf26f814faeeea3cfdff9b73
Author: Ildar Kamalov <i.kamalov@adguard.com>
Date:   Tue Jan 28 15:52:29 2020 +0300

    + client: show filter name for blocked items in the query log
 2020-01-29 15:00:37 +03:00
Simon Zolin
26f69e7126 Merge: * client tags: remove user_other 
* commit 'f2591e1d8a87c4a456e54d86c7c1220ef7de62e8':
  * minor
 2020-01-28 14:37:58 +03:00
Simon Zolin
f2591e1d8a * minor 2020-01-28 14:33:58 +03:00
Simon Zolin
106a7a6017 Merge: + clients: support per-client tags 
Close #1081

* commit '67956597be3bab44124277b7a0e23c02a49da983':
  + client: handle client tags
  * minor
  + clients: support per-client tags
 2020-01-28 14:18:17 +03:00
Ildar Kamalov
67956597be + client: handle client tags 2020-01-28 14:08:28 +03:00
Simon Zolin
b519c3a83f * minor 2020-01-28 14:07:11 +03:00
Simon Zolin
91c2712366 + clients: support per-client tags 2020-01-28 14:06:52 +03:00
Simon Zolin
bd6431bc29 Merge: + DNS: TLS handshake: terminate handshake on bad SNI 
Close #1014

* commit 'bfd1f3b6506e45ae59e90d012e0be5c2dc0b5261':
  + DNS: TLS handshake: terminate handshake on bad SNI
 2020-01-28 13:29:35 +03:00
Andrey Meshkov
02d30388e5 Merge: Update README.md 
* commit '56b0dba1482165e1db67855921ddc2e09f5afc38':
  Update README.md
 2020-01-28 13:26:23 +03:00
Simon Zolin
bfd1f3b650 + DNS: TLS handshake: terminate handshake on bad SNI 2020-01-28 13:25:43 +03:00
hmage
56b0dba148 Update README.md 
More than one requirement, so instead of `it` use plural `them`.
 2020-01-28 13:07:08 +03:00
Artem Baskal
ac156b9612 Merge: + client: add detailed date format for filters 
Close #624

Squashed commit of the following:

commit 5a66d8ca350880abd0a7a146b75df385aa8f97b4
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Jan 20 19:16:27 2020 +0300

    update CellWrap logic

commit 072586493ef2cb73ba514a01d8b7f8904d4f5754
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Mon Jan 20 15:37:26 2020 +0300

    fix invalid date case

commit bd2a21f2c788b2835485f4697dac1b797d5559c0
Author: Artem Baskal <a.baskal@adguard.com>
Date:   Fri Jan 17 18:44:23 2020 +0300

    + client: add detailed date format for filters
 2020-01-24 18:59:38 +03:00
Simon Zolin
ce7f1e231b Merge: * auth: respond with 403 for API requests when not authenticated 
Close #1105

* commit '447080b422f929025454aaa1bc0ab4a6c8abcbd9':
  + client: handle 403 status
  * auth: respond with 403 for API requests when not authenticated
 2020-01-22 18:21:55 +03:00
Ildar Kamalov
447080b422 + client: handle 403 status 2020-01-22 18:11:26 +03:00
Simon Zolin
080e1dd74e * auth: respond with 403 for API requests when not authenticated 2020-01-22 18:11:26 +03:00
Simon Zolin
b5f95fefc8 Merge: + Filters: Allow changing Filter Name and URL parameters 
Close #971

* commit 'b3bca39de4bebb716606c35f034f84cb6aa12de0':
  + client: modify added filters
  * filtering/set_url: allow changing Name and URL parameters
 2020-01-21 14:22:11 +03:00
Ildar Kamalov
b3bca39de4 + client: modify added filters 2020-01-21 14:19:05 +03:00
Simon Zolin
0b8cba7384 * filtering/set_url: allow changing Name and URL parameters 2020-01-21 14:19:05 +03:00
Ildar Kamalov
e9dea459dd Merge: + client: use relative URLs for login/logout 
Closes #1300

* commit '1b1338fed680f13bb8128258efe87aa2a0cea4d4':
  + client: use relative URLs for login/logout
 2020-01-21 14:16:44 +03:00
Simon Zolin
3f7e2f7241 Merge: * dns: refactor 
Squashed commit of the following:

commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Jan 21 13:04:30 2020 +0300

    Merge remote-tracking branch 'origin/master' into refactor

commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Jan 20 15:25:43 2020 +0300

    minor

commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jan 17 17:50:09 2020 +0300

    minor

commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jan 17 15:30:37 2020 +0300

    minor

commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jan 17 14:28:14 2020 +0300

    * dns: refactor

    . introduce a local context object
    . move filtering, upstream logic, stats, querylog code to separate functions
 2020-01-21 13:49:34 +03:00
Simon Zolin
e7e946faa6 Merge: * DNS: nxdomain: don't return IP address for a blocked domain 
Close #1284

* commit 'b01af453cc27cdb89ac0482ec68108ec8a2835a5':
  + client: handle default blocking mode
  * config: set "default" blocking mode by default
  * DNS: nxdomain: don't return IP address for a blocked domain
 2020-01-20 19:17:44 +03:00
Ildar Kamalov
b01af453cc + client: handle default blocking mode 2020-01-20 19:14:14 +03:00
Simon Zolin
8daca1a55a * config: set "default" blocking mode by default 2020-01-20 19:14:14 +03:00
Simon Zolin
07ebcc2bf3 * DNS: nxdomain: don't return IP address for a blocked domain 
Don't return IP address for a blocked domain
 when blocking mode is "nxdomain".
 2020-01-20 19:14:14 +03:00
Ildar Kamalov
1b1338fed6 + client: use relative URLs for login/logout 2020-01-20 18:34:22 +03:00
Artem Baskal
3166607540 Merge: + client: show date in query logs 
Close #1202

* commit 'af7b9523b5732e708bf29d1dc8102887eece93b5':
  rewrite using isToday helper
  + client: add jsdocs with returning format of date format functions
  + client: show date in query logs
 2020-01-20 15:02:29 +03:00
Artem Baskal
1947f1232e Merge: + client: get rid of the clients caching 
Close #1218

* commit '7812ee1861be0eea89bd419ee82f6cb45b24f043':
  + client: get rid of clients caching
 2020-01-17 18:57:30 +03:00
Artem Baskal
af7b9523b5 rewrite using isToday helper 2020-01-17 17:40:47 +03:00
Artem Baskal
7812ee1861 + client: get rid of clients caching 2020-01-17 13:27:22 +03:00
Artem Baskal
a3020275a2 + client: add jsdocs with returning format of date format functions 2020-01-17 12:57:30 +03:00
Artem Baskal
2bc2b342eb Merge + client: close sidebar menu on mobiles screen after choosing 
Close #1318

* commit '2c6e3d0e91af59304128e7a94b1f13362b4b4117':
  + client: add comment about order of settings dropdown order
  + client: close sidebar menu on mobiles screen after choosing
 2020-01-17 11:34:48 +03:00