4289 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DL6ER	ad5802715e	enabled field: Center 0, right-align 1 ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-23 15:16:48 +02:00
DL6ER	63f6c6a894	Add indentation for enabled and type fields ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-23 10:01:22 +02:00
Adam Warner	d42785a3bf	Merge pull request #3271 from pi-hole/tweak/version ... Add branch name to pihole -v	2020-04-21 16:07:27 +01:00
DL6ER	401c029dc4	Improve else condition of branch determination ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 16:08:32 +02:00
DL6ER	ed9d74593d	Merge pull request #3289 from pi-hole/tweak/boldify_uniques ... Gravity: Boldify number of unique domains	2020-04-21 10:18:23 +02:00
Adam Warner	9286965ee2	Merge pull request #3287 from pi-hole/tweak/remove-deprecated-list ... Remove Deprecated cameleon list	2020-04-21 08:32:24 +01:00
DL6ER	fa57c457f3	Boldify number of unique domains as this is the actually interesting number ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-21 09:10:21 +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	94a4f844a8	Remove deprecated list ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-20 21:31:20 +01:00
Adam Warner	471006676c	Merge pull request #3227 from pi-hole/new/CLI_domain_comments ... Add option --comment "whatever" for adding comments for new domains through the CLI interface.	2020-04-19 14:39:05 +01:00
Adam Warner	0155d42650	Merge pull request #3252 from yubiuser/patch-1 ... add [options] for 'pihole restart' to manpage and cli help output	2020-04-19 14:35:24 +01: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
Dan Schaper	4f01daf5bc	Merge pull request #3244 from atenart/remove-hosts-file-ads-list ... basic_install: remove remaining references to hosts-file.net	2020-04-16 13:33:34 -07:00
Dan Schaper	0f20470a38	Merge pull request #3269 from pi-hole/tweak/hosts-comments ... Add support for comments in HOSTS-like files	2020-04-15 11:11:10 -07: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
yubiuser	d27a565d39	Apply suggestions from code review ... Co-Authored-By: DL6ER <DL6ER@users.noreply.github.com> Signed-off-by: Christian König <ckoenig@posteo.de>	2020-04-05 11:46:41 +02: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
Christian König	de42669bb7	fix typo in pihole help ... Signed-off-by: Christian König <ckoenig@posteo.de>	2020-04-05 08:56:10 +02:00
Christian König	3095fd4dd6	add restart [options] to cli help ... Signed-off-by: Christian König <ckoenig@posteo.de>	2020-04-05 08:49:35 +02:00
yubiuser	ebbb7168a4	add [options] for pihole restartdns ... Signed-off-by: Christian König <ckoenig@posteo.de>	2020-04-04 22:47:14 +02:00
Antoine Tenart	16f664cdb4	basic_install: remove remaining references to hosts-file.net ... Commit dc35709a1b ("Remove hosts-file.net from default lists") left a few references to hosts-file.net. Removes them. Signed-off-by: Antoine Tenart <antoine.tenart@ack.tf>	2020-04-02 21:23:55 +02: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
DL6ER	7b15a88dc4	Strip comments from downloaded lists instead of discarding lines with comments altogether ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-31 18:36:40 +00: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
DL6ER	15a9d662ac	Add option --comment "whatever" for adding comments for new domains through the CLI interface. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-03-27 08:45:04 +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