Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
4650 commits 10 branches 109 tags 28 MiB
Commit graph

4650 commits

This branch
This branch
All branches
Author SHA1 Message Date
Promofaux
800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace() 2016-02-20 16:17:29 +00:00
Promofaux
f397844603 Remove conflicted merge markup. Not sure how that got through. 2016-02-20 16:08:02 +00:00
Promofaux
2d895f328c Fix merge conflicts 2016-02-20 15:38:39 +00:00
Promofaux
b14b182084 change regex to test for one or more numbers, not 0 or more numbers. 2016-02-20 15:17:57 +00:00
Promofaux
8687d25d88 make prepopulation of freetext on custom DNS provider a bit more intelligent 2016-02-20 15:12:13 +00:00
Promofaux
7001edcd1d Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs. 2016-02-20 15:00:03 +00:00
Mcat12
4a1e88f4bf Fixed Pi-hole user not being created 2016-02-20 09:48:06 -05:00
Promofaux
b41608d40b Include fix for regex in verifyFreeDiskSpace() 2016-02-20 14:44:56 +00:00
jacobsalmela
c5d45edf2d consoleblank=0 
This makes sure the LCD screen does not go blank after a set period of
time.
 2016-02-20 01:15:14 -06:00
jacobsalmela
0116b6341c updated script 
Added links to where code was borrowed from
added reboot at the end
also added a few things commented out that might be useful for some
people to learn.
 2016-02-20 01:14:48 -06:00
Adam Warner
3e7ecda80f Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2 
Add user pihole if user does not exsist
 2016-02-19 09:31:41 +00:00
jacobsalmela
f0e5b2b6f9 Merge branch 'master' into auto-chronometer-lcd-setup 2016-02-18 16:45:47 -06:00
Jacob Salmela
5976ec9323 Merge pull request #330 from fayetted/Issue_322 
Account for CHIP pc not having root on '/'
 2016-02-17 17:42:32 -06:00
Adam Warner
eb3463fad1 Merge pull request #331 from pi-hole/master 
Update Dev from master
 2016-02-17 22:24:27 +00:00
Adam Warner
5f9e5869e9 Create ISSUE_TEMPLATE.md 2016-02-17 22:23:01 +00:00
Adam Warner
950480bb77 Update PULL_REQUEST_TEMPLATE.md 2016-02-17 22:20:01 +00:00
Adam Warner
6530ec58c7 Update PULL_REQUEST_TEMPLATE.md 2016-02-17 22:18:43 +00:00
Adam Warner
b1515c5e3f Rename PULL_REQUEST_TEMPLATE to PULL_REQUEST_TEMPLATE.md 2016-02-17 22:17:20 +00:00
Adam Warner
6581f119fd Update PULL_REQUEST_TEMPLATE 2016-02-17 22:16:04 +00:00
Adam Warner
9ad7c12710 Create PULL_REQUEST_TEMPLATE 2016-02-17 22:15:33 +00:00
Daniel Fayette
8e289215b4 Account for CHIP pc not having root on '/' 2016-02-17 10:00:36 -06:00
Adam Warner
3718c3be56 Merge pull request #328 from Hippyjake/development 
closes #325
 2016-02-17 12:51:03 +00:00
Adam Warner
c3c051385c Update basic-install.sh 
Corrected mistake in previous commit
 2016-02-17 12:42:31 +00:00
Hippyjake
21c688a8a8 add uptime -p to chrono script 2016-02-16 18:06:49 -07:00
Promofaux
668b883651 Merge branch 'fayetted-Issue_309' into slamanna212-development 2016-02-17 00:08:48 +00:00
Promofaux
c396aeed52 Correct miss-spelled variables on lines 398 and 403 2016-02-17 00:07:14 +00:00
Adam Warner
40f541bc31 update verifyFreeDiskSpace()... 
addresses #322. Will now check free space on the first file system output by 'df- lkP`, as opposed to `/` to make pi-hole more compatible with other distros.
 2016-02-16 23:00:48 +00:00
Daniel Fayette
44974f98a0 Merge remote-tracking branch 'upstream/development' into Issue_309 2016-02-16 16:57:04 -06:00
Adam Warner
b7cb3df9bc Merge pull request #305 from fayetted/Issue_304 
Set file permisions on `/etc/pihole` directory. fixes #304
 2016-02-16 22:54:54 +00:00
Daniel Fayette
432e6d5395 Cleaned up output, Fixed Cancel button 2016-02-16 16:47:36 -06:00
Daniel Fayette
fdf805bc7b Merged with @slamanna212 code to add 3 new DNS providers. 2016-02-16 16:38:06 -06:00
Promofaux
73e13f3875 Merge branch 'development' of https://github.com/slamanna212/pi-hole into slamanna212-development 2016-02-16 22:22:59 +00:00
slamanna212
da959e1296 Increased Size Of Whiptail Dialog 
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
 2016-02-15 17:55:14 -05:00
slamanna212
94600c54cb Added Default State for New DNS Options 
Added default state of off for 3 new DNS options to better match existing code
 2016-02-15 17:54:17 -05:00
Mcat12
c4fc2e089d Removed dead list 
Fixes #316
 2016-02-15 17:36:59 -05:00
slamanna212
06444c1c27 Add 3 More DNS Server Choices Durring Install 
Added Level 3 , Norton, and Comodo DNS Choices
 2016-02-15 17:31:31 -05:00
Adam Warner
f8897942f3 Update adlists.default 
Remove 'securemecca.com` list, as they block other content, not just ads and malware.

Pi-hole is about ad-blocking and privacy, not about censoring content.
See :https://www.reddit.com/r/pihole/comments/45xuh8/slug/d00xg02
 2016-02-15 19:26:39 +00:00
Adam Warner
4d0b4cfb36 Update basic-install.sh 
Do not stop dnsmasq when installing. Instead run `service dnsmasq restart` once installation is complete.
This may have been the cause of issues outlined in #218
 2016-02-14 23:44:23 +00:00
Promofaux
7116634739 Merge branch 'development' for release 2.5.2 2016-02-14 23:09:09 +00:00
Promofaux
36492f4857 Merge branch 'master' into development 2016-02-14 23:08:48 +00:00
Adam Warner
3a887af513 Addresses #313 
path to white and blacklist scripts moved to variables and updated to include full path
 2016-02-14 22:24:21 +00:00
jacobsalmela
3142992c57 update 2016-02-14 10:53:13 -06:00
Jacob Salmela
68a9b88b58 docker container for Pi-hole 2016-02-14 10:20:02 -06:00
Adam Warner
3c801e5b91 Merge pull request #301 from fayetted/Issue_163-2 
Check for 25mb of free disk space before install
 2016-02-14 13:29:07 +00:00
Daniel Fayette
ecd46f8560 Allow installer to specify own DNS servers 
Offers "other" option.
Gives Installer chance to review settings before continuing.
 2016-02-13 22:36:24 -06:00
Adam Warner
dee8ce587d Merge pull request #306 from pi-hole/IPv6-Killer 
Fixes IPv6 surviving a reinstall
 2016-02-14 03:03:56 +00:00
Promofaux
4c24186911 Fixes divide by zero error. 2016-02-14 02:58:09 +00:00
Mcat12
af360a1a20 Merge pull request #298 from fayetted/Issue_297 
Fixes gravity_transport variable interpretation.
 2016-02-10 20:10:05 -05:00
Mcat12
b5406240c6 Fixes IPv6 surviving a reinstall 2016-02-10 19:07:48 -05:00
Daniel Fayette
73bfbba5f7 Set file permisions on /etc/pihole 
Ensures file permisions on $piholeDir before reload/restart of dnsmasq
 2016-02-10 15:07:31 -06:00