3203 Commits (31951dae4c8dbefb7606251dfa800fcefe6614df)

 

All Branches   

Search

Author	SHA1	Message	Date
Rob Gill	31951dae4c	Update index.php ... Avoiding calling empty() on a function allows this to work under PHP5. Making the check for blocklist generation in this way instead is compatible with both PHP5 and PHP7. Signed-off-by: Rob Gill <rrobgill@protonmail.com>	6 years ago
Adam Warner	b1ab7f46e0	Merge pull request #2169 from pi-hole/tweak/customportsDNS ... Remove LOCAL_DNS_PORT support	6 years ago
Adam Warner	4e0c7ed5a6	Merge pull request #2163 from pi-hole/fix/supressDnsmasqWarning ... Fix for an error message introduced in #2162	6 years ago
DL6ER	2ef76d5e31	Remove LOCAL_DNS_PORT support ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Adam Warner	76654c7856	Actually check for dnsmasq's existence before attempting to interact with it's service ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	90239bb969	Merge pull request #2162 from pi-hole/fix/ifFtlExists ... Don't attempt to download non-existent FTL Binary	7 years ago
Adam Warner	a6e4b0fea5	- Test for existence of remote non-master branch of FTL before attemtping to check for update ... - Move some functions from checkout to basic-install - provide helpful error message on downlaod not existing Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Mark Drobnak	c102d359f8	Merge pull request #2159 from pi-hole/tweak/removeDnsmasqRefs ... Tweak/remove dnsmasq refs	7 years ago
Adam Warner	a07891e3e6	0 is not 1!! ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	e946a35b18	Move dnsmasq check into FTLcheckUpdate ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	68d7337f98	switch up dnsmasq detection logic ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	8b4198fd8d	Merge pull request #1835 from Fauxsys/development ... Fix for unattended installations #1767 #1768 #1834	7 years ago
Adam Warner	9c795fa40d	Merge pull request #2157 from pi-hole/fix/EmptyAdlist ... Allow for empty/non existent adlist file	7 years ago
Adam Warner	5f2217a079	Fix for gravity.list not being emptied with an empty/missing adlist file. ... Variable output depending on content of /existence of adlist Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	0cda4b7f23	Merge pull request #2123 from pi-hole/new/RemoveDefaultBlocklists ... Remove default blocklists from install	7 years ago
Adam Warner	e17e69604c	Merge branch 'development' into new/RemoveDefaultBlocklists	7 years ago
Adam Warner	e1bf4d4344	Merge pull request #2155 from pi-hole/tweak/DontStopServices ... No need to stop services	7 years ago
Adam Warner	0c8a32b9ae	No need to stop services ... This causes issues on a `pihole -r reconfigure` Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	d8c60aaae7	Merge pull request #2142 from bcambl/fix_fedora_ip_check ... Fix static IP checking on Fedora	7 years ago
Adam Warner	3216d65353	Merge branch 'development' into new/RemoveDefaultBlocklists	7 years ago
Mark Drobnak	0df8d0a4e2	Merge pull request #2153 from MichaIng/patch-1 ... "INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115	7 years ago
MichaIng	43f19034b9	"INSTALL_WEB" renamed to "INSTALL_WEB_INTERFACE" #2115 ... + Small fix, as due to PR https://github.com/pi-hole/pi-hole/pull/2115 variable "INSTALL_WEB" was renamed into "INSTALL_WEB_INTERFACE".	7 years ago
Adam Warner	05d8a7f6be	Merge pull request #2147 from pi-hole/fix/borkedUpdate ... Restore functionality to `pihole -up` broken in #2115	7 years ago
Adam Warner	ceaf4bc6bc	Some extra code made it's way into the dev branch. Not entirely sure how that happened... related to #2115 ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	f2cc2f433c	Merge pull request #2140 from pi-hole/FTLDNS-gravity-simplelists ... Use domain list format for black.list and gravity.list	7 years ago
Dan Schaper	858aa6255c	Merge pull request #2145 from pi-hole/fix/2115 ... Add missing `/` to line 1511	7 years ago
bcambl	1d8ea9e869	Fix static IP checking on Fedora ... This bug was introduced by #1758 where the CIDR was removed from the static IP check. The CIDR was acting as a boundary so we need to test for a boundary or a slash character. Signed-off-by: bcambl <blayne@blaynecampbell.com>	7 years ago
Adam Warner	8ead0b5483	@fourdee dropped this: `/` ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Fauxsys	72c081cfd6	Fix for unattended installations #1767 #1768 #1834 ... Removed updatePihole() function and updated if/then statements in installPihole() and main(). Corrected minor typos. Signed-off-by: Fauxsys <fiber.cipher@gmail.com>	7 years ago
Mark Drobnak	1f701c94a7	Merge pull request #2115 from Fourdee/Install-Web-Server ... --disable-install-webserver	7 years ago
Dan	acfc49fd41	Merge branch 'development' into Install-Web-Server	7 years ago
Adam Warner	9c29bd627e	fix user blacklisting	7 years ago
DL6ER	d24b141d8b	Get rid of numBlocked file, FTLDNS can now determine number of domains thanks to the new lists format ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	bac9e005ae	Generate gravity.list and black.list in simple domain lists format for FTLDNS. Leave local.list in HOSTS format ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Daniel (Fourdee)	60bcca54eb	Minor ... + indentation	7 years ago
Daniel (Fourdee)	eccea8a911	Minor ... + Fix indentation + Stick with case, add "On" to provide INFO print out, although its not technically required as INSTALL_WEB_SERVER=true is default value.	7 years ago
Mark Drobnak	0833d0d8d5	Merge pull request #2133 from mbologna/patch-1 ... Fix: add psmisc as dependency	7 years ago
Michele Bologna	55fce489bc	Fix: add psmisc as dependency ... Debian 9.4 does not install `psmisc` by default and the following error will happen during installation: ``` [✗] /usr/local/bin/pihole: line 353: killall: command not found /usr/local/bin/pihole: line 364: killall: command not found ``` This patch adds `psmisc` (that contains `killall`) as dependency Signed-off-by: Michele Bologna <michele.bologna@gmail.com>	7 years ago
Adam Warner	2ce40c3c07	Merge pull request #2132 from rwky/development ... Fixed typo in README	7 years ago
Rowan	255cfb7d62	Fixed typo in README ... Signed-off-by: Rowan Wookey <admin@rwky.net>	7 years ago
Adam Warner	8a327be400	Merge pull request #2130 from pi-hole/FTLDNS ... Internal FTLDNS -> dev	7 years ago
DL6ER	1cae76b443	Merge pull request #2126 from pi-hole/FTLDNS-recursive-resolver ... Add backend changes for supporting a local DNS server	7 years ago
DL6ER	828e8d2ae4	Merge pull request #2040 from pi-hole/FTLDNS ... FTLDNS Integration	7 years ago
DL6ER	ce35509a40	Change command to "pihole -a localdnsport X" ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	24b8b4e904	Add backend changes for supporting a local recursive DNS server ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Daniel (Fourdee)	c2c1dc7469	Ensuring bot pleasure ... https://github.com/pi-hole/pi-hole/pull/2115#pullrequestreview-113066748	7 years ago
Daniel (Fourdee)	47c1071bb8	Minor ... + Add info in regards to disabling web server install: https://github.com/pi-hole/pi-hole/pull/2115	7 years ago
Daniel (Fourdee)	e401651f09	Update https://github.com/pi-hole/pi-hole/pull/2115 ... + Patch existing systems with the new variable changes using 'accountForRefactor' + Prompt user to install webserver	7 years ago
Mark Drobnak	1449def040	Merge pull request #2049 from pi-hole/tweak/readme ... update donation and affiliate links. also link to trademark guideline…	7 years ago
Dan Schaper	d4d1ec2568	Merge pull request #2124 from pi-hole/development ... Internal	7 years ago