Commit Graph

2431 Commits (a928cd3fa137a4d8329a78b1bc996078d773fe97)
 

Author SHA1 Message Date
Mcat12 57e8b7f924 Merge pull request #1355 from pmo3/development
7 years ago
Patrick O'Brien 263eb856d5 remove vagrant from gitignore
7 years ago
DL6ER 5a4f088b24 Merge pull request #1341 from pi-hole/tweak/readme-tm
7 years ago
DL6ER c1913bfa7d Merge pull request #1366 from pi-hole/fix/adaway-list-agent
7 years ago
DL6ER 474881e4c7 Merge pull request #1346 from pi-hole/varChanges
7 years ago
Flo 7e0aa822b6 Match the Pi-hole brand (#1358)
7 years ago
DL6ER 940d780a4c Merge pull request #1361 from pi-hole/new/error404page
7 years ago
DL6ER ad9575ce18
Recognize more host names
7 years ago
Mcat12 ce86205df0 Use correct agent when downloading adaway.org list
7 years ago
Adam Warner 3cf9942465
spacing fixed
7 years ago
Adam Warner 153031482f
Add delete mode to adlist command. Might be abetter way to do this
7 years ago
Adam Warner 1f74b1e2fd
newline
7 years ago
Adam Warner 42393123a0
add newline to adlists.default
7 years ago
Adam Warner af2cff5177
remove call to user list
7 years ago
Adam Warner 5435b93df2
remove spaces
7 years ago
Adam Warner 3a3dde6298
add adlist argument redirector
7 years ago
Adam Warner b4bc90fb85
add in CustomizeAdlists function
7 years ago
Adam Warner 02040cd25d
We no longer need to do this, either
7 years ago
Adam Warner bdc6bd4135
Don't need this comment anymore
7 years ago
Adam Warner e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)
7 years ago
Adam Warner ce97896ffd
account for new `adlists.custom` file
7 years ago
Adam Warner 86fa4e9ee8
trim down default adlist
7 years ago
DL6ER f09c166350
Improve Error 404 page behavior
7 years ago
Patrick O'Brien 24868fdb2b Merge remote-tracking branch 'upstream/development' into development
7 years ago
Patrick O'Brien a463250ecf don't hash an empty password
7 years ago
Mcat12 d38e034e92 Merge pull request #1354 from flokX/patch-4
7 years ago
Flo 6eb9192cd1 Complete site
7 years ago
Patrick O'Brien 94f15f1b3c Merge remote-tracking branch 'upstream/development' into development
7 years ago
Patrick O'Brien ee296f36c1 mask password input on command line
7 years ago
Dan Schaper 598a7b3cc0
Add .editorconfig
7 years ago
Mcat12 52baf26d7d Merge pull request #1348 from pi-hole/fix/update-without-web
7 years ago
Mcat12 fb3e6ee35c Source setupVars before attempting to use it
7 years ago
Dan Schaper af1d1bd9c2
One more change
7 years ago
Dan Schaper f32ad7699d Merge pull request #1320 from georou/development
7 years ago
Dan Schaper 79294bb6ca Merge pull request #1332 from pi-hole/varChanges
7 years ago
Jacob Salmela 1cd4710718
replace logo with TM logo
7 years ago
Jacob Salmela 48c19ade8e
add trademarks to Pi-hole name in signifigant places
7 years ago
Adam Warner 0acf70f836 Merge pull request #1340 from AnthonyGiorgio/development
7 years ago
Anthony Giorgio fd584dd03b Formatting cleanup.
7 years ago
Dan Schaper 2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog
7 years ago
Mcat12 62a242a894 Merge pull request #1334 from pi-hole/tweak/interface_detect
7 years ago
DL6ER 8b060e9699 Merge pull request #1333 from Wandmalfarbe/development
7 years ago
Dan Schaper b1f769b671
Output cleaning, IP stack check headers.
7 years ago
Dan Schaper 77378da70a
Cat out temp files to final log.
7 years ago
Dan Schaper 160030b75f
Quiet systemctl output to just the current daemon status.
7 years ago
Dan Schaper 0a0c3a2fb7
Copy working temp to final location.
7 years ago
Dan Schaper e9f1ca338f
Create temp files for working storage, log to working storage temps.
7 years ago
Dan Schaper 073c7e54df Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint
7 years ago
Dan Schaper 2834f2ccc2
Let `ip` determine which links are candidates.
7 years ago
georou 6c56665403 updated travis for new firewalld add service
7 years ago