Promofaux
f397844603
Remove conflicted merge markup. Not sure how that got through.
9 years ago
Promofaux
2d895f328c
Fix merge conflicts
9 years ago
Promofaux
b14b182084
change regex to test for one or more numbers, not 0 or more numbers.
9 years ago
Promofaux
8687d25d88
make prepopulation of freetext on custom DNS provider a bit more intelligent
9 years ago
Promofaux
7001edcd1d
Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs.
9 years ago
Mcat12
4a1e88f4bf
Fixed Pi-hole user not being created
9 years ago
Promofaux
b41608d40b
Include fix for regex in verifyFreeDiskSpace()
9 years ago
Adam Warner
3e7ecda80f
Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
...
Add user pihole if user does not exsist
9 years ago
Jacob Salmela
5976ec9323
Merge pull request #330 from fayetted/Issue_322
...
Account for CHIP pc not having root on '/'
9 years ago
Adam Warner
eb3463fad1
Merge pull request #331 from pi-hole/master
...
Update Dev from master
9 years ago
Adam Warner
5f9e5869e9
Create ISSUE_TEMPLATE.md
9 years ago
Adam Warner
950480bb77
Update PULL_REQUEST_TEMPLATE.md
9 years ago
Adam Warner
6530ec58c7
Update PULL_REQUEST_TEMPLATE.md
9 years ago
Adam Warner
b1515c5e3f
Rename PULL_REQUEST_TEMPLATE to PULL_REQUEST_TEMPLATE.md
9 years ago
Adam Warner
6581f119fd
Update PULL_REQUEST_TEMPLATE
9 years ago
Adam Warner
9ad7c12710
Create PULL_REQUEST_TEMPLATE
9 years ago
Daniel Fayette
8e289215b4
Account for CHIP pc not having root on '/'
9 years ago
Adam Warner
3718c3be56
Merge pull request #328 from Hippyjake/development
...
closes #325
9 years ago
Adam Warner
c3c051385c
Update basic-install.sh
...
Corrected mistake in previous commit
9 years ago
Hippyjake
21c688a8a8
add uptime -p to chrono script
9 years ago
Promofaux
668b883651
Merge branch 'fayetted-Issue_309' into slamanna212-development
9 years ago
Promofaux
c396aeed52
Correct miss-spelled variables on lines 398 and 403
9 years ago
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.
9 years ago
Daniel Fayette
44974f98a0
Merge remote-tracking branch 'upstream/development' into Issue_309
9 years ago
Adam Warner
b7cb3df9bc
Merge pull request #305 from fayetted/Issue_304
...
Set file permisions on `/etc/pihole` directory. fixes #304
9 years ago
Daniel Fayette
432e6d5395
Cleaned up output, Fixed Cancel button
9 years ago
Daniel Fayette
fdf805bc7b
Merged with @slamanna212 code to add 3 new DNS providers.
9 years ago
Promofaux
73e13f3875
Merge branch 'development' of https://github.com/slamanna212/pi-hole into slamanna212-development
9 years ago
slamanna212
da959e1296
Increased Size Of Whiptail Dialog
...
Increased Size of Whiptail Dialog to 5 to show all 5 DNS choices
9 years ago
slamanna212
94600c54cb
Added Default State for New DNS Options
...
Added default state of off for 3 new DNS options to better match existing code
9 years ago
Mcat12
c4fc2e089d
Removed dead list
...
Fixes #316
9 years ago
slamanna212
06444c1c27
Add 3 More DNS Server Choices Durring Install
...
Added Level 3 , Norton, and Comodo DNS Choices
9 years ago
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
9 years ago
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
9 years ago
Promofaux
7116634739
Merge branch 'development' for release 2.5.2
9 years ago
Promofaux
36492f4857
Merge branch 'master' into development
9 years ago
Adam Warner
3a887af513
Addresses #313
...
path to white and blacklist scripts moved to variables and updated to include full path
9 years ago
Jacob Salmela
68a9b88b58
docker container for Pi-hole
9 years ago
Adam Warner
3c801e5b91
Merge pull request #301 from fayetted/Issue_163-2
...
Check for 25mb of free disk space before install
9 years ago
Daniel Fayette
ecd46f8560
Allow installer to specify own DNS servers
...
Offers "other" option.
Gives Installer chance to review settings before continuing.
9 years ago
Adam Warner
dee8ce587d
Merge pull request #306 from pi-hole/IPv6-Killer
...
Fixes IPv6 surviving a reinstall
9 years ago
Promofaux
4c24186911
Fixes divide by zero error.
9 years ago
Mcat12
af360a1a20
Merge pull request #298 from fayetted/Issue_297
...
Fixes gravity_transport variable interpretation.
9 years ago
Mcat12
b5406240c6
Fixes IPv6 surviving a reinstall
9 years ago
Daniel Fayette
73bfbba5f7
Set file permisions on /etc/pihole
...
Ensures file permisions on $piholeDir before reload/restart of dnsmasq
9 years ago
Daniel Fayette
46d7bfecdb
Check for 25mb of free disk space before install
...
Function will check the free space of / (root)
If the free space is less than 25MB it will give directions
on how to expand the disk.
Fixes #163
9 years ago
Daniel Fayette
a734927591
Fixes gravity_transport variable interpretation.
...
Adding (") around Variables passed to function ensures
spaces are handled and that missing arguments are
accounted for.
9 years ago
Promofaux
255706e173
Bring dev branch up to date with master bug fixes
9 years ago
Promofaux
b2fbf46e60
Added more adlists to the defaults. By default we now block ~ 155,600 ad and tracker domains. Includes NoTrack's tracker list.
9 years ago
Mcat12
e37495d80b
Merge pull request #294 from soukron/master
...
Replaced 'sudo' with $SUDO variable
9 years ago