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 |
|
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 |
|
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
|
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 |
|
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 |
|
Dan Schaper
|
073c7e54df
|
Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint
add check on file_parse to not include WEBPASSWORD= in the debug log
|
2017-03-15 22:08:48 -07:00 |
|
Dan Schaper
|
2834f2ccc2
|
Let ip determine which links are candidates.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-15 22:05:48 -07:00 |
|
georou
|
6c56665403
|
updated travis for new firewalld add service
|
2017-03-16 10:26:51 +11:00 |
|
georou
|
0d794226ab
|
Removed unsupported POSIX brace expansion
|
2017-03-16 09:29:33 +11:00 |
|
Wandmalfarbe
|
ab2af11775
|
Fixed minor spelling mistakes in README.md
|
2017-03-15 20:58:41 +01:00 |
|
Adam Warner
|
83662c9e50
|
additional requested changes
|
2017-03-15 19:50:22 +00:00 |
|
Adam Warner
|
6c1d52199f
|
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master
|
2017-03-15 19:47:31 +00:00 |
|
Adam Warner
|
cfaf1ac67c
|
add check on file_parse to not include WEBPASSWORD= in the debug log
|
2017-03-15 18:59:41 +00:00 |
|
Mcat12
|
a6caa0e680
|
Merge pull request #1327 from pi-hole/fix/pihole-help-text
Fix help text bug
|
2017-03-14 15:00:25 -04:00 |
|
Mcat12
|
c4b43f92ce
|
Fix help text bug
Fixes #1325
|
2017-03-14 13:19:43 -04:00 |
|
John Taylor
|
76bd53ef1f
|
replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
|
2017-03-13 20:24:04 -04:00 |
|
Mcat12
|
88835512dd
|
Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
Only remove from wildcard list if domain is being added to whitelist …
|
2017-03-13 17:50:18 -04:00 |
|
Adam Warner
|
6b862dd9e9
|
Only remove from wildcard list if domain is being added to whitelist or blacklist
|
2017-03-13 20:38:34 +00:00 |
|
DL6ER
|
be0b76c954
|
Merge pull request #1319 from pi-hole/fix/gravitypath
Use absolute path for pihole command in gravity.sh
|
2017-03-13 21:16:31 +01:00 |
|
georou
|
e45559da20
|
Use Firewalld services instead of ports
|
2017-03-14 01:13:23 +11:00 |
|
DL6ER
|
d7b5870ba6
|
Use absolute path for pihole command in gravity.sh. Fixes #1318
|
2017-03-12 23:15:23 +01:00 |
|
Dan Schaper
|
2e74219ff9
|
Merge pull request #1313 from pi-hole/new/piholecheckout
Checkout adjustments
|
2017-03-11 13:01:11 -08:00 |
|
Dan Schaper
|
b0ae954f1e
|
Only update when update flag is set to "true"
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-11 12:37:36 -08:00 |
|
Dan Schaper
|
a2404f104a
|
Just some style and linting. And a cd in fetch_checkout_pull_branch
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-11 12:21:15 -08:00 |
|
DL6ER
|
38547ced7a
|
Can only diff once upstream branch is tracked
|
2017-03-11 16:55:37 +01:00 |
|
DL6ER
|
9a9d9007cd
|
Add missing "== true"
|
2017-03-11 16:49:47 +01:00 |
|
DL6ER
|
bd2d81f691
|
source setupVars.conf to see if INSTALL_WEB is true or not
|
2017-03-11 16:46:52 +01:00 |
|
DL6ER
|
1b9e7fbf2e
|
Test if branch is locally available is not reliable because of possible ambiguities
|
2017-03-11 16:40:10 +01:00 |
|
DL6ER
|
d4a49d192f
|
Correct variable name
|
2017-03-11 16:38:28 +01:00 |
|
DL6ER
|
8cb66544d2
|
Remove "\ "
|
2017-03-11 16:36:54 +01:00 |
|
DL6ER
|
140ac192aa
|
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
|
2017-03-11 16:30:58 +01:00 |
|
DL6ER
|
b961b13d60
|
Small bugfix
|
2017-03-11 16:27:00 +01:00 |
|
DL6ER
|
febdb4a190
|
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
|
2017-03-11 16:24:13 +01:00 |
|
DL6ER
|
1d60b62e7a
|
Testing alternative way of fetching/checking out of a single branch
|
2017-03-11 16:11:23 +01:00 |
|
Dan Schaper
|
41e1e4cb68
|
Rearrange pull logic, some optimization.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-10 11:25:35 -08:00 |
|
Dan Schaper
|
d5b88e0df8
|
Get the right name for the options.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-03-10 11:07:58 -08:00 |
|