27 commits

Author	SHA1	Message	Date
Justin Theberge	9a4c5cef86	fix indentations	2016-04-08 10:14:17 -04:00
Justin Theberge	bdfc86f850	fix formatting	2016-04-07 21:58:57 -04:00
Justin Theberge	70dadfba28	add list options requested from issue#442	2016-04-07 21:52:47 -04:00
Adam Warner	391dea445a	Move help output to function, add -h argument	2016-04-06 09:34:05 +01:00
Promofaux	849185d3c9	Fix incorrect echo	2016-04-05 00:03:49 +01:00
Promofaux	4f08359786	Make blacklist honour pihole.conf file	2016-04-04 21:08:45 +01:00
nate	6eea9239a7	Merged branch development into PiHoleController	2016-04-02 18:41:36 -05:00
Mcat12	e97755eb91	Fix missing cats	2016-04-02 19:28:30 -04:00
nate	b80821c4b7	Merged branch development into PiHoleController	2016-04-01 12:17:41 -05:00
nate	cf01b5a002	Readded cat calls to fix permission issue	2016-04-01 12:17:05 -05:00
nate	fee55fa642	Added gravity.sh to the list of options	2016-03-28 18:37:49 -05:00
nate	76ea1962be	Controller script, pihole.sh added ... Syntax changes for user output to be consistent	2016-03-28 18:31:21 -05:00
nate	f2150ee7e1	Merge conflict resolution	2016-03-28 13:07:51 -05:00
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	2016-03-28 12:58:44 -05:00
nate	a4fbccac9b	Merge conflict resolution	2016-03-28 12:53:21 -05:00
nate	a0cf93a7ca	Merge branch 'PiholeDebug' ... Conflicts: README.md	2016-03-28 12:22:42 -05:00
nate	8ef4c12f97	Merge branch 'ScriptCleanup' ... Conflicts: README.md advanced/Scripts/blacklist.sh advanced/Scripts/whitelist.sh automated install/basic-install.sh gravity.sh	2016-03-28 12:21:18 -05:00
nate	0b9e78df2c	Cleaned code and added prompt for purge on uninstall	2016-03-26 16:57:01 -05:00
Nate	b746250e71	Made all advanced/Scripts/ executable for consistency.	2016-03-24 18:29:13 -05:00
Carter Maxwell	f633d1fa5b	remove trailing whitespace blacklist.sh	2016-03-05 21:14:56 -08:00
Mcat12	48f9a61ff0	Updated License	2016-01-30 15:12:40 -05:00
Promofaux	8ecf8eb76c	output to match other scripts	2016-01-24 17:18:37 +00:00
Promofaux	414ef54cfe	Switched CRLF to LF (DOS to UNIX)	2016-01-17 14:09:06 +00:00
Promofaux	f9a2ca5c32	Tidy up help text on both scripts. Add quiet help.	2016-01-16 00:47:45 +00:00
Adam Warner	2b0bee085b	Incorrect reference to whitelist in the blacklist.sh comments :)	2016-01-15 18:57:20 +00:00
Adam Warner	89e3c25a90	Behaves like whitelist, but on the blacklist	2016-01-15 15:53:40 +00:00
Adam Warner	14ee4850af	Placeholder for blacklist script	2016-01-15 14:50:13 +00:00