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 |
|
Jacob Salmela
|
48c19ade8e
|
add trademarks to Pi-hole name in signifigant places
|
2017-03-19 15:36:22 -05:00 |
|
Adam Warner
|
0acf70f836
|
Merge pull request #1340 from AnthonyGiorgio/development
Formatting cleanup.
|
2017-03-19 18:40:50 +00:00 |
|
Anthony Giorgio
|
fd584dd03b
|
Formatting cleanup.
Convert backticks to quotes to fix error message.
Make Pi-hole capitalization consistent.
Make Pi-hole capitalization consistent.
|
2017-03-18 20:47:13 -04:00 |
|
Dan Schaper
|
2740c68a63
|
Merge pull request #1335 from pi-hole/tweak/debug_templog
Debugging tweaks for temporary logfiles
|
2017-03-16 23:35:15 -07:00 |
|
Mcat12
|
62a242a894
|
Merge pull request #1334 from pi-hole/tweak/interface_detect
Let `ip` determine which links are candidates.
|
2017-03-16 21:36:13 -04:00 |
|
DL6ER
|
8b060e9699
|
Merge pull request #1333 from Wandmalfarbe/development
Fixed minor spelling mistakes in README.md
|
2017-03-16 18:02:40 +01:00 |
|
Dan Schaper
|
b1f769b671
|
Output cleaning, IP stack check headers.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:50:29 -07:00 |
|
Dan Schaper
|
77378da70a
|
Cat out temp files to final log.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:43:41 -07:00 |
|
Dan Schaper
|
160030b75f
|
Quiet systemctl output to just the current daemon status.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:27:18 -07:00 |
|
Dan Schaper
|
0a0c3a2fb7
|
Copy working temp to final location.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 23:20:12 -07:00 |
|
Dan Schaper
|
e9f1ca338f
|
Create temp files for working storage, log to working storage temps.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 22:49:47 -07:00 |
|