4271 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
DL6ER	401c029dc4	Improve else condition of branch determination ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 16:08:32 +02:00
DL6ER	0343171703	Add correct displaying for detached HEAD state. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 08:54:28 +02:00
DL6ER	176fbaf83b	Ask pihole-FTL for the branch it was compiled from instead of trusting the checkout file to be present. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 08:51:17 +02:00
Adam Warner	3cc9ba4ee8	stickler Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-18 12:57:06 +01:00
Adam Warner	6dc85c3527	Don't display branch name if it is on master. ... Prefer cached remote version over github API Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-18 12:51:04 +01:00
Adam Warner	851947bbf2	Add branch name to version output ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-13 20:58:46 +01:00
Dan Schaper	413fa94e98	Merge pull request #3263 from mschoettle/fix/broken-blocking-landing-page-v5.0 ... Fixes broken blocking page and landing page when changing server port or host name (v5.0)	2020-04-10 20:50:26 -07:00
Matthias Schoettle	308eb5eda5	Fixes broken blocking page and landing page when changing server port and/or hostname. ... See issues #2195 and #2720. Signed-off-by: Matthias Schoettle <git@mattsch.com>	2020-04-10 12:29:01 -04:00
M4x	2de5362adc	Sanitize email address in case of security issues (#3254) ... * Sanitize email address in case of security issues Signed-off-by: bash-c <aboultraman@gmail.com>	2020-04-05 10:20:35 +01:00
DL6ER	a2d2639ee8	Merge pull request #3242 from pi-hole/fix/do_not_flush_neigh_cache ... Do not flush neigh cache	2020-04-01 20:50:28 +02:00
DL6ER	d1caad76d8	Do not flush neigh cache as this is known to create a number of issues. The better aproach to this is to manually flush the ARP cache by either restarting or calling "ip neigh flush all". ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-01 17:19:32 +00:00
DL6ER	fff7adfb20	Merge pull request #3236 from pi-hole/PromoFaux-patch-1 ... Remove hosts-file.net from default lists	2020-03-31 23:23:19 +02:00
Adam Warner	7d19ee1b25	validate blocklist URL before adding to the database (#3237) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk> Co-authored-by: DL6ER <dl6er@dl6er.de>	2020-03-31 21:48:10 +01:00
Adam Warner	dc35709a1b	Remove hosts-file.net from default lists	2020-03-31 17:39:21 +01:00
DL6ER	0fad979206	Merge pull request #3230 from pi-hole/fix/remove-19036 ... Remove 19036 trust anchor	2020-03-27 19:57:41 +01:00
DL6ER	277179f150	Remove 19036 trust anchor, now expired: https://www.icann.org/resources/pages/ksk-rollover ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-27 19:34:41 +01:00
Adam Warner	1b35eebad8	Merge pull request #3207 from pi-hole/tweak/resolvconf ... Remove resolvconf dependency	2020-03-24 13:11:22 +00:00
Adam Warner	4994da5170	Update automated install/basic-install.sh	2020-03-12 18:48:40 +00:00
Adam Warner	175d32c5f6	Set nameservers to be that which have been chosen by the user in the whiptail ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-03-11 18:55:43 +00:00
Adam Warner	1481cc583f	Don't set nameserver in dhcpcd.conf ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-03-11 18:48:40 +00:00
Adam Warner	dbc54b3063	remove resolvconf dep ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-03-11 18:47:59 +00:00
DL6ER	22ce5c0d70	Fix incorrect type description. (#3201) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-08 16:32:37 -07:00
Dan Schaper	f617ed2f44	Merge pull request #3186 from pi-hole/fix/awkInQuery ... Malformed wildcard blocking doesn't crash awk.	2020-03-02 12:39:26 -08:00
Dan Schaper	bf4fada3b7	Don't quote inside backticks, use unquoted variable. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 09:52:06 -08:00
Dan Schaper	360d0e4e6b	Loop through array of lists. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 08:07:10 -08:00
Dan Schaper	4f390ce801	Use bash regex instead of awk. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-03-02 05:39:21 -08:00
Adam Warner	dc8ae4f0ab	Merge pull request #3127 from pi-hole/fix/removeFunding ... Delete FUNDING.yml	2020-02-28 22:47:20 +00:00
Adam Warner	d2a8b4d2b9	Merge pull request #3180 from pi-hole/release/v4.4 ... Tidying up	2020-02-28 22:34:41 +00:00
Adam Warner	c07d86b9f9	Merge branch 'release/v5.0' into release/v4.4	2020-02-28 22:24:11 +00:00
Adam Warner	58785020bd	Merge pull request #3161 from pi-hole/cherry-pick-4.3.5 ... cherry pick 4.3.5 into 5.0	2020-02-25 20:42:39 +00:00
DL6ER	1c74b41869	Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-25 20:41:35 +00:00
Adam Warner	6104d81622	Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-24 20:36:45 +00:00
Adam Warner	121c93e822	Merge pull request #3160 from pi-hole/release/v4.3.5 ... Hotfix 4.3.5	2020-02-24 20:16:54 +00:00
Adam Warner	b4c2bf678f	Safeguard against colour output in grep commandadd -i to grep to make search for "Location" case-insensitive ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-24 20:02:48 +00:00
Adam Warner	14944b0283	Merge pull request #3157 from pi-hole/release/v4.3.4 ... Release v4.3.4	2020-02-24 18:48:03 +00:00
Adam Warner	8ecaaba247	Compare daemons to expected results. (#3158) (#3159) ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> Co-authored-by: Dan Schaper <dan@glacialmagma.com>	2020-02-24 18:00:19 +00:00
Dan Schaper	0fbcc6d8b5	Compare daemons to expected results. (#3158) ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2020-02-24 17:38:37 +00:00
Adam Warner	707e21b927	:dominik: Detect binary name before calling FTLcheckUpdate in update.sh ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-24 12:10:36 +00:00
DL6ER	f4a1cc6dec	Merge pull request #3150 from pi-hole/tweak/database_warnings_inspection ... Gravity: Check suitablility of sourced lists	2020-02-24 10:18:00 +01:00
DL6ER	3dd05606ca	Call it the received number of domains instead of the imported number as importing does only happen a bit later. Only show the number of invalid domains if there are invalid domains. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-24 07:06:15 +01:00
DL6ER	1e8bfd33f5	Improve output ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-23 22:50:06 +01:00
Adam Warner	545b6605bc	4.3.3 (#3154) ... * Backport ee7090b8fc to v4 to prevent failures in FTL download * update tests to reflect changes to FTL download URL * backport `tbd` fix Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-23 21:34:12 +00:00
DL6ER	8131b5961c	Add comments to the code describing the changes. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-22 15:22:29 +01:00
DL6ER	81d4531e10	Implement performant list checking routine. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-22 13:01:55 +01:00
DL6ER	050e2963c7	Remove redundant code. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-21 22:28:53 +01:00
DL6ER	3c09cd4a3a	Experimental output of matching line from shown warnings. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-02-21 21:47:56 +01:00
DL6ER	839fe32042	Fix issue with missing newline at the end of adlists (#3144) ... * Also display non-fatal warnings during the database importing. Previously, we have only show warnings when there were also errors (errors are always fatal). Signed-off-by: DL6ER <dl6er@dl6er.de> * Ensure there is always a newline on the last line. Signed-off-by: DL6ER <dl6er@dl6er.de> * Stickler linting Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net> * Move sed command into subroutine to avoid code duplication. Signed-off-by: DL6ER <dl6er@dl6er.de> * Also unify comments. Signed-off-by: DL6ER <dl6er@dl6er.de> * Also unify comments. Signed-off-by: DL6ER <dl6er@dl6er.de> Co-authored-by: Dan Schaper <dan@glacialmagma.com>	2020-02-21 18:56:48 +00:00
Adam Warner	85c15a7167	Merge pull request #3147 from pi-hole/tweak/forcelocalversions ... force `updatchecker.sh` run if any of the three components are updated	2020-02-20 18:57:56 +00:00
DL6ER	b73580fa93	Merge pull request #3132 from pi-hole/fix/pihole-tail ... Fix pihole -t sed instructions	2020-02-19 19:07:38 +01:00
Adam Warner	4a5f344b09	then ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-02-19 17:46:45 +00:00