Commit Graph

2504 Commits (288f93c5dd3c3646991e454c461927ac057d8eba)
 

Author SHA1 Message Date
Dan Schaper 6a2b885988
Update default User Agent to modern browser.
7 years ago
Dan Schaper bfc4775b34 Merge pull request #1297 from raincoats/development
7 years ago
Adam Warner 981004606b
Merge branch 'master' into development
7 years ago
Adam Warner 9d40fd1eda
Merge branch 'development' Resolved conflicts
7 years ago
DL6ER db1e5f10ea
Make changes according to comment in #1384
7 years ago
DL6ER fbb6b56d99 Merge pull request #1397 from pi-hole/fix/ipv4ipv6error
7 years ago
DL6ER f1f70133dc
Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396
7 years ago
DL6ER d0f55e5125 Merge pull request #1394 from pi-hole/fix/remove-temp-gravity-files
7 years ago
Mcat12 5e308dbd51 Delete the temp files created by gravity
7 years ago
Mcat12 c3c554f4d6 Merge pull request #1391 from pi-hole/tweak/flush
7 years ago
DL6ER 320c06e0a4
Flush twice to move data out-of-sight of FTL
7 years ago
Adam Warner 2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
7 years ago
DL6ER b1484104bd Merge pull request #1379 from pi-hole/tweak/FTLinit.d
7 years ago
Mcat12 c738a9a044 Merge pull request #1381 from technicalpyro/development
7 years ago
Technicalpyro 519cb71022 Grammar Fix
7 years ago
DL6ER fcd92d27f7
Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running
7 years ago
DL6ER 3eacfa9831
Improve FTL's service script
7 years ago
Mcat12 1d64b614c7 Merge pull request #1349 from pi-hole/internal/editorconfig
7 years ago
Dan Schaper a832dd7f67 Update .editorconfig
7 years ago
Mcat12 a96b4d28e1 Merge pull request #1365 from pi-hole/adlistImprovements
7 years ago
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