DL6ER
d0f55e5125
Merge pull request #1394 from pi-hole/fix/remove-temp-gravity-files
...
Delete the temp files created by gravity
2017-04-19 08:46:01 +02:00
Mcat12
5e308dbd51
Delete the temp files created by gravity
2017-04-18 20:35:06 -04:00
Mcat12
c3c554f4d6
Merge pull request #1391 from pi-hole/tweak/flush
...
Flush twice to move data out-of-sight of FTL
2017-04-17 20:10:03 -04:00
DL6ER
320c06e0a4
Flush twice to move data out-of-sight of FTL
2017-04-17 21:25:15 +02:00
Adam Warner
2e398c5da4
stash changes on branch switch, else it fails if any changes have been made.
2017-04-14 17:20:13 +01:00
DL6ER
b1484104bd
Merge pull request #1379 from pi-hole/tweak/FTLinit.d
...
Tweaks for `FTL`'s init file
2017-04-13 12:53:37 +02:00
Mcat12
c738a9a044
Merge pull request #1381 from technicalpyro/development
...
Grammar Fix
2017-04-12 21:29:39 -04:00
Technicalpyro
519cb71022
Grammar Fix
...
]
2017-04-12 16:05:21 -04:00
DL6ER
fcd92d27f7
Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running
2017-04-12 15:12:09 +02:00
DL6ER
3eacfa9831
Improve FTL's service script
2017-04-12 14:13:18 +02:00
gedetil
ff6df76e36
Update webpage.sh
...
Implement "Halt system" button, next to "Restart system" button, on
admin/settings page. Useful for doing clean shutdown before powering off.
(This affects 4 files, 3 for the web content, 1 for backend script.)
Gilbert Detillieux <gedetil> 2017-04-11
2017-04-11 12:04:44 -05:00
Mcat12
1d64b614c7
Merge pull request #1349 from pi-hole/internal/editorconfig
...
Add .editorconfig
2017-04-06 18:05:56 -04:00
Dan Schaper
a832dd7f67
Update .editorconfig
...
Set path for JS source.
2017-04-06 14:55:21 -07:00
Mcat12
a96b4d28e1
Merge pull request #1365 from pi-hole/adlistImprovements
...
Adlist improvements
2017-04-06 16:15:50 -04:00
Mcat12
57e8b7f924
Merge pull request #1355 from pmo3/development
...
Mask password input when changing password
2017-04-03 20:23:19 -04:00
Patrick O'Brien
263eb856d5
remove vagrant from gitignore
2017-04-03 15:15:44 -04:00
DL6ER
5a4f088b24
Merge pull request #1341 from pi-hole/tweak/readme-tm
...
Update logo and Pi-hole™ name with a trademark symbol.
2017-04-03 17:35:58 +02:00
DL6ER
c1913bfa7d
Merge pull request #1366 from pi-hole/fix/adaway-list-agent
...
Use correct agent when downloading adaway.org list
2017-04-03 17:32:44 +02:00
DL6ER
474881e4c7
Merge pull request #1346 from pi-hole/varChanges
...
Clean up previous PR
2017-04-03 17:32:02 +02:00
Flo
7e0aa822b6
Match the Pi-hole brand ( #1358 )
...
* Update README.md
* Update index.php
* Update basic-install.sh
* Update piholeCheckout.sh
* Update update.sh
* Update CONTRIBUTING.md
* Update the Pi-hole brand tip in CONTRIBUTING.md
Use a better formulation.
* Update README.md 2
2017-04-03 17:29:57 +02:00
DL6ER
940d780a4c
Merge pull request #1361 from pi-hole/new/error404page
...
Improve Error 404 page behavior
2017-04-03 17:25:46 +02:00
DL6ER
ad9575ce18
Recognize more host names
2017-04-03 16:28:18 +02:00
Mcat12
ce86205df0
Use correct agent when downloading adaway.org list
...
See https://discourse.pi-hole.net/t/2278
2017-04-02 12:44:00 -04:00
Adam Warner
3cf9942465
spacing fixed
2017-03-31 23:00:56 +01:00
Adam Warner
153031482f
Add delete mode to adlist command. Might be abetter way to do this
2017-03-31 22:51:10 +01:00
Adam Warner
1f74b1e2fd
newline
2017-03-31 21:12:17 +01:00
Adam Warner
42393123a0
add newline to adlists.default
2017-03-31 20:15:13 +01:00
Adam Warner
af2cff5177
remove call to user list
2017-03-31 20:13:04 +01:00
Adam Warner
5435b93df2
remove spaces
2017-03-31 20:05:45 +01:00
Adam Warner
3a3dde6298
add adlist argument redirector
2017-03-31 20:03:56 +01:00
Adam Warner
b4bc90fb85
add in CustomizeAdlists function
2017-03-31 19:35:52 +01:00
Adam Warner
02040cd25d
We no longer need to do this, either
2017-03-31 19:23:26 +01:00
Adam Warner
bdc6bd4135
Don't need this comment anymore
2017-03-31 19:18:28 +01:00
Adam Warner
e720de401d
One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list)
2017-03-31 19:16:09 +01:00
Adam Warner
ce97896ffd
account for new adlists.custom file
2017-03-31 19:00:04 +01:00
Adam Warner
86fa4e9ee8
trim down default adlist
2017-03-31 18:55:07 +01:00
DL6ER
f09c166350
Improve Error 404 page behavior
2017-03-28 14:02:00 +02:00
Patrick O'Brien
24868fdb2b
Merge remote-tracking branch 'upstream/development' into development
2017-03-27 13:38:19 -04:00
Patrick O'Brien
a463250ecf
don't hash an empty password
2017-03-27 13:37:19 -04:00
Mcat12
d38e034e92
Merge pull request #1354 from flokX/patch-4
...
Complete blocking page
2017-03-26 13:12:42 -04:00
Flo
6eb9192cd1
Complete site
...
The start <html>-tag was missing.
2017-03-25 16:11:37 +01:00
Patrick O'Brien
94f15f1b3c
Merge remote-tracking branch 'upstream/development' into development
2017-03-23 18:47:50 -04:00
Patrick O'Brien
ee296f36c1
mask password input on command line
2017-03-23 18:47:30 -04:00
Dan Schaper
598a7b3cc0
Add .editorconfig
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-22 13:44:04 -07:00
Mcat12
52baf26d7d
Merge pull request #1348 from pi-hole/fix/update-without-web
...
Source setupVars in the updater before attempting to use it
2017-03-21 18:18:03 -04:00
Mcat12
fb3e6ee35c
Source setupVars before attempting to use it
...
Fixes #1347
2017-03-21 18:01:51 -04:00
Dan Schaper
af1d1bd9c2
One more change
...
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2017-03-21 05:04:58 -07:00
Dan Schaper
f32ad7699d
Merge pull request #1320 from georou/development
...
Use Firewalld --add-service instead of port
2017-03-21 04:49:59 -07:00
Dan Schaper
79294bb6ca
Merge pull request #1332 from pi-hole/varChanges
...
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
2017-03-21 04:49:10 -07:00
Jacob Salmela
1cd4710718
replace logo with TM logo
2017-03-19 15:41:16 -05:00
