3023 Commits (c5a2ca5c98d9f40990768f73439d4700261cd989)

 

All Branches   

Search

Author	SHA1	Message	Date
WaLLy3K	c458e4a93b	Merge pull request #1420 from WaLLy3K/new/https ... Disable Let's Encrypt HTTPS & shift functions to block page	7 years ago
WaLLy3K	e7ae62ba76	Merge pull request #1416 from WaLLy3K/blockpage2 ... Block Page 2.0	7 years ago
WaLLy3K	ff5411a93a	Add 'Connection Refused' for 000 status ... * Shift default dnsRestart value into unset default parameter expansion value * Change nslookup timeout to 5 seconds * Use &> instead of > * Standardise plural code * Update some comments * Add "000" when connection is refused * Condense adblock detection logic * Add Dnsmasq format detection and parsing logic * Removed unnecessary echo * Add dnsWasOffline variable to ensure that if DNS service has been stopped, that it doesn't start and also get reloaded	7 years ago
WaLLy3K	d3073e5e23	Fix array of unique $sourceDomains	7 years ago
WaLLy3K	34ae4844fa	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	8191ec01e5	Gravity Bugfixes ... * Merge development OpenVPN code * Determine which domain to resolve depending on existence of $localList * Re-add code to remove $localList, preventing duplicate local entries * Minor shellcheck validation fix	7 years ago
WaLLy3K	4d39ab9753	Allow force-reload to be used when restarting DNS ... * Remove duplicate coltable variable definition and source * Minor comment modifications * Add "$2" to restartdns	7 years ago
Adam Warner	7a1df15724	Merge pull request #1688 from pi-hole/tweak/customBlockPage ... Allow for Custom block page	7 years ago
Adam Warner	42b5574f9b	remove no longer needed tests ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	5f4be0de35	adjust lighttpd config depending on whether or not custom.php exists ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	6c605f55f9	always overwrite default blockpage, so that changes can be rolled out ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	774c6e8ac0	Merge branch 'development' into new/UninstallCleanup ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # automated install/uninstall.sh	7 years ago
DL6ER	17be6b860e	Merge pull request #1682 from pi-hole/tweak/VPN_hostnames ... Add VPN host names to local.list	7 years ago
Adam Warner	474ac4a15d	Merge pull request #1581 from pi-hole/sqlite-dependency ... Add "php5-sqlite" to dependencies	7 years ago
DL6ER	b8fedf76cd	Merge pull request #1572 from pi-hole/gedetil-development ... Add web frontend shutdown command	7 years ago
DL6ER	ca88c59d4e	Merge pull request #1687 from spacedingo/patch-2 ... Add ignore-case switch to sort (domains)	7 years ago
Mcat12	d69e62589a	Merge branch 'development' into sqlite-dependency	7 years ago
DL6ER	c9d4995900	Update to comply with current development code ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	279e809aaf	Use `poweroff` instead of `halt` ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Mcat12	d61857efae	Merge branch 'development' into patch-2	7 years ago
DL6ER	0d037e96fb	Merge branch 'development' into gedetil-development ... Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: advanced/Scripts/webpage.sh	7 years ago
Mcat12	6376f9aef4	Merge pull request #1680 from pi-hole/colour-consistency ... Colour output consistency	7 years ago
spacedingo	f5a1fa21f7	Add ignore-case switch to sort (domains) ... Domains with caps pass off as unique. It is necessary for proper duplicate removal. Example: ::: /etc/pihole/list.preEventHorizon (2 results) adsatt.abcnews.starwave.com Adsatt.ABCNews.starwave.com	7 years ago
DL6ER	4a90dac68e	Simplify awk code as the format of ipp.txt is actually fixed (only one entry per line is allowed) ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	2624e56de5	Parse /etc/openvpn/ipp.txt (if existing) and add entries to local.list. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
Adam Warner	aef54d6694	Merge branch 'development' into new/UninstallCleanup	7 years ago
Adam Warner	e839a7784c	Merge branch 'development' into sqlite-dependency	7 years ago
WaLLy3K	bea99abd8d	Ensure colour consistency between terminal themes ... * Comment file for review-ability * Add BOLD and UNDERLINE options * Select most readable colours out of LIGHT/DARK options * Provide empty variables for `set -u` * Deprecate unnecessary variables * Correct colours for TICK/CROSS/DONE * Escape r twice and add ESC to OVER	7 years ago
WaLLy3K	a5c4ae955a	Merge branch 'development' into tweak/gravity	7 years ago
Dan Schaper	d7d53849a3	Merge pull request #1628 from pi-hole/fix/issue-template ... Update Issue/PR Template text	7 years ago
WaLLy3K	b354f722be	Add link for EUPL ... * Also formatted `git rebase` text to be consistent with `git commit --signoff` Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	ea1aad9774	Add review suggestions to template	7 years ago
WaLLy3K	817d644795	Merge branch 'development' into fix/issue-template	7 years ago
WaLLy3K	56b8c4bfdb	Merge branch 'development' into tweak/gravity	7 years ago
Adam Warner	c65c26b463	Merge branch 'development' into new/UninstallCleanup	7 years ago
WaLLy3K	bf059e5ee8	Merge pull request #1676 from pi-hole/remove-netstat ... Replace superseded netstat command	7 years ago
WaLLy3K	15a5f425bf	Replace nc with psuedo-device ... * Also fix minor conditional style issue	7 years ago
WaLLy3K	3125d24ded	Replace superseded netstat command ... * Make colfile readonly, and use path of PI_HOLE_SCRIPT_DIR * Rename piholeStatus function to statusFunc for function name consistency * Replace superseded netstat command with nc * Perform addn-hosts check using a single grep subshell	7 years ago
Adam Warner	6b6d105c2f	Merge branch 'development' into sqlite-dependency	7 years ago
WaLLy3K	bab44c52ae	Merge branch 'development' into blockpage2	7 years ago
WaLLy3K	2f19605750	Merge branch 'development' into fix/issue-template	7 years ago
WaLLy3K	7311db3a63	Change wording to support feature PR's ... * Also clarify template suggestion text * Remove stray '	7 years ago
WaLLy3K	0a00936e99	Update resolver test & added more comments ... * Add/update code comments * Change resolver check to test for pi.hole * Make resolver check timeout after 10 seconds * Use > instead of &> where appropriate * Make resolver check sleep for 30 seconds (effectively waiting up to 50s for dnsmasq to be resolvable) * Provide confirmation upon success of resolver check availability * Quotes and Braced remaining variables as appropriate * Removed duplicate local	7 years ago
WaLLy3K	7cac207c00	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	feb412b02a	Merge pull request #1671 from pi-hole/release/3.2 ... Update development from release/3.2	7 years ago
Adam Warner	199de9ebc0	Merge branch 'development' into new/https	7 years ago
Adam Warner	504ae0193f	Merge branch 'development' into blockpage2	7 years ago
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space ... Remove erroneous space	7 years ago
Adam Warner	939c99cdbf	accidentally an entire group of letters.	7 years ago
WaLLy3K	2f36acae49	Remove errornous space	7 years ago