Commit Graph

2183 Commits

Author SHA1 Message Date
Simon Zolin dae275e6f9 * log: set default LogMaxAge = 3 days
Squashed commit of the following:

commit 80a1ce12982679022f553cb8dc778d506b010fed
Merge: 4e01a5bd c842a68a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jun 5 17:53:53 2020 +0300

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

commit 4e01a5bda625c034c9154aa3a1f94559b45260be
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Jun 5 13:56:39 2020 +0300

    * log: set default LogMaxAge = 3 days
2020-06-05 17:58:42 +03:00
Artem Baskal c842a68a1b - client: Fix beyond 24 hour time format for en locale: Merge pull request #651 in DNS/adguard-home from fix/1766 to master
Close #1766

Squashed commit of the following:

commit 691aa0e30e8435c81118cb5b8784a6902ed10f08
Merge: 67d62fa9 4a81abb9
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jun 5 13:17:46 2020 +0300

    Merge branch 'master' into fix/1766

commit 67d62fa9f8c9e1e7c7db714b85aa19e6b897a2d0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jun 5 11:53:47 2020 +0300

    Fix jsdocs of helpers

commit 459e3cf8e185033d7e20f0b1d24c6e0146310017
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jun 4 20:45:17 2020 +0300

    - client: Fix beyond 24 hour time format for en locale
2020-06-05 13:28:13 +03:00
Artem Baskal 4a81abb922 + client: Move "Blocked services" to a separate page under "Filters" menu: Merge pull request #649 in DNS/adguard-home from feature/1744 to master
Close #1744

Squashed commit of the following:

commit 912a80b8ff42c927a97d33ccb3eebf8c3ca188d9
Merge: bb5a77ff 5ce98bd2
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri Jun 5 12:47:21 2020 +0300

    Merge branch 'master' into feature/1744

commit bb5a77ff6b66743bf23c9582c523280bdf9ef63a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Jun 4 18:07:26 2020 +0300

    + client: Move "Blocked services" to a separate page under "Filters" menu
2020-06-05 13:03:48 +03:00
Simon Zolin 5ce98bd2a4 Merge: + config: add new logging settings
Close #1763

* commit '0d343abec05b87e08f8a510fad8f969c8b8f1747':
  * minor
  + config: Added in lumberjack to handle rolling logs. Added more config properties around new log feature.
2020-06-05 12:30:16 +03:00
Simon Zolin 539ccb2bf0 Merge: + querylog,stats: anonymize client ip: /16
Close #1741

* commit '1b5fb97a023e79721e08a7ecedf1f2b36d7ebce6':
  + querylog,stats: anonymize client ip: /16
2020-06-03 19:17:50 +03:00
Simon Zolin 1b5fb97a02 + querylog,stats: anonymize client ip: /16 2020-06-03 19:08:11 +03:00
Simon Zolin 0d343abec0 * minor 2020-06-02 19:20:31 +03:00
DannyHinshaw e23b79dda0 + config: Added in lumberjack to handle rolling logs. Added more config properties around new log feature.
Reset logger max file size config. Fix #1573.

Remove verbose from default config.
2020-06-02 19:18:37 +03:00
Artem Baskal 2ecd38544a - client: Hide version on inintial setup and login: Merge pull request #642 in DNS/adguard-home from fix/1748 to master
Close #1748

Squashed commit of the following:

commit 16721edf69eb3f5ad96253e0999b99c3aaeac822
Merge: 15e1867f eac1b809
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Jun 2 13:37:57 2020 +0300

    Merge branch 'master' into fix/1748

commit 15e1867fdaee8d5c024d74ee2ef7416fec920341
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon Jun 1 13:54:15 2020 +0300

    - client: Hide version on inintial setup and login
2020-06-02 13:46:35 +03:00
Simon Zolin eac1b80930 Merge: * blocked-services: Added 2 entries for YouTube and Amazon AWS
Close #1758

* commit 'bb016f07c6ae93dbe5708c818a87e1b991b81578':
  * blocked-services: Added 2 entries for YouTube and Amazon AWS
2020-06-01 15:26:21 +03:00
Simon Zolin 9a030aa99f - rewrites: fix invalid question in response
#1746

for a rule:

cname -> domain

with IP of 'domain' resolved by upstream

Squashed commit of the following:

commit fb3ad25ac8a7963a8fa6587cdc33e2fc35f79dfb
Merge: a6794989 67dacdf8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Jun 1 15:15:23 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1746-rewrites

commit a679498904a817011b55c58ee579e55f27fa0bc8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Jun 1 10:42:16 2020 +0300

    test: check question

commit 7491e753c5eb6df54c9c050b0fa198c81dded2a0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri May 29 18:22:32 2020 +0300

    test

commit 12cb2e194191ca489c9025b55f8571ae2dd7c33d
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri May 29 14:51:06 2020 +0300

    - rewrites: fix invalid question in response

    for a rule:

    cname -> domain

    with IP of 'domain' resolved by upstream
2020-06-01 15:23:08 +03:00
Imre Kristoffer Eilertsen bb016f07c6 * blocked-services: Added 2 entries for YouTube and Amazon AWS 2020-06-01 12:03:54 +03:00
Artem Baskal 67dacdf8ae - client: Fix safari icon: Merge pull request #640 in DNS/adguard-home from fix/1751 to master
Close #1751

* commit '262bcd847f1468ca2f77000f4cd32a402e352414':
  - client: Fix safari icon
2020-05-29 18:59:33 +03:00
ArtemBaskal 262bcd847f - client: Fix safari icon 2020-05-29 18:40:58 +03:00
Artem Baskal 620f5c22c7 - client: fix/1754 - Merge pull request #639 in DNS/adguard-home from fix/1754 to master
Close #1754

* commit 'dddcbe77e29ff815e32913de4e5d99be98ab9934':
  -client: Fix "DNS rewrites" adding an item error
2020-05-29 17:09:15 +03:00
Artem Baskal b8032801a2 - client: Submit setFiltersConfig action on if the values are changed: Merge pull request #637 in DNS/adguard-home from fix/1749 to master
Close #1749

Squashed commit of the following:

commit aaf4ba86429670ea8b0001325562c4a173be5b4a
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri May 29 13:29:44 2020 +0300

    - client: Submit setFiltersConfig action on if the values are changed
2020-05-29 16:08:01 +03:00
ArtemBaskal dddcbe77e2 -client: Fix "DNS rewrites" adding an item error 2020-05-29 16:05:36 +03:00
Artem Baskal 72f253f62b - client: Match client IP strictly: Merge pull request #620 in DNS/adguard-home from fix/1687 to master
Close #1687

Squashed commit of the following:

commit 5287da0b98d154d4243abdb4b9021006499c225f
Merge: c6b50c70 83b9b701
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri May 29 12:47:23 2020 +0300

    Merge branch 'master' into fix/1687

commit c6b50c70a5089fcadfd2606b07b3b84769db2760
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri May 29 12:42:12 2020 +0300

    minor

commit dab9fa9ee0502838b4e10aef93d037c2fb5bf41b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu May 28 16:56:08 2020 +0300

    Add support for exact matching of long and short ipv6 notations, add tests

commit e72e86cda81af2c5e54f93abb2890438fd3648b0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu May 28 13:57:22 2020 +0300

    Update helper, write tests

commit 92f4c34224ab7927b02edde829f2d9653a00a854
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 27 18:35:05 2020 +0300

    Make variable names more expressive

commit 3d38f21281237e9cccbba26afc1ab641947c5dc0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 27 17:09:08 2020 +0300

    Add ipv6 cidr support

commit 7db0a2fb18ccd96d8d1def73f12138e4f4e37f71
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 26 12:48:57 2020 +0300

    Minor

commit 65e87f3899aab3417cac57bab0a8fa371cafd4ec
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 26 12:46:30 2020 +0300

    Add breaks between helpers

commit 3f38bdfe7bc17e019bf048c79c9e8f1336b6f3d3
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu May 21 20:17:27 2020 +0300

    - client: Match client IP strictly
2020-05-29 12:53:40 +03:00
Artem Baskal 83b9b70166 - client: Don't unregister field 'Upstream DNS servers' on rerender and allow input text continuously
Close #1752

Squashed commit of the following:

commit 2f86ade71eadd648fe3e62d8f619d5f1419d6527
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Fri May 29 10:58:42 2020 +0300

    - client: Don't unregister field 'Upstream DNS servers' on rerender and allow input text continuously
2020-05-29 11:12:43 +03:00
Simon Zolin 32d1f385ff + config: new setting "querylog_file_enabled"
Close #876

Squashed commit of the following:

commit f83f60a7340d8a3f6de7ecfebb426e47d19e83d8
Merge: cfb72869 391e6199
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu May 28 15:17:21 2020 +0300

    Merge remote-tracking branch 'origin/master' into 876-logs

commit cfb72869f7cf0bf59a478ab8c7920c273e2fa5f9
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Thu May 28 12:50:02 2020 +0300

    tests

commit 35376e4f450cf66507d733c931b7ed27eff1f36c
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 18:15:12 2020 +0300

    fix

commit 0cfb802d73db52a4b09c459a68a8a18918447b76
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 16:49:52 2020 +0300

    tests

commit 03ca280b6aed3a4880a9d4f4cd18bf47b1c742f6
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 15:32:27 2020 +0300

    + config: new setting "querylog_file_enabled" - query log will be written to a file
2020-05-28 15:29:36 +03:00
Simon Zolin 391e619979 * whois: use the upstream server to resolve whois server hostname
Close #1535

Squashed commit of the following:

commit 7755d7a50e48db5d341029e1c21da95a396d9090
Merge: e24e945f 5c2ca690
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 14:41:24 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1535-whois-resolve

commit e24e945f9b949e3cabcddb3a8a62962bb7a5b0b9
Merge: db764710 355e634f
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 14:29:44 2020 +0300

    Merge remote-tracking branch 'origin/master' into 1535-whois-resolve

commit db764710a0f0b60293f7bdf6b0d7b858d56819e0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 12:57:00 2020 +0300

    fix

commit dc38f668d5845cfd696b3107a8f02dda4f10298e
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed May 27 12:44:10 2020 +0300

    * whois: use the upstream server to resolve whois server hostname
2020-05-27 14:54:31 +03:00
Simon Zolin 5c2ca69018 Merge: * web: log error messages from HTTP server as "debug"
Close #1167

* commit 'ee690e3e327f7e456de476f84e359faf52229b21':
  * web: log error messages from HTTP server as "debug"
2020-05-27 14:30:18 +03:00
Artem Baskal 355e634f64 - client: Don't hide version string when built-in auto-update is disabled: Merge pull request #628 in DNS/adguard-home from fix/1726 to master
Close #1726

Squashed commit of the following:

commit 3eac793c7c05fbb599f510fd8cae560011b7f5ca
Merge: aebfaf61 16a6aada
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 27 14:14:58 2020 +0300

    Merge branch 'master' into fix/1726

commit aebfaf610113f83027feb959ed87adef1b2db255
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 27 12:54:30 2020 +0300

    Always show version but hide update button when program is launched with "--no-check-update" flag

commit 1d4ee05959379420fee9730b3bf8ba737852e96e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 27 11:59:10 2020 +0300

    Use classnames lib

commit 7003a7064c9625fab513dc02222faff4a340393f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 26 19:40:22 2020 +0300

    - client: Don't hide version string when built-in auto-update is disabled
2020-05-27 14:25:27 +03:00
Simon Zolin ee690e3e32 * web: log error messages from HTTP server as "debug" 2020-05-27 12:17:05 +03:00
Andrey Meshkov 16a6aada6f Merge: *(querylog): added offset/limit parameters
* commit '61a24ffc71eda26e10a11e3a9c8506909b6c4b52':
  *(querylog): decode methods to a new file
  *(querylog): added offset/limit parameters
2020-05-27 11:40:15 +03:00
Simon Zolin 605d2ae4d3 Merge: * urlfilter v0.10.1
Close #1707

* commit 'ab6be6980a8ef7aeb58913bf0084e4160f6fb899':
  * urlfilter v0.10.1
2020-05-26 19:42:17 +03:00
Simon Zolin 1d75b2a57f Merge: + rewrites: support exceptions
Close #1547

* commit '118b170210962da5d088d196feccc6e14ba5a132':
  + rewrites: support exceptions:
2020-05-26 19:37:46 +03:00
Simon Zolin ab6be6980a * urlfilter v0.10.1 2020-05-26 19:36:24 +03:00
Simon Zolin 8c5a3c55ab Merge: * clients: set reload ARP data interval to 10 minuntes
Close #1398

* commit '2825691c85fadc7ce1c1727a12e8699ff780d0dd':
  * clients: set reload ARP data interval to 10 minuntes
2020-05-26 17:54:54 +03:00
Simon Zolin 2825691c85 * clients: set reload ARP data interval to 10 minuntes 2020-05-26 16:27:13 +03:00
Andrey Meshkov 61a24ffc71 *(querylog): decode methods to a new file 2020-05-26 16:24:31 +03:00
Andrey Meshkov ceedc2d1ff *(querylog): added offset/limit parameters
Actually, this is a serious refactoring of the query log module. The
rest API part is refactored, it's now more clear how the search is
conducted. Split the logic into more files and added more tests.

Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1559
2020-05-26 15:37:37 +03:00
Simon Zolin 118b170210 + rewrites: support exceptions:
*.host -> IP
my.host -> my.host
*.my.host -> *.my.host

Requests for my.host and *.my.host will be passed to upstream servers,
 while all other requests for *.host will be answered with a rewritten IP
2020-05-26 11:42:42 +03:00
Artem Baskal 383507bc0c + client: Allow `Fastest IP address` and `Parallel requests` to toggle each other: Merge pull request #619 in DNS/adguard-home from feature/1678 to master
Close #1678

Squashed commit of the following:

commit 9251ed0f1b58426104d1b9bdaa4b7af5f92be83e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu May 21 18:25:18 2020 +0300

    + client: Allow `Fastest IP address` and `Parallel requests` to toggle each other
2020-05-25 19:41:04 +03:00
Simon Zolin 2f5073b720 Merge: - filter: don't reset name on update
* commit '2303bb253a94045a0d1d7853f7f0840571f03879':
  - filter: don't reset name on update
2020-05-25 18:27:05 +03:00
Simon Zolin 2303bb253a - filter: don't reset name on update 2020-05-25 17:13:13 +03:00
Simon Zolin 2a2b7c6eb5 Merge: * blocked-services: Update new TikTok domains
#1725

* commit 'b050165566e9335083047ea0d03c1a8b39448064':
  - blocked-services: fix build
  * blocked-services: Update new TikTok domains
2020-05-25 12:46:50 +03:00
Simon Zolin b050165566 - blocked-services: fix build 2020-05-25 11:01:17 +03:00
Ayhan 31fff2ab2e * blocked-services: Update new TikTok domains 2020-05-25 10:56:57 +03:00
Artem Baskal 6f3cd4e7eb + client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master
Close #1597

Squashed commit of the following:

commit 1eb89586dd71260e561420fe669abc8b56a506a1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 20 14:54:10 2020 +0300

    Fix translation in install options

commit 1ebdc9ebfe12a609f978e47db6505c7095b10f7e
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed May 20 13:11:34 2020 +0300

    Remove commented code

commit 2a8302c65a2a3cf7b6b1596115d1153dac32a794
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 19:02:49 2020 +0300

    Update i18n packages, add development browserlist, downgrade eslint to match peerDepencancies version

commit 3fcf73fb14cd9da508522d1a300b66af24da95e5
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 17:30:37 2020 +0300

    Remove all unused dependencies

commit e761810e3e54e188ada41245bdce7414cd0f03e8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 16:35:24 2020 +0300

    Remove unused dependencies

commit d89d27da6befcaabcdc12bf5e7e94cbb24140010
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 16:14:09 2020 +0300

    Update regular dependencies

commit d2dfd01233d059870d5173ffd748cf61a477936f
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 15:34:10 2020 +0300

    Update all dev dependancies

commit 02b6fb480e9d310039fbe9b7aae062a41128f070
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 14:14:44 2020 +0300

    Update all postcss packages

commit 5e1fa5f99ad75f77e5e429b28ee1ca0b5e65a9a0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 12:45:02 2020 +0300

    Prevent git from converting linebreaks in .js files

commit 0b9b3b0dccd47cfa50c9531fb61729e6b5a04523
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 12:43:01 2020 +0300

    Prevent git from converting linebreaks in .js files

commit 18b7495e9ef7130b1ac4dbba84c54127d16c6350
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 19 12:24:47 2020 +0300

    Remove linebreak-style eslint rule

commit df893dec53adebb1d662fe805fab508fd4ed5e06
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon May 18 20:55:47 2020 +0300

    Add prop types

commit 36178ecfc5c7fa11a6ee08d7705ca8560941af40
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon May 18 18:52:07 2020 +0300

    Update eslint and babel, fix eslint warnings

commit f045b4a2e6b9b78f7e88e3b5d1419c29966a8230
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Mon May 18 16:45:49 2020 +0300

    Update css loading webpack rules

commit 247fa1ed548ef0706a03fdada8309c1454d191f8
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Sat May 16 16:13:49 2020 +0300

    Suppress linebreak-style eslint error for Windows

commit d6499aac507100d6918c849c06d739d80f2229f0
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Sat May 16 14:55:07 2020 +0300

    Suppress eslint exit code

commit ae2d6c614ea23a90d515168f8752e959298894ef
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Sat May 16 14:05:18 2020 +0300

    Edit css file warnings

commit 60675050f2a5baebc679fc05da7e033e5c740d90
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Sat May 16 13:10:26 2020 +0300

    Remove uglifyjs plugin

commit a27806434dd8672e71a26c7a2e810d77e5e229fa
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Sat May 16 01:29:17 2020 +0300

    Fix DefinePlugin value

commit 8f2966ca59195c2f70bca5072d20515d536f42a6
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Sat May 16 01:05:03 2020 +0300

    Update webpack
2020-05-22 17:06:05 +03:00
Simon Zolin 8b25a4886e Merge: * client: update guide
* commit '53277ee70bb8d9710e2caa346ab371b0bb79c003':
  update guide
2020-05-21 15:05:43 +03:00
Simon Zolin 8d91e042cc Merge:- rewrites: fix crash when handling name->cname->A chain
Close #1704 Close #1712

* commit '0848ca0e69e3c535b70e2d1f7e8c24f0e1941ee9':
  - rewrites: fix crash when handling name->cname->A chain
2020-05-21 14:58:32 +03:00
Archive5 53277ee70b update guide 2020-05-21 14:56:50 +03:00
Simon Zolin 0848ca0e69 - rewrites: fix crash when handling name->cname->A chain
crash.adguard -> adguard.a.record
adguard.a.record -> 1.2.3.4
2020-05-21 14:48:31 +03:00
Andrey Meshkov b5e78c760a *(documentation): removed unnecessary dependencies 2020-05-21 00:04:41 +03:00
Andrey Meshkov 653d68718b Merge branch 'master' of git://github.com/TXC/AdGuardHome into TXC-master 2020-05-20 23:48:26 +03:00
Simon Zolin 2d1cba67dc Merge: - filter: fix rules count when data doesn't end with a newline
Close #1694

* commit '286eb43c5622b2f35d7fe2b5f445da2ed2663658':
  - filter: fix rules count when data doesn't end with a newline
2020-05-18 19:34:25 +03:00
Simon Zolin 806f81ede9 Merge: - autohosts: support tab character
Close #1686

* commit '2f454117ce7562df934b20c385c11006f8a1cf8f':
  - autohosts: support tab character
2020-05-18 19:18:48 +03:00
Simon Zolin 2f454117ce - autohosts: support tab character 2020-05-18 18:46:17 +03:00
Simon Zolin 286eb43c56 - filter: fix rules count when data doesn't end with a newline 2020-05-18 10:53:28 +03:00