Commit Graph

2314 Commits

Author SHA1 Message Date
Artem Baskal 4d66d25fda Merge: - client: Fix npm ci fail
Close #1597

Squashed commit of the following:

commit 75884d17de9acecf59b4f76a488d37ae76e52246
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 12 17:18:24 2020 +0300

    - client: Fix npm ci fail
2020-05-13 15:27:07 +03:00
Artem Baskal ead5a16b2a Merge: + client: trim DNS blocklists fields on blur
Close #1634

Squashed commit of the following:

commit 5f38da50b2075a9b5967aed39b62a8ab05e57a1c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 12 20:02:05 2020 +0300

    + client: Trim fields on blur
2020-05-13 15:15:22 +03:00
Andrey Meshkov a09e59a59d *: upd locales 2020-05-13 00:49:56 +03:00
Andrey Meshkov 8d66ede894 *: memory usage hacks 2020-05-13 00:46:35 +03:00
Andrey Meshkov 408a8dea44 *: fix #1656 2020-05-12 01:36:47 +03:00
Andrey Meshkov 5df42378d0 Merge: +(dnsforward): added bogus-nxdomain setting
Fix #1545

* commit 'cd87169ee43914c97f7f11bf65cb2864de8bc62e':
  *: comments fix
  +(dnsforward): added bogus-nxdomain setting
2020-05-08 19:09:44 +03:00
Andrey Meshkov 5ace7894f8 Merge: * blocked services: Update discord block for new domain
* commit 'e95c4f799bf44bed49856a77738105920b930263':
  * blocked services: Update discord block for new domain
2020-05-08 19:03:51 +03:00
Andrey Meshkov cd87169ee4 *: comments fix 2020-05-08 19:02:16 +03:00
Andrey Meshkov 8909599739 +(dnsforward): added bogus-nxdomain setting
Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1545
2020-05-08 18:39:37 +03:00
Andrey Meshkov 0311e53ebb *: added comment 2020-05-08 17:43:49 +03:00
Tobias Messner e95c4f799b * blocked services: Update discord block for new domain
Discord now also uses discord.com as domain, this adds it to the blocked services list
2020-05-08 13:28:33 +03:00
Andrey Meshkov 6d136ee2cb Merge: * filter: skip comment lines starting with '#'
* commit 'b034e25b26ec01c8b2607726646c55777ba66a1d':
  * filter: skip comment lines starting with '#'
2020-05-07 20:10:45 +03:00
DannyHinshaw b034e25b26 * filter: skip comment lines starting with '#'
Fix #771, filter skips comment lines starting with '#'.

Handle exclamation inline comments.

Refactor for correct logic flow.

Split out hashtag comment logic from exclamation.

Remove trailing whitespace.
2020-05-07 18:03:25 +03:00
ArtemBaskal 8aad02dbf2 + client: Add icons for Apple products 2020-05-06 11:15:19 +03:00
Tobias Messner 0a0c82d227
Update discord block for new domain
Discord now also uses discord.com as domain, this adds it to the blocked services list
2020-05-05 18:13:29 +02:00
Jonas Marklén 694e649355
Update index.html 2020-05-02 10:57:59 +02:00
Jonas Marklén 8f77a89fce
resolve conflicts 2020-05-02 10:39:52 +02:00
Jonas Marklén efd2b31104
Merge branch 'master' of github.com:AdguardTeam/AdGuardHome
 Conflicts:
	openapi/openapi.yaml
2020-05-02 10:09:25 +02:00
Alan Pope f250fc16a2
Correct architecture builds
The current syntax means it will build on one of the architectures to run on all. That would be useful if it was an arch-independent snap, such as a shell script. But this contains arch-specific binaries. Using the syntax here, will get four separate builds (one per arch) which is the desired outcome.
2020-05-01 20:55:34 +01:00
Artem Baskal 89920bc518 Merge: + client: Hide dns autofix warning text
Squashed commit of the following:

commit e99192ac85400bcce09ca8d73ceef0224f003e0c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Thu Apr 30 16:03:20 2020 +0300

    Show autofix warning conditionally

commit e5658fc3aaee449a49bee76063033dc62e61c722
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 19:18:02 2020 +0300

    + client: Add wiki link on instllation screen
2020-04-30 18:59:14 +03:00
Simon Zolin a702eda9d9 Merge: dnsproxy v0.27.1
* commit 'efc69047a172074bf7ef5d1271f30d1eb0dba90c':
  dnsproxy v0.27.1
2020-04-30 11:43:56 +03:00
Simon Zolin efc69047a1 dnsproxy v0.27.1 2020-04-30 10:57:07 +03:00
Artem Baskal 2837502a7b Merge: + client: Make default table height 100%
Squashed commit of the following:

commit d6b07ae070b5ec826dbe3e226e326f9d52b8c7d1
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 16:57:22 2020 +0300

    Limit dasboard tables height

commit 6b42f7a1e3cb82e1b792dd352717a3ffa9566b4b
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 29 16:44:08 2020 +0300

    + client: Make default table height 100%
2020-04-29 19:09:00 +03:00
Simon Zolin ab1ab30e6f Merge: + rewrites: support deeper level wildcards - select the more specific one
#1547

* commit 'b33653ec48a613df24d1768aab56a5c505affd33':
  + rewrites: support deeper level wildcards - select the more specific one
2020-04-28 10:39:30 +03:00
Simon Zolin b33653ec48 + rewrites: support deeper level wildcards - select the more specific one 2020-04-27 17:24:55 +03:00
Andrey Meshkov c0ebf9e793 *: more badges to the god of badges 2020-04-27 16:18:35 +03:00
Simon Zolin 14ffd1a3f5 Merge: - blocked-services: settings were reset on restart
Close #1624

Squashed commit of the following:

commit eecc91ca1f9d062c27702a9c07da74da673bef05
Merge: ec53dbeb 26f78dcc
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 27 13:15:58 2020 +0300

    Merge remote-tracking branch 'origin/master' into fix-blocked-svcs

commit ec53dbebdc2fbd2ff94f939d2bd8fb07b9dd1bc8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 27 12:58:50 2020 +0300

    minor

commit 1e3c20ed02151965ebaca55ac4f25a951a772062
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 27 12:53:37 2020 +0300

    - blocked-services: settings were reset on restart

    broken by:
     0789e4b20d
     * refactor: move blocked-services functions to dnsfilter
2020-04-27 13:21:16 +03:00
Simon Zolin 26f78dcc65 Merge: * client: router guide: add more info
Close #1018

* commit '80c3112ab3cf28c75fc7ededf8b917915c32d538':
  * client: router guide: add more info
2020-04-27 11:00:07 +03:00
Andrey Meshkov 08b033dd04 *(dnsforward): upgrade dnsproxy to v0.27.0 2020-04-26 19:16:10 +03:00
Andrey Meshkov cd15bb5cce Merge: + client: Switch places for "Upstream DNS servers" and "DNS servers configuration"
* commit '3b0914715ee0be2a5b6236729b9976193db9bb17':
  + client: Switch places for "Upstream DNS servers" and "DNS servers configuration"
2020-04-24 18:33:10 +03:00
Simon Zolin 80c3112ab3 * client: router guide: add more info 2020-04-24 16:54:37 +03:00
ArtemBaskal 3b0914715e + client: Switch places for "Upstream DNS servers" and "DNS servers configuration" 2020-04-24 16:51:44 +03:00
Simon Zolin d01407c1a0 Merge: - Web: flush the bufferred response data before performing global operations
Close #1617

* commit 'e24143a1962c16763cb73f4e41b30117bcf0d80c':
  - Web: flush the bufferred response data before performing global operations
2020-04-24 16:22:16 +03:00
Simon Zolin e24143a196 - Web: flush the bufferred response data before performing global operations 2020-04-24 15:50:57 +03:00
Simon Zolin 8ab6fa3300 Merge: * TestAuth: improve test
* commit '44353821e6bf99839dac15f0049a3335c0376258':
  * TestAuth: improve test
2020-04-24 15:37:35 +03:00
Andrey Meshkov 8ad9422a48 *(documentation): added info about snap edge/beta channels 2020-04-24 15:13:24 +03:00
Andrey Meshkov 95c5bd35c5 Merge with master 2020-04-24 15:09:03 +03:00
Andrey Meshkov 9ce2a66c0e *(documentation): added Snap Store to documentation 2020-04-24 15:08:58 +03:00
Simon Zolin 44353821e6 * TestAuth: improve test 2020-04-24 14:04:40 +03:00
Simon Zolin 2191c49161 Merge: * use dnsproxy v0.26.3
Close #1612

* commit '490784c285acc6ae32994062e3d9d1db73639713':
  dnsproxy v0.26.3
2020-04-24 13:50:13 +03:00
Andrey Meshkov c7a2cbe04e *(global): limit architectures list for edge build 2020-04-24 12:28:00 +03:00
Andrey Meshkov b5d437c92a *: snapfile for edge channel builds 2020-04-24 12:00:20 +03:00
Simon Zolin 490784c285 dnsproxy v0.26.3 2020-04-24 10:25:46 +03:00
Andrey Meshkov 25361836bf *: snap: don't use SNAP_COMMON 2020-04-24 01:15:53 +03:00
Simon Zolin 314a0ca27b Merge: * blocked_services: update
Close #1602

* commit '4889f2d00a2153c6b78d3b92cf050d3b0ad5c763':
  * blocked_services.go: Update blocked services component
2020-04-23 16:23:18 +03:00
Andrey Meshkov 4d73a0148e change snap name to adguard-home 2020-04-23 16:18:58 +03:00
Archive5 4889f2d00a * blocked_services.go: Update blocked services component
rearrange

rearrange
2020-04-23 10:12:13 +03:00
Andrey Meshkov 63d525c4d4 upd snap yaml 2020-04-23 01:05:31 +03:00
Andrey Meshkov 1041aa8aff fix stable snap publishing 2020-04-23 00:27:03 +03:00
Andrey Meshkov e2ee2d48df Allow to build a specific snap architecture 2020-04-22 21:57:25 +03:00