Dan Schaper
e7926148ed
Use pre-defined variables for desired interface
2016-01-13 10:33:12 -08:00
Dan Schaper
f9717bcff6
Merge pull request #11 from jacobsalmela/master
...
Upstream sync
2016-01-13 10:31:57 -08:00
Jacob Salmela
4b1dd8a2a5
fixes #158
...
Running at midnight, not 11:58 in the afternoon.
2016-01-12 17:44:08 -06:00
Jacob Salmela
b5bdfe27be
Merge pull request #155 from JoshKastang/webinterface-update
...
replaces the non-repository managed web interface for pihole and keep…
2016-01-11 17:39:42 -06:00
Jacob Salmela
0ef0b0b661
LCD real-time stats
2016-01-10 14:09:40 -06:00
Josh Kastang
802638ce8b
replaces the non-repository managed web interface for pihole and keeps it updated
2016-01-10 19:08:29 +00:00
Jacob Salmela
cfd6e0d65d
more coverage and an API
2016-01-10 10:40:58 -06:00
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
2016-01-04 20:32:46 -06:00
Jacob Salmela
6f9d2d0567
fixes #145
...
A much more elegant way to get the screen size.
2016-01-02 17:20:33 -06:00
Jacob Salmela
d2b6947886
Merge pull request #146 from iblamefish/multiple-interfaces
...
installer - only select first (probably default) interface in list instead of all
2016-01-02 17:17:58 -06:00
Clinton
bc3224e0b9
installer - only select first (probably default) interface in list instead of all
2016-01-02 22:10:26 +00:00
Jacob Salmela
ba75c4c62c
Merge pull request #144 from jacobsalmela/ipv6
...
Enables ad-blocking over IPv6 for an even better Internet experience.
2016-01-01 18:44:07 -06:00
Jacob Salmela
3fc1817e7a
Merge branch 'master' into ipv6
2016-01-01 18:34:33 -06:00
Jacob Salmela
ab1352b48e
Merge pull request #143 from iblamefish/master
...
fixes #142 kill -HUP erroring on gravity_reload if dnsmasq is not running
2016-01-01 18:16:35 -06:00
Clinton
89b88a2d5d
fixes #142 kill -HUP erroring on gravity_reload if dnsmasq is not running
2016-01-02 00:10:12 +00:00
Salmela
d37db4304c
A few small display changes
...
IPv6 box was missing the title.
Added some IPv6 echoes.
2016-01-01 10:59:30 -06:00
Jacob Salmela
a6b18feed9
Merge pull request #141 from iblamefish/ipv6
...
Fix bug in gravity.sh where IPv6 list was not always populated
2016-01-01 09:14:43 -06:00
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)
2016-01-01 14:11:46 +00:00
Salmela
d646612a25
Block ads over IPv6
...
I’m pretty sure this works well. Maybe someone else can try it out.
2015-12-31 20:26:05 -06:00
Jacob Salmela
8ffa5e9357
adding unRaid-hole fork
2015-12-30 13:34:45 -06:00
Jacob Salmela
d92b3fda91
Merge pull request #137 from iblamefish/patch-1
...
Fix typo in installer
2015-12-28 10:44:50 -06:00
Clinton Montague
b757e7a769
Fix typo in installer
...
IPv4 was mentioned in an IPv6 setting - changed to correctly reference IPv6.
2015-12-28 12:29:54 +00:00
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.
2015-12-27 12:25:35 -06:00
Jacob Salmela
94f7363b8f
Merge pull request #136 from klaas01/patch-2
...
Fix kill command to re-read hosts file
2015-12-27 12:07:16 -06:00
klaas01
a6313c9e9e
Update gravity.sh
...
Fix kill command and only run as last step.
2015-12-26 14:37:51 -04:00
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
2015-12-25 21:14:19 -06:00
Dan Schaper
005a937f0f
Merge pull request #10 from jacobsalmela/master
...
fixes #126
2015-12-17 18:48:54 -08:00
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.
2015-12-16 11:23:44 -06:00
Dan Schaper
d18ab8032a
Merge pull request #9 from jacobsalmela/master
...
Merge upstream to master
2015-12-08 22:44:39 -08:00
Jacob Salmela
263d9a222a
Merge pull request #120 from dschaper/documenting
...
Add GPL V2+ headers to script files
2015-12-08 17:46:56 -06:00
Dan Schaper
73bbfc27d0
Remove extra debian doc file
2015-12-08 15:43:40 -08:00
Dan Schaper
4027139d9c
More merge conflict resolution
2015-12-06 20:24:58 -08:00
Dan Schaper
d215fa9ade
Resolve merge confict
2015-12-06 20:22:34 -08:00
Dan Schaper
b261e046bb
Merge pull request #8 from jacobsalmela/master
...
Upstream sync
2015-12-06 14:44:55 -08:00
Jacob Salmela
4bca6fdfc4
Merge pull request #124 from dschaper/master
...
Fix merge conflicts
2015-12-06 16:41:46 -06:00
Dan Schaper
9c1eca23ae
Fix merge conflicts
2015-12-06 14:39:43 -08:00
Dan Schaper
66953319c4
Merge branch 'development' of github.com:dschaper/pi-hole into development
2015-12-06 14:37:40 -08:00
Dan Schaper
dfc317124c
Merge pull request #6 from jacobsalmela/development
...
Development
2015-12-06 14:36:55 -08:00
Dan Schaper
debb5aeed6
Merge pull request #5 from jacobsalmela/master
...
Upstream sync
2015-12-06 14:36:26 -08:00
Jacob Salmela
f724a3a61a
Merge pull request #122 from dschaper/bug/interfaceCheck
...
Bug/interface check
2015-12-06 16:32:44 -06:00
Jacob Salmela
f5e573371c
Merge pull request #121 from dschaper/development
...
Merge development
2015-12-06 16:31:11 -06:00
Jacob Salmela
86192a6950
Merge pull request #117 from dschaper/master
...
Merge development into master
2015-12-06 16:18:12 -06:00
Dan Schaper
ed75f11f3e
Merge branch 'bug/interfaceCheck' into development
2015-12-06 14:05:35 -08:00
Dan Schaper
dcccb2ee2b
Merge branch 'bug/multipleIP' into development
2015-12-06 11:58:02 -08:00
Dan Schaper
412a190b42
Basic-install.sh should only show one ip address in whiptail screen.
2015-12-06 11:05:09 -08:00
Dan Schaper
d2b260fc1e
Log file is automatically generated by dnsmasq, no need to create.
2015-12-06 10:29:59 -08:00
Dan Schaper
723c2d47bb
Add gravity.pod
2015-12-06 09:27:13 -08:00
Dan Schaper
22d0e82d92
Add GPL V2+ header
2015-12-06 06:31:49 -08:00
Dan Schaper
cb91b8f5fa
Add copyright headers
2015-12-06 05:55:50 -08:00
Dan Schaper
a230df0032
Fix errant )
2015-12-06 05:33:22 -08:00
