Commit Graph

633 Commits (1d80fdddd4458a53e45a15b6f0d792f0d4b28118)
 

Author SHA1 Message Date
Mcat12 1d80fdddd4 Merge pull request #372 from Morlok8k/development
8 years ago
Morlok8k d13ae0610e fix for older versions of uptime, on development branch.
8 years ago
Dan Schaper 3eaa447323 Merge pull request #369 from jpsingleton/development
8 years ago
Mcat12 604506da10 Merge pull request #370 from stejoo/development
8 years ago
Stefan Joosten 122ce11381 Fix URL for Windows 10 Telemetry list.
8 years ago
James Singleton 8cbd9f7f08 Optionally block the BBC Breaking News banner
8 years ago
Dan Schaper 7c41e5bafc Merge pull request #367 from yoosi/fix-trailling-whitespace
8 years ago
Carter Maxwell 4452f784a8 remove trailing whitespace basic-install.sh
8 years ago
Carter Maxwell ced0ae0d65 remove trailing whitespace whitelist.sh
8 years ago
Carter Maxwell 876c51302a remove trailing whitespace updateDashboard.sh
8 years ago
Carter Maxwell a6877e7c13 remove trailing whitespace chronometer.sh
8 years ago
Carter Maxwell f633d1fa5b remove trailing whitespace blacklist.sh
8 years ago
Carter Maxwell 4f90b41343 remove trailing whitespace dnsmasq.conf.original
8 years ago
Carter Maxwell e4ddf8bc33 remove trailing whitespace gravity.sh
8 years ago
Carter Maxwell 613ab9febc remove trailing whitespace adlists.default
8 years ago
Carter Maxwell e92cceecc1 remove trailing whitespace README.md
8 years ago
Mcat12 b07b77c58f Update README.md
8 years ago
Mcat12 6542407fa3 Merge pull request #344 from ChadBHowell/CBH-Update_README.md
8 years ago
Mcat12 ebf995536b Merge pull request #354 from pi-hole/protectTheLists
8 years ago
Mcat12 adcd7f10ee Fixed password input
8 years ago
Mcat12 af83936047 Added password to install
8 years ago
Chad Howell c3b5b97a41 Update README.md
8 years ago
Chad Howell 830b287e5d Update README.md
8 years ago
Adam Warner 3a46e7fc0a Merge pull request #338 from pi-hole/auto-chronometer-lcd-setup
8 years ago
Adam Warner 88674e21cf Update gravity.sh
8 years ago
Adam Warner a0673c7028 Update basic-install.sh
8 years ago
Mcat12 592af80659 Update adlists.default
8 years ago
Adam Warner 3ec9b3b021 Merge pull request #327 from pi-hole/slamanna212-development
8 years ago
Promofaux ca2d3a192c add double bracket notation to lines 396, 399, 403 . Fixes error raised by @jacobsalmela
8 years ago
Adam Warner 209bf7d746 Merge pull request #339 from pi-hole/adlist-changes
8 years ago
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
8 years ago
Promofaux bffc77e478 Add support for comments and blank lines in adlists.default/adlists.list
8 years ago
Promofaux 0ebb7eecdb Verify Custom DNS IP is a valid IP address
8 years ago
Promofaux 800d2f0859 Add back in whiptail dialog to verifyFreeDiskSpace()
8 years ago
Promofaux f397844603 Remove conflicted merge markup. Not sure how that got through.
8 years ago
Promofaux 2d895f328c Fix merge conflicts
8 years ago
Promofaux b14b182084 change regex to test for one or more numbers, not 0 or more numbers.
8 years ago
Promofaux 8687d25d88 make prepopulation of freetext on custom DNS provider a bit more intelligent
8 years ago
Promofaux 7001edcd1d Change 'Other' to 'Custom', add explanation to whiptail. Convert spaces to tabs.
8 years ago
Mcat12 4a1e88f4bf Fixed Pi-hole user not being created
8 years ago
Promofaux b41608d40b Include fix for regex in verifyFreeDiskSpace()
8 years ago
jacobsalmela c5d45edf2d consoleblank=0
8 years ago
jacobsalmela 0116b6341c updated script
8 years ago
Adam Warner 3e7ecda80f Merge pull request #242 from ChadBHowell/CBH---pihole-system-user-v2
8 years ago
jacobsalmela f0e5b2b6f9 Merge branch 'master' into auto-chronometer-lcd-setup
8 years ago
Jacob Salmela 5976ec9323 Merge pull request #330 from fayetted/Issue_322
8 years ago
Adam Warner eb3463fad1 Merge pull request #331 from pi-hole/master
8 years ago
Adam Warner 5f9e5869e9 Create ISSUE_TEMPLATE.md
8 years ago
Adam Warner 950480bb77 Update PULL_REQUEST_TEMPLATE.md
8 years ago
Adam Warner 6530ec58c7 Update PULL_REQUEST_TEMPLATE.md
8 years ago