2431 Commits (a928cd3fa137a4d8329a78b1bc996078d773fe97)

 

All Branches   

Search

Author	SHA1	Message	Date
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
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
Dan Schaper	6a2b885988	Update default User Agent to modern browser. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	7 years ago
Dan Schaper	bfc4775b34	Merge pull request #1297 from raincoats/development ... Redirect to admin panel when accessing 'http://pi.hole/'	7 years ago
Adam Warner	981004606b	Merge branch 'master' into development	7 years ago
Adam Warner	9d40fd1eda	Merge branch 'development' Resolved conflicts ... # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
DL6ER	db1e5f10ea	Make changes according to comment in #1384	7 years ago
DL6ER	fbb6b56d99	Merge pull request #1397 from pi-hole/fix/ipv4ipv6error ... Bugfix: Blocking page	7 years ago
DL6ER	f1f70133dc	Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396	7 years ago
DL6ER	d0f55e5125	Merge pull request #1394 from pi-hole/fix/remove-temp-gravity-files ... Delete the temp files created by gravity	7 years ago
Mcat12	5e308dbd51	Delete the temp files created by gravity	7 years ago
Mcat12	c3c554f4d6	Merge pull request #1391 from pi-hole/tweak/flush ... Flush twice to move data out-of-sight of FTL	7 years ago
DL6ER	320c06e0a4	Flush twice to move data out-of-sight of FTL	7 years ago
Adam Warner	2e398c5da4	stash changes on branch switch, else it fails if any changes have been made.	7 years ago
DL6ER	b1484104bd	Merge pull request #1379 from pi-hole/tweak/FTLinit.d ... Tweaks for `FTL`'s init file	7 years ago
Mcat12	c738a9a044	Merge pull request #1381 from technicalpyro/development ... Grammar Fix	7 years ago
Technicalpyro	519cb71022	Grammar Fix ... ]	7 years ago
DL6ER	fcd92d27f7	Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running	7 years ago
DL6ER	3eacfa9831	Improve FTL's service script	7 years ago
Mcat12	1d64b614c7	Merge pull request #1349 from pi-hole/internal/editorconfig ... Add .editorconfig	7 years ago
Dan Schaper	a832dd7f67	Update .editorconfig ... Set path for JS source.	7 years ago
Mcat12	a96b4d28e1	Merge pull request #1365 from pi-hole/adlistImprovements ... Adlist improvements	7 years ago