61 Commits (476fd1f6959cd19e1914b4daa4d38c9251813fea)

Author	SHA1	Message	Date
Promofaux	476fd1f695	indentation	8 years ago
Promofaux	96053d13be	Flip reload logic. Do not reload lists if no changes made to whitelist.txt	8 years ago
Promofaux	b79392ba2c	exit after displaying white/blacklist	8 years ago
Promofaux	d0826b2c33	Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev	8 years ago
Marcus Hildum	07a66a70fc	Consistency ... More of the same	8 years ago
Promofaux	9ab6df0e54	Merge branch 'development' into promoTweaksTheSecond ... # Conflicts: # advanced/Scripts/blacklist.sh # advanced/Scripts/whitelist.sh	8 years ago
Marcus Hildum	0efda04920	Use heredocs instead of multiple calls to echo ... There were a lot of places (like in help functions) that used multiple echo calls instead of heredocs. Personal opinion but this seems cleaner.	8 years ago
Marcus Hildum	28eeaf201b	Standardize function declaration ... There were no fewer than three styles of function declaration going on in these files, so I attempted to standardize them to the typical myfucn() { } style.	8 years ago
Promofaux	a64f4cd871	whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument	8 years ago
Promofaux	8c0f860601	Use systemctl/service calls instead of killall to restart/reload dnsmasq	8 years ago
Promofaux	090fbd04af	Remove ${SUDO} usages and root checks from scripts called by `pihole` command as they should not be called directly.	8 years ago
Promofaux	b3e7619048	curly brackets all the variables!	8 years ago
diginc	5fb6c5b012	Making the whitelist re-block echo consistent with other WL/BL echos	8 years ago
diginc	3affa73257	Only re-block whitelist deletions if in adlists ... * Prevent blocking benign/untracked domains deleted off whitelist * Issue #581	8 years ago
bcambl	27a9642090	check for sudo via 'command -v' instead of dkpg-query	8 years ago
Mcat12	3fda2d9ac3	Fix helpfunc not found error	8 years ago
Jim Liu	10066209e7	Update whitelist.sh ... Change piholeIPfile to a permanent location.	9 years ago
Jim Liu	81fdfcba22	Update whitelist.sh	9 years ago
Mcat12	619082dbed	Merge branch 'development' into BugFix463 ... Conflicts: advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh	9 years ago
Mayur Raiturkar	56ac04c48e	fixed helpFunc 2	9 years ago
Promofaux	ad574f5e90	Replace kill with killall	9 years ago
Promofaux	4941a657bf	remove -s switch, as it turns out it worked afterall.	9 years ago
Promofaux	3d4bff9414	Add -s switch to kill command to increase compatability	9 years ago
Adam Warner	77f4126f9b	add root check to whitelist script	9 years ago
Promofaux	48fa83c9ac	Fix whitespace	9 years ago
Promofaux	05e0003555	Fixes issue #453	9 years ago
Promofaux	107e0404de	Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading	9 years ago
Promofaux	3154a378a6	Remove clear in DisplayWlist and force verbose to false to tidy up output.	9 years ago
Promofaux	6c87698f1a	fix spelling in name of variable ($versbose -> $verbose)	9 years ago
Justin Theberge	9a4c5cef86	fix indentations	9 years ago
Justin Theberge	bdfc86f850	fix formatting	9 years ago
Justin Theberge	70dadfba28	add list options requested from issue#442	9 years ago
Adam Warner	e074c72130	Move help output to function helpFunc, add -h argument.	9 years ago
Promofaux	47cc757ed0	Fix incorrect echo	9 years ago
Promofaux	0bbfb323b1	make whitelist honour pihole.conf file	9 years ago
nate	b80821c4b7	Merged branch development into PiHoleController	9 years ago
nate	cf01b5a002	Readded `cat` calls to fix permission issue	9 years ago
nate	fee55fa642	Added gravity.sh to the list of options	9 years ago
nate	76ea1962be	Controller script, pihole.sh added ... Syntax changes for user output to be consistent	9 years ago
nate	f2150ee7e1	Merge conflict resolution	9 years ago
nate	2311b42bca	Merge branch 'ScriptCleanup-Dev' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/piholeDebug.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	9 years ago
nate	a4fbccac9b	Merge conflict resolution	9 years ago
nate	8ef4c12f97	Merge branch 'ScriptCleanup' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	9 years ago
nate	0b9e78df2c	Cleaned code and added prompt for purge on uninstall	9 years ago
Carter Maxwell	ced0ae0d65	remove trailing whitespace whitelist.sh	9 years ago
Mcat12	48f9a61ff0	Updated License	9 years ago
Promofaux	3cd1a5b1d5	... Helps if I add the changes to the repo file, and not the test file on my pi.	9 years ago
Promofaux	dfcf9d133e	Make output make a bit more sense	9 years ago
Promofaux	f9a2ca5c32	Tidy up help text on both scripts. Add quiet help.	9 years ago
Adam Warner	5d842a7533	Merging	9 years ago