Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 15:13:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
649 commits 8 branches 109 tags 27 MiB
Commit graph

649 commits

This branch
This branch
All branches
Author SHA1 Message Date
ryt51V
4b76d74db6 Merge branch 'development' into networkchoices 2016-03-13 16:51:40 +00:00
Mcat12
1d80fdddd4 Merge pull request #372 from Morlok8k/development 
fix for older versions of uptime, on development branch.
 2016-03-11 15:51:18 -05:00
Morlok8k
d13ae0610e fix for older versions of uptime, on development branch. 2016-03-08 10:19:01 -08:00
Dan Schaper
3eaa447323 Merge pull request #369 from jpsingleton/development 
Optionally block the BBC Breaking News banner
 2016-03-08 00:28:18 -08:00
Mcat12
604506da10 Merge pull request #370 from stejoo/development 
Fix URL for Windows 10 Telemetry list.
 2016-03-07 18:31:56 -05:00
Stefan Joosten
122ce11381 Fix URL for Windows 10 Telemetry list. 2016-03-08 00:23:39 +01:00
James Singleton
8cbd9f7f08 Optionally block the BBC Breaking News banner 2016-03-07 13:31:50 +00:00
Dan Schaper
7c41e5bafc Merge pull request #367 from yoosi/fix-trailling-whitespace 
Fix trailing whitespace
 2016-03-05 23:17:31 -08:00
Carter Maxwell
4452f784a8 remove trailing whitespace basic-install.sh 2016-03-05 21:16:23 -08:00
Carter Maxwell
ced0ae0d65 remove trailing whitespace whitelist.sh 2016-03-05 21:15:53 -08:00
Carter Maxwell
876c51302a remove trailing whitespace updateDashboard.sh 2016-03-05 21:15:36 -08:00
Carter Maxwell
a6877e7c13 remove trailing whitespace chronometer.sh 2016-03-05 21:15:11 -08:00
Carter Maxwell
f633d1fa5b remove trailing whitespace blacklist.sh 2016-03-05 21:14:56 -08:00
Carter Maxwell
4f90b41343 remove trailing whitespace dnsmasq.conf.original 2016-03-05 21:14:17 -08:00
Carter Maxwell
e4ddf8bc33 remove trailing whitespace gravity.sh 2016-03-05 21:13:43 -08:00
Carter Maxwell
613ab9febc remove trailing whitespace adlists.default 2016-03-05 21:13:23 -08:00
Carter Maxwell
e92cceecc1 remove trailing whitespace README.md 2016-03-05 21:12:58 -08:00
ryt51V
334eb4cd76 Merge branch 'development' into networkchoices 2016-03-04 11:06:37 +00:00
Mcat12
b07b77c58f Update README.md 2016-02-29 20:09:49 -05:00
Mcat12
6542407fa3 Merge pull request #344 from ChadBHowell/CBH-Update_README.md 
Update README.md
 2016-02-29 20:08:57 -05:00
Mcat12
ebf995536b Merge pull request #354 from pi-hole/protectTheLists 
Protect the lists
 2016-02-29 20:07:20 -05:00
ryt51V
e8a5ba1100 Variables for IP and INT files. 2016-02-29 22:36:57 +00:00
ryt51V
72becc3c17 Output IP and interface used in all circumstances. 2016-02-29 22:26:11 +00:00
ryt51V
d823af896a Install script now saves interface and IPv4 address to files in /etc/pihole rather than /tmp. 
gravity.sh, blacklist.sh, whitelist.sh read from these files first.  If they cannot find them then they warn the user and detect and use the most sensible interface / IPv4 address.
gravity.sh no longer deletes the IPv4 file.
 2016-02-29 21:57:44 +00:00
ryt51V
40ac22a427 chooseInterface no longer has modified functionality so reverted to original version. (Ain't broke don't fix it). 2016-02-29 17:54:44 +00:00
ryt51V
2364e73ce9 Moved choice of IPv4 address to after user has chosen to use IPv4. 2016-02-29 17:49:42 +00:00
Mcat12
adcd7f10ee Fixed password input 2016-02-28 15:24:38 -05:00
Mcat12
af83936047 Added password to install 
Saves in password.txt
 2016-02-28 15:18:48 -05:00
ryt51V
ad920f6043 Fixed wrong echo when not using IPv4. 2016-02-28 19:18:45 +00:00
ryt51V
8d2fc23d5a Improved IPv4 dialogs. 2016-02-28 10:49:58 +00:00
ryt51V
3df654586f Fixed swapped lines. 2016-02-28 10:39:38 +00:00
ryt51V
66b9d07bcb Reverted back to ip behaviour - not only is ifconfig deprecated but so is its "labels" feature. Better to support modern labelless binding of multiple addresses. 2016-02-28 10:39:38 +00:00
ryt51V
34913941da Find IP address once interface is chose. 2016-02-28 10:39:37 +00:00
ryt51V
fbf7d1cf3d Tab consistency. 2016-02-28 10:39:37 +00:00
ryt51V
b5537cd360 Prompt user to choose if they wish to reconfigure their network settings. 2016-02-28 10:02:33 +00:00
ryt51V
443fe43ecc Simplified use4andor6 logic. 2016-02-28 10:02:33 +00:00
ryt51V
7fb7df7f6e List interfaces from ifconfig, which distinguishes different labels / aliases of a single physical interface. 2016-02-28 10:02:32 +00:00
Chad Howell
c3b5b97a41 Update README.md 
Changed wording per @PromoFaux recommendations.
 2016-02-25 19:42:43 -05:00
Chad Howell
830b287e5d Update README.md 
Add NTC CHIP and Debian based distros
 2016-02-23 00:08:50 -05:00
Adam Warner
3a46e7fc0a Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup 
Auto chronometer lcd setup
 2016-02-21 20:48:46 +00:00
Adam Warner
88674e21cf Update gravity.sh 
Clear out `pihole.*` files from `/etc/pihole` as they are no longer needed.
 2016-02-21 20:45:56 +00:00
Adam Warner
a0673c7028 Update basic-install.sh 
Increase required free bytes.
 2016-02-21 20:38:05 +00:00
Mcat12
592af80659 Update adlists.default 2016-02-21 14:19:57 -05:00
Adam Warner
3ec9b3b021 Merge pull request #327 from pi-hole/slamanna212-development 
Additional upstream DNS choices, plus ability to add custom upstream DNS
 2016-02-21 18:40:34 +00:00
Promofaux
ca2d3a192c add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela 2016-02-21 18:38:34 +00:00
Adam Warner
209bf7d746 Merge pull request #339 from pi-hole/adlist-changes 
Adlist.default changes
 2016-02-21 18:32:14 +00:00
Promofaux
13777cc1aa update default list to include StevenBlack's amalgamated list (remove seperate lists included in that list). Take advantage of new support for commenting and blank lines 2016-02-21 18:12:57 +00:00
Promofaux
bffc77e478 Add support for comments and blank lines in adlists.default/adlists.list 2016-02-21 17:45:25 +00:00
Promofaux
0ebb7eecdb Verify Custom DNS IP is a valid IP address 2016-02-20 17:33:20 +00:00
Promofaux
800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace() 2016-02-20 16:17:29 +00:00