Commit Graph

938 Commits (b0cc69ff80b884fd5053c810ce5b1e6c3893fcfe)
 

Author SHA1 Message Date
Dan Schaper b0cc69ff80 Merge Conflict resolution
8 years ago
Dan Schaper 02c4669e95 Typo/Linter fix
8 years ago
Adam Warner fdf27e3d24 Merge pull request #573 from bcambl/centos-nc
8 years ago
Adam Warner 069023fca2 Merge pull request #589 from pi-hole/PromoFaux-patch-1
8 years ago
Adam Warner 1fd6648db1 Merge pull request #591 from pi-hole/master
8 years ago
Adam Warner 7a08c8b694 Merge pull request #590 from pi-hole/revert-588-master
8 years ago
Adam Warner 60aad3f19b Revert "Development out of sync with master."
8 years ago
Adam Warner 51dcc2bc0f Update README.md
8 years ago
Adam Warner 941525d1e0 Development out of sync with master. (#588)
8 years ago
Blayne Campbell c647e27e15 Merge branch 'development' into centos-nc
8 years ago
Dan Schaper f696ed48b3 Merge pull request #570 from pi-hole/bugfix/dhcpcd_comments
8 years ago
Adam Warner 73645f299a Merge branch 'development' into bugfix/dhcpcd_comments
8 years ago
Mcat12 6aeb5f1172 Merge pull request #575 from pi-hole/bugfix/distrib_vers_check
8 years ago
Dan Schaper ce8f07750f Remove trailing slash on os-release check
8 years ago
bcambl a32ad0dbf2 fix centos nc dependency
8 years ago
Promofaux 61ff12e8d4 Change header to match the rest of the scripts.
8 years ago
Adam Warner 02b0e96db8 Merge pull request #572 from pi-hole/development
8 years ago
Promofaux e942440bb7 Dan forgot this : `}`
8 years ago
Dan Schaper a27f1f17de Merge pull request #563 from pi-hole/development
8 years ago
Promofaux e106ff0fef Add netcat to dependencies for termbin.com. Should be installed by default, but JUST IN CASE.
8 years ago
Promofaux 6f068e0b9c Replace sprunge.us with termbin, which appears to be more reliable.
8 years ago
Dan Schaper ada531c88a Merge pull request #568 from pi-hole/feature/Distro-Check
8 years ago
Dan Schaper f0a2248c81 Change comment to hash
8 years ago
Sander 11f2524b9b Instead of an or, cat *release
8 years ago
Dan Schaper b011e5f838 Add os-release check
8 years ago
Dan Schaper f45eb84d6b Add distribution Check
8 years ago
Adam Warner 412c0a172d Update README.md
8 years ago
Jacob Salmela c1d8496b93 removed pihole berry from images
8 years ago
Mcat12 4657959790 Merge pull request #559 from dan019/repair-apt
8 years ago
Daniel 2b0ba281a4 Repairs apt-get incorrect options
8 years ago
Mcat12 325a41c598 Merge pull request #558 from dan019/easy-log
8 years ago
Daniel 9b8efe1b27 Upload log to sprunge.us
8 years ago
Dan Schaper 024b741552 Merge pull request #490 from bcambl/fedora-armhf7
8 years ago
Mcat12 4e95f4678f Merge pull request #540 from pi-hole/bugfix/curl-redirect
8 years ago
Mcat12 a86b982591 Merge pull request #537 from pi-hole/piholeIP-Permissions
8 years ago
Mcat12 ec8da00485 Merge pull request #545 from mat1th/feature/new-block-list
8 years ago
Dan Schaper bcfe130d51 Merge pull request #544 from pi-hole/Fix/MahaUA
8 years ago
Matth 0e143f7275 Update adlists.default
8 years ago
Dan Schaper 7670b4e380 Mahakala User Agen modernization
8 years ago
Dan Schaper 636a9123b8 Have `curl` auto-redirect
8 years ago
Dan Schaper caaee40889 Hosts-file.net moved to https
8 years ago
Mcat12 1f130b6550 Fix missing permissions on piholeIP
8 years ago
Jacob Salmela 2ce47f49b1 forgot to remove the old donation stuff
8 years ago
Jacob Salmela 0250e03b86 simplified donation section
8 years ago
Adam Warner ce110aab90 Merge pull request #536 from fhemberger/development
8 years ago
Frederic Hemberger fd92752f52 Fix link for spam404scamlist.txt
8 years ago
Adam Warner 3c4a305976 Update README.md
8 years ago
Adam Warner 791e5bbd55 Merge pull request #531 from pi-hole/malwareList
8 years ago
Adam Warner 46df6e7dd3 Update adlists.default
8 years ago
Jacob Salmela 9ccf9d57a8 updated dashboard pic
8 years ago