668 Commits (6ca47dc3b360a8566d0c505d0c4cf23ed0017d61)

Author	SHA1	Message	Date
DL6ER	6ca47dc3b3	Add bash / cron based update checker for Pi-hole	7 years ago
WaLLy3K	2390b80359	Silence non-numeric domains_being_blocked output ... * Round $cpu_mhz to 1 decimal place * Remove ".0" from $cpu_freq * Silence non-numeric domains_being_blocked output * Use "Core" and "Web" as appropriate Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
DL6ER	e0edac32c7	Merge pull request #1728 from pi-hole/new/nuke_lists ... Add nuclear option to list.sh	7 years ago
WaLLy3K	bd33018660	Shellcheck OR validation ... Signed off by WaLLy3K <wally3k@pi-hole.net>	7 years ago
Mcat12	67a5594909	Allow emails which include `-h` in them ... For example, mcat12@pi-hole.net would previously spit out the help message	7 years ago
DL6ER	70ad656af0	Save backup as ".bck~" to prevent reading of the file by dnsmasq ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	f22b83d379	Create a backup before emptying the list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	114f84c948	Add --nuke option to list.sh that can be used e.g. by Teleporter to empty out lists before importing new content ... Signed-off-by: DL6ER <dl6er@dl6er.de>	7 years ago
DL6ER	ee2169dd13	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	28063aa7f7	Add administrative contact address functionality ... * Disable shellcheck for SC1090	7 years ago
WaLLy3K	34ae4844fa	Merge branch 'development' into tweak/gravity	7 years ago
DL6ER	b8fedf76cd	Merge pull request #1572 from pi-hole/gedetil-development ... Add web frontend shutdown command	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
DL6ER	0d037e96fb	Merge branch 'development' into gedetil-development ... Signed-off-by: DL6ER <dl6er@dl6er.de> Conflicts: advanced/Scripts/webpage.sh	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	7cac207c00	Merge branch 'development' into tweak/gravity	7 years ago
WaLLy3K	1ae403b742	Merge pull request #1667 from pi-hole/install-space ... Remove erroneous space	7 years ago
Adam Warner	18b41adbf6	Merge branch 'development' into tweak/gravity	7 years ago
Adam Warner	0a9965292c	Additional check to fix any existing cases of "24h" in setupVars.conf automatically. ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	4fb66e632f	The other h	7 years ago
Adam Warner	5787895794	stop an extra `h` being added to leasetime of DHCP server. We already storethe `h` in `setupVars.conf` ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	d90489b31d	Include branch we're switching from ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	f38912a0c9	- Correctly overwrite ${INFO} boxes with ${CROSS} etc ... - Notify user that branch has been changed Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	2d8fff099f	Pass correct options to gravity.sh ... * Optimise $validDomain function by using bashism and `grep` * Add black/white/wildcard variables to pass to Reload() * Revert reload variable behaviour * Ensure Reload() function passes correct options to gravity.sh Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	fdf2649f2f	Clean up known remaining colour output issues (#1613) ... * Print newline on error message * Output last three lines of error if update fails * Consistent error messages & housekeeping * Add shellcheck directive to ignore COL_TABLE * Quoted and braced variables for codebase consistency * Escaped newlines correctly * Made error messages consistent (indenting and wording) * Removed consecutive echos * Conditional formatting consistency * Braced, quoted and used [[ on conditionals * Fix specific ShellCheck issues * Fixed issues that could be safely changed without extensive testing * Update SELinux whiptail behaviour & more * Colourised some strings * Fixed multiple line string indenting * Made output consistent with existing codebase * Removed sequential echos * Make SELinux whiptail use "--defaultno", and change text wording * Add help text for hostrecord, and colourise output * this should fix the tests... Signed-off-by: Adam Warner <adamw@rner.email> * revert changes to `update_package_cache()` to prove tests Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Mcat12	b09c660833	Always process DNS and DHCP settings in installer (#1630) ... * Always process DNS and DHCP settings in installer * Make sure dnsmasq config exists before modifying it Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Make sure the dnsmasq config directory exists Signed-off-by: Mcat12 <newtoncat12@yahoo.com> * Only remove the DHCP config if it exists (fixes tests, hopefully) Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	7 years ago
WaLLy3K	714fd93292	Provide correct FTL stats (#1619) ... * Provide correct FTL stats * Use the correct lines in the array when displaying FTL stats * Treat ads_blocked_today/dns_queries_today as currency, like domains_being_blocked is on large screens * Chronometer Shellcheck validation * Remove unnecessary \ from CPU usage readout	7 years ago
WaLLy3K	61ff0452e1	Remove duplicate code ... * Make RestartDNS() use `pihole restartdns` Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
WaLLy3K	406098e55a	Speed up refresh time ... * Add "--blacklist-only" to only run essential gravity functions * Pass "--wildcard" option to `gravity.sh` to ensure dnsmasq is restarted Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	7 years ago
Adam Warner	0a062d26e6	Merge pull request #1611 from pi-hole/developmentNew ... Sort out Merge conflicts with master	7 years ago
Adam Warner	eb8333c772	Merge branch 'development' into developmentNew	7 years ago
Adam Warner	247d3ed729	list availible branches for FTL ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Adam Warner	031c6428d5	Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
Adam Warner	f2e9d585f7	* Add helptext for `pihole checkout ftl` ... * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
WaLLy3K	8af9853b9a	Fixed minor formatting issues ... * Removed useless echo * Quoted and braced conditionals * Explicit escaping of newline * Fixed arrays implicitly concatenating (SC2199) * Fixed incorrect variable used in checkout web	7 years ago
Adam Warner	783f50657b	Merge branch 'development' into tweak/checkout_FTL ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/piholeCheckout.sh	7 years ago
WaLLy3K	3631d1349e	Prevent Web Admin from printing restartdns colour codes (#1575) ... * Prevent Web Admin from printing unnecessary msgs * Make DNS restart behaviour consistent	7 years ago
Adam Warner	7d56e2a937	`FTL` has an `L` in it, innit? ... Signed-off-by: Adam Warner <adamw@rner.email>	7 years ago
Jacob Salmela	e1f818ffb7	Tweak/debug improvements (#1585) ... * check for CIDR notation when comparing IPv6 address to that found in setupVars.conf * highlight bad address entries in pihole.log and reference a corresponding FAQ * show header output if Pi-holes x-header does not match * fix automated mode when running from the dashboard. It would previously not automatically upload and generate a token. * show disclaimer message * undocumented feature for now: obfuscate domains in pihole.log so they are not visible when sent to the Pi-hole developers. We need to make an additonal flag for this in the pihole command. if the variable OBFUSCATE has a value, it will replace the domain in the log with a placeholder value * fix small typo in the disclaimer	7 years ago
Jacob Salmela	fb66fb12c5	put "no password will be set" on a newline.	7 years ago
Jacob Salmela	042dcf795c	fixes #1430	7 years ago
Jacob Salmela	cb65907e60	Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug ... merge in development to avoid shellcheck from travis	7 years ago
DL6ER	bb8a263d70	ShellCheck	7 years ago
DL6ER	70fd94edb3	Edit message when requested branch of FTL is not available	7 years ago
WaLLy3K	1bebcef265	Make Chronometer usable on smaller screens (#1518)	7 years ago
DL6ER	6ce79ae1d0	Fix git commands (#1577)	7 years ago
Adam Warner	b3eb5c4f0e	Colour Tweaks (#1549)	7 years ago
DL6ER	ec4e9780ed	Accept underscores when validating domain names (#1571)	7 years ago
Adam Warner	22abbffbb7	Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development ... Signed-off-by: Adam Warner <adamw@rner.email> # Conflicts: # advanced/Scripts/webpage.sh	7 years ago