2504 Commits (288f93c5dd3c3646991e454c461927ac057d8eba)

 

All Branches   

Search

Author	SHA1	Message	Date
Dan Schaper	5bb91759b4	Merge pull request #1459 from WaLLy3K/patch-2 ... Provide remote hashes for version.sh	7 years ago
Dan Schaper	80c4b7c9bb	Merge pull request #1455 from pi-hole/tweak/logecho_gateway ... Debug: Log and echo gateway responses	7 years ago
WaLLy3K	ea0a9ceb37	Provide remote hashes for version.sh ... * Provide remote hashes for comparison * Use double braces for all conditions (for consistency) * Suppress potential "cd" error output * Provide "not applicable" output upon any hash request for FTL	7 years ago
Dan Schaper	68dd2a6b91	Merge pull request #1447 from WaLLy3K/patch-1 ... Display FTL version & version.sh rewrite	7 years ago
Dan Schaper	e23c6899e0	Merge pull request #1456 from WaLLy3K/patch-3 ... Update queryFunc() to search Whitelist	7 years ago
WaLLy3K	c35c7b2cea	Wrap in double brackets	7 years ago
WaLLy3K	58353e2839	Update queryFunc() to search Whitelist ... If there is a match in Whitelist/Blacklist/Wildcards, `[ ! -t 1 ]` will cause the search to end if the terminal is closed when the script is called. This has the intended effect of allowing a user to search for a W/B/W domain (as well as all the adlists it's found in) using `pihole -q` via Terminal, but the script will stop searching after a W/B/W match when called by the block page.	7 years ago
Adam Warner	5e0572637e	Merge pull request #1417 from WaLLy3K/tweak/queryFunc ... QueryFunc() rewrite	7 years ago
Dan Schaper	501b26decd	Log and echo gateway responses	7 years ago
WaLLy3K	c6596f2c54	Modified syntax to be valid for Shellcheck	7 years ago
WaLLy3K	2863308090	Minimise string duplication & other minor changes ... Instead of duplicating output strings, rewrite core/web/ftlOutput() into one neat versionOutput().	7 years ago
WaLLy3K	7fef1fdc83	Fixed indentation	7 years ago
WaLLy3K	3081c151bd	Perform EXACT searches on HOSTS lists correctly ... `\s` on the end may be overkill, but it is the existing scanList() behaviour.	7 years ago
Dan Schaper	c793295be0	Merge pull request #1446 from pi-hole/tweak/install_lockcheck ... Clarify error message on apt failures.	7 years ago
WaLLy3K	fe0a35cc7a	Update -h to work as --hash ... Also provide error output as per https://github.com/pi-hole/pi-hole/pull/1447#issuecomment-300600093	7 years ago
Dan Schaper	0b67eebaec	Merge pull request #1440 from pi-hole/revert-1437-blockPage ... Revert "Ensure any changes to blocking page are updated."	7 years ago
WaLLy3K	03201e2f20	Display FTL version & version.sh rewrite ... While testing to make sure `pihole -v` would output `pihole-FTL version`, I noticed some options didn't work how I expected them to. For example, if I use `pihole -v -p`, I would expect to see the version output of Pi-hole Core. Instead, I'm informed that it's an invalid option. I've had the following things in mind while rewriting this: * I'm operating under the assumption that FTL is only installed if the Admin Console is (Line 113 exit 0) * I have modified the help text to only output with `pihole -v --help` * I have modified all output to be more similar to the output style of `grep` and `curl` (Ditching ":::") Testing output: ``` w3k@MCT:~$ pihole -v Pi-hole version is v3.0.1-14-ga928cd3 (Latest: v3.0.1) Admin Console version is v3.0-9-g3760482 (Latest: v3.0.1) FTL version is v2.6.2 (Latest: v2.6.2) w3k@MCT:~$ pihole -v -c Current Pi-hole version is v3.0.1-14-ga928cd3 Current Admin Console version is v3.0-9-g3760482 Current FTL version is v2.6.2 w3k@MCT:~$ pihole -v -l Latest Pi-hole version is v3.0.1 Latest Admin Console version is v3.0.1 Latest FTL version is v2.6.2 w3k@MCT:~$ pihole -v -p --hash Current Pi-hole hash is a928cd3 w3k@MCT:~$ pihole -v -a --hash Current Admin Console hash is 3760482 w3k@MCT:~$ pihole -v --help Usage: pihole -v [REPO | OPTION] [OPTION] Show Pi-hole, Web Admin & FTL versions <Shows all Repositories and Options> w3k@MCT:~$ pihole -v -foo Invalid Option! ```	7 years ago
Dan Schaper	dfc32b26a6	We test for dpkg lock on line 830 directly, no need for the check also ... in the template section. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Adam Warner	89fd962615	Revert "Ensure any changes to blocking page are updated."	7 years ago
Adam Warner	a928cd3fa1	Merge pull request #1437 from pi-hole/blockPage ... Ensure any changes to blocking page are updated.	7 years ago
Dan Schaper	f190a6ebc5	Merge pull request #1436 from pi-hole/fix/dhcpcd-localhostNS ... Update basic-install.sh dhcpcd.conf nameserver	7 years ago
Adam Warner	9beb9fd941	Merge pull request #1384 from pi-hole/checkoutImprovements ... Stash changes when switching branches	7 years ago
Adam Warner	525a1228c3	clarify	7 years ago
Adam Warner	19fd25c7cd	revert line, looks tidyer	7 years ago
Adam Warner	5b0927ca4b	tidy up output	7 years ago
Adam Warner	324d4433c3	even further simplify	7 years ago
Adam Warner	615ca56ea3	fix inteliJ IDEA complaints	7 years ago
Adam Warner	41dd163453	further simplify	7 years ago
Adam Warner	5cd2c77d98	simplify	7 years ago
Adam Warner	f270f7430c	Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten	7 years ago
Dan Schaper	99b23627d0	Update basic-install.sh	7 years ago
Adam Warner	26fcb1b2a0	Merge pull request #1429 from pi-hole/development ... Release v3.0.1	7 years ago
DL6ER	e9c4e8123c	Merge branch 'master' into development	7 years ago
Dan Schaper	a290e01bdf	Merge pull request #1421 from pi-hole/fix/accidental-password-reset ... Add option to enter new password as command arg	7 years ago
DL6ER	9cc392fa02	Update Marks PR after the Promo code has been merged	7 years ago
Dan Schaper	7c2046cce7	Merge pull request #1423 from pi-hole/promoLearnsToCode ... Double hash the password directly in the install script	7 years ago
Adam Warner	b13171cc45	$1 is not $pw. Seriously, who let me onto this project	7 years ago
Adam Warner	9c645e2010	Seriously.	7 years ago
Adam Warner	bb6f409e89	dropped a "	7 years ago
Adam Warner	61ec7723f6	use function in install script	7 years ago
Adam Warner	9c136a5579	functionise Hashing	7 years ago
Adam Warner	a5733508ae	Double hash the password directly in the install script	7 years ago
DL6ER	c8e1e6dc8a	Merge pull request #1418 from pi-hole/tweak/debug/FTL_log ... Include pihole-FTL.log in debug report	7 years ago
DL6ER	30dcf6ff47	Include pihole-FTL.log in debug report	7 years ago
WaLLy3K	a0603ad3b7	Update queryFunc() ... * Allow scanList() to search files using a wildcard by removing quotes wrapped around `${list}` * scanList() will not provide a domain ouput on each string if exact is specified (`grep -l`) * Remove unused processWildcards() function * Return a message if no domain is specified * IDN domains are converted to punycode when running a `pihole -q` search if the `python` package is available, otherwise will revert to current behaviour * Scan Blacklist & Wildcards first, exiting from search if a match is found (Fixes #1330) * Use one `grep` subshell to search for all "*.domains" lists at once (opposed to looping to get every matching file name, and then spawning a `grep` instance for every matching file) * queryFunc() will not return "(0 results)" output from files where no match is found * Sort results based off list number * Return a message if no results are found	7 years ago
DL6ER	3473ebc0fe	Merge pull request #1408 from pi-hole/tweak/localise-queries ... Add localise-queries flag to dnsmasq's config	7 years ago
Dan Schaper	8c657910ae	Merge pull request #1280 from technicalpyro/development ... fixes missing dialog package from some distros	7 years ago
Dan Schaper	1886c44579	Merge pull request #1406 from pi-hole/update/UA ... Update default User Agent to modern browser.	7 years ago
Adam Warner	1dcc1871fb	Merge pull request #1404 from pi-hole/development ... 3.0	7 years ago
DL6ER	19e688effb	Add localise-queries flag to 01-pihole.conf	7 years ago