a/badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,498 Commits 3 Branches 0 Tags 148 MiB
9fd74748bb
Commit Graph

2498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Andrey Meshkov
4153d973ec update snap script, added temp files to .gitignore 2020-04-22 21:02:38 +03:00
Artem Baskal
0ffc0965dc + client: add fastest_addr setting 
Squashed commit of the following:

commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 19:16:01 2020 +0300

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

commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Wed Apr 22 18:30:30 2020 +0300

    Review changes

commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <a.baskal@adguard.com>
Date:   Tue Apr 21 16:37:42 2020 +0300

    + client: Add fastest addr option

commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 16:02:03 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 15:40:49 2020 +0300

    minor

commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 17:56:24 2020 +0300

    * API changes

    . removed POST /set_upstreams_config
    . removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
    . added new fields to /dns_config and /dns_info

commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 16:43:13 2020 +0300

    * API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config

commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Mar 23 10:28:25 2020 +0300

    openapi

commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 19:18:48 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 18:13:43 2020 +0300

    + DNS: add fastest_addr setting
 2020-04-22 19:32:07 +03:00
Simon Zolin
e2ddc82d70 + DNS: add fastest_addr setting 
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
* API: /status: removed fields

#715

Squashed commit of the following:

commit 7dd913bd336ecbaa7419b998d0bf913d89702fe6
Merge: 43706970 8170955a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 19:09:36 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit 437069702a3e91e0b066e4b22b08cdc02ff19eaf
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 19:08:55 2020 +0300

    minor

commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 16:02:03 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 15:40:49 2020 +0300

    minor

commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 17:56:24 2020 +0300

    * API changes

    . removed POST /set_upstreams_config
    . removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
    . added new fields to /dns_config and /dns_info

commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 16:43:13 2020 +0300

    * API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config

commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Mar 23 10:28:25 2020 +0300

    openapi

commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 19:18:48 2020 +0300

    Merge remote-tracking branch 'origin/master' into 715-fastest-addr

commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Mar 20 18:13:43 2020 +0300

    + DNS: add fastest_addr setting
 2020-04-22 19:14:04 +03:00
Andrey Meshkov
8170955a07 Merge: added snapcraft build script 
* commit '054980bc8b9cab4ac8dd5421d724f421cd046583':
  *: fix typo
  *: cleanup
  *: rename resulting snapfile -- remove version from it
  *: update build_snap.sh
  *: remove snap from travis
  *: travis - print log on failuer
  *: added snapcraft build configuration
  *: moved docker files to the packaging folder
 2020-04-22 19:07:05 +03:00
Andrey Meshkov
054980bc8b *: fix typo 2020-04-22 18:50:24 +03:00
Andrey Meshkov
47160c16d9 *: cleanup 2020-04-22 18:39:47 +03:00
Andrey Meshkov
daf9af9a22 *: rename resulting snapfile -- remove version from it 2020-04-22 17:48:37 +03:00
Simon Zolin
9671050e5b + config: add "debug_pprof" setting 
Squashed commit of the following:

commit 96d185cf4acc55b21a00d10072e0a641ef7655b8
Merge: 3b75a8cb 9b7c1181
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 15:57:50 2020 +0300

    Merge remote-tracking branch 'origin/master' into add-pprof

commit 3b75a8cbec5d72be8865a56bfd7ebb8b0673c3bc
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 13:52:36 2020 +0300

    * use localhost:6060 for pprof

commit f66f2fbd7409b98cd9f7d297c268fca998f85e3b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 12:46:25 2020 +0300

    minor

commit 6e38712fb5542f612675858eb957efdefc38f9b0
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Wed Apr 22 11:59:39 2020 +0300

    use separate HTTP server for pprof

commit 988d95b5fad22f536bf9204b6b96f3697cf9a589
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 17:04:04 2020 +0300

    minor

commit 90ee6e9753be2af49467687cdf71c35b3943b78b
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Tue Apr 21 16:57:38 2020 +0300

    * use modified version of pprof

commit 413002220fe0717950539a8b7e6b0f31cef31bb8
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 20 16:35:21 2020 +0300

    minor

commit d4655d3849de1d9fe97efdb7f18fc21d5ac19eda
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 20 15:57:57 2020 +0300

    + config: add "enable_pprof" setting
 2020-04-22 16:00:26 +03:00
Andrey Meshkov
093617e6bd *: update build_snap.sh 2020-04-22 15:07:17 +03:00
Andrey Meshkov
3ae6043748 *: remove snap from travis 2020-04-22 13:40:13 +03:00
Andrey Meshkov
3fdd3f7cec *: travis - print log on failuer 2020-04-21 17:23:29 +03:00
Andrey Meshkov
0cb876a71c *: added snapcraft build configuration 2020-04-21 16:25:29 +03:00
Andrey Meshkov
7f224658e0 *: moved docker files to the packaging folder 2020-04-21 15:05:13 +03:00
Simon Zolin
9b7c118103 * dnsproxy v0.26.2 
Close #1588

Squashed commit of the following:

commit a6eedb9883737d93332b59e9de69fbf07b8f81d4
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Mon Apr 20 18:33:37 2020 +0300

    * dnsproxy v0.26.2
 2020-04-21 11:08:59 +03:00
Simon Zolin
93a597fce4 - querylog: fix get data 
Close #1589

Squashed commit of the following:

commit 83d1d15f06a67746feb0e82fb71d5ea02f86ab69
Author: Simon Zolin <s.zolin@adguard.com>
Date:   Fri Apr 17 14:11:00 2020 +0300

    - querylog: fix get data
 2020-04-17 14:40:13 +03:00
Jonas Marklén
037bf43b40
Updated openapi.yaml to OpenAPI 3.0 
Included lint to validate yaml file
 2020-04-16 22:04:00 +02:00