5971 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
DL6ER	288d487fc0	Allow ( and ) in adlist URLs. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-26 09:33:09 +02:00
pvogt09	462457fe7f	Merge branch 'development' into development	2020-04-24 12:09:49 +02:00
DL6ER	20ef5e0264	Show associated group IDs in domains/clients/adlists listing. We get the data through a LEFT JOIN followed by a GROUPing by the left list ID and finialized through a GROUP_CONCATenation. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-24 10:33:46 +02:00
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	989bbad37e	Remove pihole -a hostrecord ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-23 13:20:15 +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	d18a8b1b8a	Merge pull request #3205 from MichaIng/patch-5 ... Reduce apt-get install verbosity	2020-04-19 15:28:48 +01:00
Adam Warner	a37dba2c81	remove configureFirewall function, the call to it, and related tests ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-19 14:52:01 +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	e80990c27a	Merge pull request #3282 from pi-hole/revert-3276-feature/support_for_new_cloudflare_dns_for_families ... Revert "- Support for Cloudflare's new DNS for Families"	2020-04-19 14:32:32 +01:00
Adam Warner	e6dcccc7bd	Revert "- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors (#3276)" ... This reverts commit 7e1a8c1ceb.	2020-04-18 20:05:54 +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
Mohammed Swillam	7e1a8c1ceb	- Added 2 new DNS entries for the new Cloudflare DNS for families, which comes in 2 flavors (#3276) ... 1- 1.1.1.2 (No Malware) 2- 1.1.1.3 (No Malware or Adult Content) This would allow parents to have more control over the safety of their family's network. Signed-off-by: Mohammed-Swillam <moh.sayed@hotmail.com>	2020-04-18 11:49:01 +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
DL6ER	093054a1eb	Automatically convert legacy IP range to Class C network ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-09 09:49:07 +02:00
DL6ER	4130af0aab	Retain rev-server settings when the feature gets disabled. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-09 09:05:50 +02:00
DL6ER	90a5a13197	Convert CONDITIONAL_FORWARDING to REV_SERVER settings. Try to detect intended CIDR range automatically. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-08 15:35:35 +02:00
DL6ER	1632632668	Merge pull request #3259 from pi-hole/update_devel ... Update development from release/v5.0	2020-04-08 12:28:29 +02:00
DL6ER	982c1b0059	Merge branch 'release/v5.0' into development ... Signed-off-by: DL6ER <dl6er@dl6er.de>	2020-04-08 12:02:53 +02:00
Adam Warner	26f71e4dbe	accidentally a space ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-05 12:34:14 +01:00
Adam Warner	b6ac1585ec	add regex attribution ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-05 12:29:45 +01:00
Adam Warner	a9b19df4ec	expand email validation regex to catch more valid emails see comments on PR #3254 ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2020-04-05 12:28:33 +01: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
pvogt09	40ac3e7eb7	remove pihole group during uninstall ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2020-04-04 19:22:37 +02:00
pvogt09	25c5661c1b	fix stickler errors ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2020-04-03 19:22:30 +02:00
pvogt09	a993b8b34d	fixes #3217 by checking for existing pihole group ... Signed-off-by: pvogt09 <50047961+pvogt09@users.noreply.github.com>	2020-04-03 13:18:32 +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