cotugno/AdGuardHome
2
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2024-11-16 02:18:28 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,238 Commits 94 Branches 201 Tags 67 MiB
c12309a1b2
Commit Graph

2238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrey Meshkov
2fca419c7f *(home): fix TLS module initialization 
Continue to work even when TLS cert-key pair is invalid

Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1677
 2020-05-16 02:02:50 +03:00
Andrey Meshkov
6adf48c938 *(home): added more logging to TLS module 2020-05-16 01:37:12 +03:00
Andrey Meshkov
bab7b2dc65 fix 2020-05-14 23:28:42 +03:00
Andrey Meshkov
332ef250b7 Merge with master 2020-05-14 23:28:05 +03:00
Andrey Meshkov
3b258e536b minor fix of the snap publish script 2020-05-14 23:28:01 +03:00
Andrey Meshkov
35a6708ccf Merge: + client: Add icons for Apple products 
Fix #1574

* commit '502fe3cfc5feea46f287854d0c3ebb9e66676bdd':
  *(home): fix assets access
  Fix go lint warning
  Add assets folder
  Add icons to server
  + client: Add icons for Apple products
 2020-05-14 18:44:42 +03:00
Andrey Meshkov
c64fdf9442 *(global): update translations 2020-05-14 18:44:12 +03:00
Andrey Meshkov
502fe3cfc5 *(home): fix assets access 2020-05-14 18:37:25 +03:00
Andrey Meshkov
df1f7ebc8d Merge branch 'master' into feature/1574 2020-05-14 18:29:33 +03:00
Andrey Meshkov
fb79416ebe -: fix #1632 2020-05-14 18:24:59 +03:00
Andrey Meshkov
39420c8a00 Merge: -(dnsforward): custom client per-domain upstreams 
* commit '5d7b3fb7d5aa14c434dc532aef2fd68e54e7e182':
  -(dnsforward): fix handling RRSIG records
  Added a unit-test for custom upstreams
  -(dnsforward): custom client per-domain upstreams
 2020-05-14 18:14:52 +03:00
Andrey Meshkov
b8567c5b56 Merge: Add IntelliJ Project files (*.iml) to .gitignore 
* commit '5b7871b6b8836d274f7d4c2d02d5549c58ad6e69':
  Add IntelliJ Project files (*.iml) to .gitignore Rename "Portuguese" to "Português" so it's localized like all other languages
 2020-05-14 18:09:36 +03:00
Andrey Meshkov
5d7b3fb7d5 -(dnsforward): fix handling RRSIG records 2020-05-14 18:08:47 +03:00
Christian Glockner
5b7871b6b8 Add IntelliJ Project files (*.iml) to .gitignore Rename "Portuguese" to "Português" so it's localized like all other languages 2020-05-14 17:37:53 +03:00
ArtemBaskal
11d65330a0 Fix go lint warning 2020-05-14 15:03:00 +03:00
ArtemBaskal
5f13d4ab4a Add assets folder 2020-05-14 14:45:16 +03:00
Andrey Meshkov
ae51de9335 Added a unit-test for custom upstreams 2020-05-14 12:57:41 +03:00
ArtemBaskal
26ac9e4224 Add icons to server 2020-05-14 12:06:22 +03:00
Andrey Meshkov
67a39045fc -(dnsforward): custom client per-domain upstreams 
Closes: https://github.com/AdguardTeam/AdGuardHome/issues/1539
 2020-05-13 20:31:43 +03:00
Artem Baskal
1f954ab673 Merge: + client: Use monospace font in coding-like inputs 
Close #1650

Squashed commit of the following:

commit 0956b77d2675bf569ab8413bf1a905167f068fbd
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 12 18:22:55 2020 +0300

    Replace css variable

commit 7c65954e3727c09404999d4d029276f78a8d0ffe
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue May 12 18:06:31 2020 +0300

    + client: Use monospace font in coding-like inputs
 2020-05-13 15:34:56 +03:00
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
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