tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
786 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

153 Commits

Author SHA1 Message Date
Promofaux 05e0003555 Fixes issue #453 2016-04-10 21:17:58 +01:00
Promofaux 107e0404de Move `exit 1` outside of `if` block on verbose check to stop dnsmasq reloading 2016-04-08 23:01:13 +01:00
Promofaux ab99e80333 indent 2016-04-08 23:00:46 +01:00
Promofaux 3154a378a6 Remove clear in DisplayWlist and force verbose to false to tidy up output. 2016-04-08 20:12:30 +01:00
Promofaux 8e04f1c03e Remove clear in DisplayBlist and forse verbose to false to tidy up output. 2016-04-08 20:11:39 +01:00
Promofaux c0aadeab3d fix spelling in name of variable ($versbose -> $verbose) 2016-04-08 20:10:27 +01:00
Promofaux 6c87698f1a fix spelling in name of variable ($versbose -> $verbose) 2016-04-08 20:10:10 +01:00
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
Adam Warner e074c72130 Move help output to function helpFunc, add -h argument. 2016-04-06 09:32:36 +01:00
Promofaux 9c94af04cc Fixes #432. Thanks to @VDRrulez and @jradwan for pointing it out... 2016-04-05 14:22:10 +01:00
Promofaux 849185d3c9 Fix incorrect echo 2016-04-05 00:03:49 +01:00
Promofaux 47cc757ed0 Fix incorrect echo 2016-04-05 00:03:24 +01:00
Promofaux 0bbfb323b1 make whitelist honour pihole.conf file 2016-04-04 21:08:56 +01:00
Promofaux 4f08359786 Make blacklist honour pihole.conf file 2016-04-04 21:08:45 +01:00
nate 7e06769d44 Double quoting 2016-04-04 01:03:05 -05:00
nate 5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes 2016-04-04 00:59:24 -05:00
Promofaux 97d3aedba1 Add some output to the log flush 2016-04-03 18:27:18 +01:00
nate 7f9410fd34 Added uninstall option to bash-completion 2016-04-02 19:45:44 -05:00
nate 1a2046a7eb Added uninstall option to `pihole` command. Minor fixes 2016-04-02 19:20:54 -05: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 d47fbbbe96 Mcat12 requests. Added bash-completion support 2016-04-02 17:58:10 -05: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 bb66d559e7 Merge branch 'development' 
Conflicts:
	gravity.sh
 2016-04-01 11:08:46 -05:00
nate 7b8fa3b922 Permissions changed for /etc/pihole and cleaned up some output 2016-04-01 01:11:59 -05:00
nate 28f2a1309e Merge branch 'development' 
Conflicts:
	automated install/uninstall.sh
 2016-03-31 20:25:54 -05:00
nate 2625d9f7fe Made piholeDebug.sh +x 2016-03-30 20:09:19 -05:00
nate 5f7c11f495 Sudo added to ifconfig to ensure it runs if debug not run as root 2016-03-30 19:51:09 -05:00
nate ec4d2d65a6 PromoFaux request: Detailed adlists.list output 
Now tells user (and logs to pihole_Debug.log) that the adlists.default file is in use
 2016-03-30 19:49:39 -05:00
nate f8427ab789 Merge remote-tracking branch 'refs/remotes/pi-hole/development' 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
 2016-03-29 12:57:22 -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 6145748bfb Change single echo to printf to forrect \t interpretation 2016-03-27 20:36:31 -05:00
nate 1a1026b367 Consistent stdout to match basic-install.sh and uninstall.sh 2016-03-27 14:44:42 -05:00
nate 5ee382c8eb Roll back addition of piholeDebug.sh (production master base) 2016-03-26 17:00:52 -05:00
nate 0b9e78df2c Cleaned code and added prompt for purge on uninstall 2016-03-26 16:57:01 -05:00
nate a9c24b456d Bug fixes and logging improvements 
Finalized for production deployment. Next release targeting a tarball of config files plus additional logging.
 2016-03-25 19:04:03 -05:00
nate b4463bf42c Added test for nslookup 
Checks the TESTURL for nslookup is not whitelisted
 2016-03-25 16:42:17 -05:00
nate 8f8dc66c70 Ignore whitespace when writing config files 2016-03-24 18:50:53 -05:00
Nate b746250e71 Made all advanced/Scripts/ executable for consistency. 2016-03-24 18:29:13 -05:00
Promofaux bc09760c84 Grab changes by @rosskevin. (#386 - lighttpd changes to handle JS files) 2016-03-24 23:19:44 +00:00