diginc
							
						 
					 | 
					
						
						
							
						
						5fb6c5b012
					 | 
					
						
						
							
							Making the whitelist re-block echo consistent with other WL/BL echos
						
						
						
						
						
						
					 | 
					
						2016-07-20 12:53:31 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								diginc
							
						 
					 | 
					
						
						
							
						
						3affa73257
					 | 
					
						
						
							
							Only re-block whitelist deletions if in adlists
						
						
						
						
						
						
						
						* Prevent blocking benign/untracked domains deleted off whitelist
* Issue #581 
						
						
					 | 
					
						2016-07-20 12:43:30 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dan Schaper
							
						 
					 | 
					
						
						
							
						
						ce8f07750f
					 | 
					
						
						
							
							Remove trailing slash on os-release check
						
						
						
						
						
						
						
						Fixes #CLOSED 
Remove trailing slash that would cause an os-check to always fail out. 
						
						
					 | 
					
						2016-07-15 22:46:21 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						61ff12e8d4
					 | 
					
						
						
							
							Change header to match the rest of the scripts.
						
						
						
						
						
						
					 | 
					
						2016-07-15 21:17:16 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						e942440bb7
					 | 
					
						
						
							
							Dan forgot this : }
						
						
						
						
						
						
					 | 
					
						2016-07-15 21:11:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						6f068e0b9c
					 | 
					
						
						
							
							Replace sprunge.us with termbin, which appears to be more reliable.
						
						
						
						
						
						
					 | 
					
						2016-07-15 19:32:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sander
							
						 
					 | 
					
						
						
							
						
						11f2524b9b
					 | 
					
						
						
							
							Instead of an or, cat *release
						
						
						
						
						
						
					 | 
					
						2016-07-14 20:47:27 +02:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dan Schaper
							
						 
					 | 
					
						
						
							
						
						b011e5f838
					 | 
					
						
						
							
							Add os-release check
						
						
						
						
						
						
					 | 
					
						2016-07-14 11:35:52 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Dan Schaper
							
						 
					 | 
					
						
						
							
						
						f45eb84d6b
					 | 
					
						
						
							
							Add distribution Check
						
						
						
						
						
						
					 | 
					
						2016-07-14 11:27:47 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel
							
						 
					 | 
					
						
						
							
						
						9b8efe1b27
					 | 
					
						
						
							
							Upload log to sprunge.us
						
						
						
						
						
						
					 | 
					
						2016-07-03 19:50:42 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								bcambl
							
						 
					 | 
					
						
						
							
						
						27a9642090
					 | 
					
						
						
							
							check for sudo via 'command -v' instead of dkpg-query
						
						
						
						
						
						
					 | 
					
						2016-06-11 15:58:49 -06:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mcat12
							
						 
					 | 
					
						
						
							
						
						3fda2d9ac3
					 | 
					
						
						
							
							Fix helpfunc not found error
						
						
						
						
						
						
					 | 
					
						2016-05-25 17:07:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Carter Maxwell
							
						 
					 | 
					
						
						
							
						
						c0e1772e21
					 | 
					
						
						
							
							Replace toilet with echo
						
						
						
						
						
						
					 | 
					
						2016-05-07 11:44:18 -07:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Liu
							
						 
					 | 
					
						
						
							
						
						08e6f60941
					 | 
					
						
						
							
							Update blacklist.sh
						
						
						
						
						
						
					 | 
					
						2016-04-22 01:42:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Liu
							
						 
					 | 
					
						
						
							
						
						10066209e7
					 | 
					
						
						
							
							Update whitelist.sh
						
						
						
						
						
						
						
						Change piholeIPfile to a permanent location. 
						
						
					 | 
					
						2016-04-22 01:41:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jim Liu
							
						 
					 | 
					
						
						
							
						
						81fdfcba22
					 | 
					
						
						
							
							Update whitelist.sh
						
						
						
						
						
						
					 | 
					
						2016-04-21 23:40:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mcat12
							
						 
					 | 
					
						
						
							
						
						619082dbed
					 | 
					
						
						
							
							Merge branch 'development' into BugFix463
						
						
						
						
						
						
						
						Conflicts:
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh 
						
						
					 | 
					
						2016-04-20 15:54:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mayur Raiturkar
							
						 
					 | 
					
						
						
							
						
						56ac04c48e
					 | 
					
						
						
							
							fixed helpFunc 2
						
						
						
						
						
						
					 | 
					
						2016-04-17 18:22:06 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Mayur Raiturkar
							
						 
					 | 
					
						
						
							
						
						b58519b974
					 | 
					
						
						
							
							fixed helpFunc 1
						
						
						
						
						
						
					 | 
					
						2016-04-17 18:21:32 +05:30 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						ad574f5e90
					 | 
					
						
						
							
							Replace kill with killall
						
						
						
						
						
						
					 | 
					
						2016-04-16 15:52:38 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						4941a657bf
					 | 
					
						
						
							
							remove -s switch, as it turns out it worked afterall.
						
						
						
						
						
						
					 | 
					
						2016-04-16 12:59:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						3d4bff9414
					 | 
					
						
						
							
							Add -s switch to kill command to increase compatability
						
						
						
						
						
						
					 | 
					
						2016-04-16 10:56:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Warner
							
						 
					 | 
					
						
						
							
						
						77f4126f9b
					 | 
					
						
						
							
							add root check to whitelist script
						
						
						
						
						
						
					 | 
					
						2016-04-13 15:51:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Warner
							
						 
					 | 
					
						
						
							
						
						4c890ab202
					 | 
					
						
						
							
							Add root check to blacklist script
						
						
						
						
						
						
					 | 
					
						2016-04-13 15:50:48 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Warner
							
						 
					 | 
					
						
						
							
						
						d10e9b1b6e
					 | 
					
						
						
							
							add pihole/webui version numbers
						
						
						
						
						
						
					 | 
					
						2016-04-12 08:47:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Adam Warner
							
						 
					 | 
					
						
						
							
						
						a6bee76581
					 | 
					
						
						
							
							add location of debug log output file!
						
						
						
						
						
						
					 | 
					
						2016-04-12 08:24:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								nate
							
						 
					 | 
					
						
						
							
						
						2f4f5a6ad2
					 | 
					
						
						
							
							Added lighttpd error.log to debug output
						
						
						
						
						
						
					 | 
					
						2016-04-11 18:35:44 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Promofaux
							
						 
					 | 
					
						
						
							
						
						48fa83c9ac
					 | 
					
						
						
							
							Fix whitespace
						
						
						
						
						
						
					 | 
					
						2016-04-10 21:36:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
							
						
						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
							
						 
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |