5874 Commits (master)

 

All Branches   

Search

Author	SHA1	Message	Date
Adam Warner	ddfefb291d	Merge branch 'Whitelistingchanges' into whitelist	8 years ago
Adam Warner	5d842a7533	Merging	8 years ago
Adam Warner	2284a27814	Consumes blacklist.sh now, too.	8 years ago
Adam Warner	f68cf10efa	Tidied up a couple of things	8 years ago
Adam Warner	89e3c25a90	Behaves like whitelist, but on the blacklist	8 years ago
Adam Warner	6b1f14647c	add reference to blacklist.sh	8 years ago
Adam Warner	14ee4850af	Placeholder for blacklist script	8 years ago
Adam Warner	cc62d984d2	Changed whitelist function to outsource to whitelist.sh	8 years ago
Adam Warner	534dbc9b6e	added a quiet option for when the script is called by gravity. Less output = less confusion!	8 years ago
Adam Warner	8ad116fe7b	Aiming to get whitelist.sh to run either standalone or to be called from gravity.sh. Initial commit	8 years ago
jacobsalmela	ca5e34a9a9	Merge branch 'master' into whitelist ... # Conflicts: # gravity.sh	8 years ago
Jacob Salmela	9ff1129510	Minibian Pi-hole	8 years ago
Jacob Salmela	4b1dd8a2a5	fixes #158 ... Running at midnight, not 11:58 in the afternoon.	8 years ago
Jacob Salmela	b5bdfe27be	Merge pull request #155 from JoshKastang/webinterface-update ... replaces the non-repository managed web interface for pihole and keep…	8 years ago
Jacob Salmela	0ef0b0b661	LCD real-time stats	8 years ago
Josh Kastang	802638ce8b	replaces the non-repository managed web interface for pihole and keeps it updated	8 years ago
Jacob Salmela	cfd6e0d65d	more coverage and an API	8 years ago
Jacob Salmela	93664aeb4e	cleaning up the readme ... - removed most of the video images to reduce clutter - converged the "coverage" and "video" sections into a bulleted list of links - added a new project link (pi-hole on/off button) - moved projects up in the page so it's easier to find and see what people are doing with Pi-hole - removed custom conf section since it will be suited better in the wiki or FAQs - added a help section	8 years ago
Jacob Salmela	6f9d2d0567	fixes #145 ... A much more elegant way to get the screen size.	8 years ago
Jacob Salmela	d2b6947886	Merge pull request #146 from iblamefish/multiple-interfaces ... installer - only select first (probably default) interface in list instead of all	8 years ago
Clinton	bc3224e0b9	installer - only select first (probably default) interface in list instead of all	8 years ago
Jacob Salmela	ba75c4c62c	Merge pull request #144 from jacobsalmela/ipv6 ... Enables ad-blocking over IPv6 for an even better Internet experience.	8 years ago
Jacob Salmela	3fc1817e7a	Merge branch 'master' into ipv6	8 years ago
Jacob Salmela	ab1352b48e	Merge pull request #143 from iblamefish/master ... fixes #142 kill -HUP erroring on gravity_reload if dnsmasq is not running	8 years ago
Clinton	89b88a2d5d	fixes #142 kill -HUP erroring on gravity_reload if dnsmasq is not running	8 years ago
Salmela	d37db4304c	A few small display changes ... IPv6 box was missing the title. Added some IPv6 echoes.	8 years ago
Jacob Salmela	a6b18feed9	Merge pull request #141 from iblamefish/ipv6 ... Fix bug in gravity.sh where IPv6 list was not always populated	8 years ago
Clinton	987e4e02a9	Fix bug in gravity.sh where IPv6 list was not always populated ... Failed to be populated if /tmp/piholeIP does not exist. This may happen under the following conditions: - was not generated during install - gravity.sh being run again after the original install (the file is deleted during the installation process)	8 years ago
Salmela	d646612a25	Block ads over IPv6 ... I’m pretty sure this works well. Maybe someone else can try it out.	8 years ago
Jacob Salmela	8ffa5e9357	adding unRaid-hole fork	8 years ago
Jacob Salmela	d92b3fda91	Merge pull request #137 from iblamefish/patch-1 ... Fix typo in installer	8 years ago
Clinton Montague	b757e7a769	Fix typo in installer ... IPv4 was mentioned in an IPv6 setting - changed to correctly reference IPv6.	8 years ago
Jacob Salmela	26dcbfc1f9	hide minor error ... An error shows up on the first install that `latentWhitelist.txt` doesn't exist and can't be removed. Redirecting STDERR should fix this.	8 years ago
Jacob Salmela	94f7363b8f	Merge pull request #136 from klaas01/patch-2 ... Fix kill command to re-read hosts file	8 years ago
klaas01	a6313c9e9e	Update gravity.sh ... Fix kill command and only run as last step.	8 years ago
Jacob Salmela	3cdce17d28	adding more coverage ... - Rob's post on medium.com - TekThing video Also posting about plans to partner up with Rob for his new service that can help reduce the flame war surrounding ad blocking	8 years ago
Jacob Salmela	184d1bd046	fixes #126 ... These commands were left out, resulting in the Web interface not showing ads blocked despite the Pi-hole working. It is just a permissions error.	9 years ago
Jacob Salmela	c88982d0d5	chmod doesn't apply at initial install	9 years ago
Jacob Salmela	57282cfe16	ugly hack to whitelist from the Web interface ... I wanted the whitelist feature to keep the user on the same page without having to reload it. I'm sure someone better versed in PHP could eliminate the need for this hack. Nonetheless, it works. www-data runs the script if executed from the Web interface. www-data also needs access to write to /etc/pihole/gravity.list to actually remove the domain. So a few more things need to happen before this will fully work. The changes in this script won't change what is displayed if run from the terminal, but will help when it needs to be run from the Web interface, so I am just committing this now. The only other thing I would like to see would be a progress spinner, but my Web skills still need some work...	9 years ago
Jacob Salmela	263d9a222a	Merge pull request #120 from dschaper/documenting ... Add GPL V2+ headers to script files	9 years ago
Dan Schaper	73bbfc27d0	Remove extra debian doc file	9 years ago
Dan Schaper	4027139d9c	More merge conflict resolution	9 years ago
Dan Schaper	d215fa9ade	Resolve merge confict	9 years ago
Dan Schaper	b261e046bb	Merge pull request #8 from jacobsalmela/master ... Upstream sync	9 years ago
Jacob Salmela	4bca6fdfc4	Merge pull request #124 from dschaper/master ... Fix merge conflicts	9 years ago
Dan Schaper	9c1eca23ae	Fix merge conflicts	9 years ago
Dan Schaper	66953319c4	Merge branch 'development' of github.com:dschaper/pi-hole into development	9 years ago
Dan Schaper	dfc317124c	Merge pull request #6 from jacobsalmela/development ... Development	9 years ago
Dan Schaper	debb5aeed6	Merge pull request #5 from jacobsalmela/master ... Upstream sync	9 years ago
Jacob Salmela	f724a3a61a	Merge pull request #122 from dschaper/bug/interfaceCheck ... Bug/interface check	9 years ago