WaLLy3K
1c2aa44d46
Provide notice message for whitelisted sites
2017-05-11 20:10:40 +10:00
WaLLy3K
3b44a0da32
Provide error message if not found in any list
2017-05-11 20:09:00 +10:00
WaLLy3K
173ad339bb
Update CSS location
2017-05-08 19:33:45 +10:00
WaLLy3K
4d731ca30b
Updated landing page location
...
During development, I had the location of `/pihole/index.php` as just `/index.php`. Just correcting some changes!
2017-05-03 15:33:50 +10:00
WaLLy3K
f2016f26d7
Updated splash page CSS href
2017-05-03 15:29:43 +10:00
WaLLy3K
a8818c16d8
Fixed unnecessary usage of !important
2017-05-02 19:51:13 +10:00
WaLLy3K
dfb5c37d98
Delete index.js
2017-05-02 17:21:40 +10:00
WaLLy3K
551add5f44
Update index.php
...
* An "About Pi-hole" link on the block page provides an ELI5 explanation to those not familiar with Pi-hole
* An email contact link on the block page provides users of your Pi-hole with a means to easily get in touch with you
* Browsing to your Pi-hole's address will show a simple "landing page", which can be replaced by adding "landing.php" within "/var/www/html"
* Users manually browsing to file/image based content (i.e: non HTML based content) on blocked sites will be greeted with a small "Blocked by Pi-hole" image
* Sites that are manually blacklisted will display a notice of this on the block page
* Sites that aren't directly blocked, but have a CNAME record, will show a notification on the block page (e.g: If raw.githubusercontent.com is not blocked, but github.map.fastly.net is)
* On the block page, "Back to Safety" now directs the user to "about:home" if Javascript is disabled
* Whitelisting is disabled for installs without a password, or if a client does not have Javascript
* Known issues:
* Admin Console needs a text field under "Web User Interface" where the admin can enter a preferred contact email when a site needs to be whitelisted, to be saved to setupVars.conf with the key "ADMIN_EMAIL"
* Admin Console needs a text field under "Networking" where the admin can enter their Pi-hole's externally contactable FQDN, allowing access to their landing page when browsing to mypi.duckdns.org, to be saved to setupVars.conf with the key "FQDN"
* I am not aware of expected output of `$_SERVER["VIRTUAL_HOST"]`, so I have assumed it should be filtered as if it's a domain
2017-05-02 17:06:31 +10:00
WaLLy3K
88944a31ec
Update blockingpage.css
...
* Block page UI overhaul to replicate the style of the Admin Console
* Block page UI is now mobile friendly
* Users can safely customise text in order to make the block page more friendly for their household
2017-05-02 17:05:24 +10:00
Dan Schaper
bfc4775b34
Merge pull request #1297 from raincoats/development
...
Redirect to admin panel when accessing 'http://pi.hole/ '
2017-04-26 12:35:19 -07:00
DL6ER
f1f70133dc
Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396
2017-04-20 13:53:27 +02:00
DL6ER
320c06e0a4
Flush twice to move data out-of-sight of FTL
2017-04-17 21:25:15 +02: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
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
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
ad9575ce18
Recognize more host names
2017-04-03 16:28:18 +02: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
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
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
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
Mcat12
fb3e6ee35c
Source setupVars before attempting to use it
...
Fixes #1347
2017-03-21 18:01:51 -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
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
Adam Warner
cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
2017-03-15 18:59:41 +00: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
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
