Commit graph

1918 commits

Author SHA1 Message Date
DL6ER
5374f652dd No need to modify lighttpd config file, since we overwrite it anyways 2016-12-06 08:43:24 +01:00
DL6ER
fb72ac9904 Show only exact matches for pihole -q 2016-12-06 08:18:49 +01:00
Mcat12
b6639d9e7e Merge pull request #962 from pi-hole/queryblacklist
Also query blacklist with pihole -q
2016-12-05 18:11:26 -05:00
DL6ER
74cb79252c Only looking for blocking entries (do not scan whitelist.txt) 2016-12-05 17:12:28 +01:00
DL6ER
6cd3c93472 Also query white- and blacklist 2016-12-05 17:09:49 +01:00
DL6ER
eb63e75379 No need for pipe here 2016-12-05 17:06:20 +01:00
DL6ER
ca9321624c Added padding for ad list results 2016-12-05 14:40:48 +01:00
DL6ER
40f18df90f Simplified CSS, removed external contents 2016-12-05 14:39:07 +01:00
DL6ER
0d63cfd6c3 Add 1x1 pixel GIF image. Can apparently be used to trick some of the please-don't-use-adblocker pages as many of them contain code like if ($('Ad').height() == 0) { prevent access to this page; } 2016-12-05 12:34:30 +01:00
DL6ER
3d6b22de6c Update index.php to include more detailed output 2016-12-05 12:12:01 +01:00
DL6ER
fc233fcdd3 Fixed typo 2016-12-05 12:10:05 +01:00
DL6ER
20370d4348 Update CSS file 2016-12-05 11:26:21 +01:00
DL6ER
0f90671241 Updated index.php to use CSS file unter admin/ 2016-12-05 10:51:41 +01:00
DL6ER
a866c4e388 Place blockingpage.css (former index.css) unter admin/ so we can load it also from some blocked sub-directories 2016-12-05 10:50:19 +01:00
DL6ER
e7241a989c Include CSS file 2016-12-04 22:20:51 +01:00
DL6ER
6e788668f9 Updated index.php 2016-12-04 22:17:33 +01:00
DL6ER
b246dba7e7 Rename index.html to index.php 2016-12-04 21:41:26 +01:00
Mcat12
f98de3d5db Merge pull request #941 from DL6ER/caseinsensitive
Improvements for black-/whitelist scripts
2016-12-04 14:33:10 -05:00
Mcat12
fab7d60373 Merge pull request #960 from unseen1980/patch-1
Ad blocker with armbian and orange pi
2016-12-04 14:20:48 -05:00
Christos Koutsiaris
b4e5358145 Ad blocker with armbian and orange pi 2016-12-04 18:40:01 +00:00
Adam Warner
486db1e797 Merge pull request #956 from trinapicot/development
Add check for lighty.conf before trying to move it
2016-12-03 17:11:16 +00:00
DL6ER
78cb43d0dc Revert "Simplified EscapeRegexp()"
This reverts commit 509cfd15f2.
2016-12-03 00:32:37 +01:00
trinapicot
870454330d Add check for lighty.conf before trying to move it 2016-12-02 13:54:11 -07:00
DL6ER
509cfd15f2 Simplified EscapeRegexp() 2016-12-02 14:17:34 +01:00
DL6ER
2061daa902 Don't forget to escape also the slash "/" 2016-12-02 14:11:17 +01:00
DL6ER
629ca970a1 Changed from single quoted filter expression to double quotes as reqeusted by codacy 2016-12-02 14:08:54 +01:00
DL6ER
c8ad6f23a8 Properly escape any special characters before using them in regexp manner 2016-12-02 12:57:04 +01:00
Mcat12
d8912fd0a7 Merge pull request #952 from pi-hole/fix/exit_codes
Fix/exit codes
2016-12-01 18:24:30 -05:00
Dan Schaper
925c80edd4
Catch more 1's
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 15:10:06 -08:00
Dan Schaper
2f6afd375b Merge pull request #942 from pi-hole/PromoFaux-patch-2
Update gravity.sh
2016-12-01 14:00:38 -08:00
Dan Schaper
d92646324c
Double worded
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 13:59:58 -08:00
Dan Schaper
c9fe62a691
Clarify what the command is doing.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 13:58:40 -08:00
Dan Schaper
cb52ad3ba3
Revert other branch chages.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 13:31:35 -08:00
Dan Schaper
2ec4acfe52
Begin fixing exit values.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-01 12:21:08 -08:00
Mcat12
1c64f1d0cf Merge pull request #940 from pi-hole/PromoFaux-patch-1
Update .pullapprove.yml
2016-11-22 17:20:57 -05:00
Mcat12
48f4f44289 Merge pull request #944 from pi-hole/feature/Issue_template
Update ISSUE_TEMPLATE.md
2016-11-22 16:23:36 -05:00
Dan Schaper
80c19cbf7d Update ISSUE_TEMPLATE.md 2016-11-22 12:05:19 -08:00
Adam Warner
c97cfde9f9 Update gravity.sh
Only include domain part of lines that contain `/` e.g `www.fakenewswatch.com/megynkelly`
2016-11-21 22:51:59 +00:00
DL6ER
7b26b308ad No need for echo and pipe here! 2016-11-21 15:50:05 +01:00
DL6ER
4c10634d85 Convert domain names to lower case before checking validity of the domain 2016-11-21 15:49:11 +01:00
Mcat12
3ba7d7640f Merge pull request #933 from DL6ER/delayedreactivation
Add possiblity for delayed reactivation of blocking
2016-11-21 08:26:26 -05:00
Adam Warner
907995a221 Update .pullapprove.yml
reflect new approvers team
2016-11-21 13:13:39 +00:00
DL6ER
7bf0985a57 Extended help text of main pihole command 2016-11-21 11:30:34 +01:00
Dan Schaper
3ca21d8c8a Merge pull request #931 from pi-hole/update_tests
Add piholeDebug to CI Travis tests
2016-11-20 15:51:14 -08:00
Dan Schaper
a3a87c8883 Merge pull request #937 from pi-hole/feature/README
README updates
2016-11-20 15:23:49 -08:00
Adam Warner
de4401823e Merge pull request #924 from DL6ER/webpage.sh
Add webpage.sh
2016-11-20 21:43:44 +00:00
Adam Warner
3ee10f5983 Merge pull request #938 from DL6ER/another_done
Another done
2016-11-20 19:21:58 +00:00
Dan Schaper
0fc8ac8d4d Codacy Badge for Master 2016-11-20 09:44:39 -08:00
Dan Schaper
41bb53a29f Remove CC Badge, Link Vortex to Discourse 2016-11-20 09:42:45 -08:00
DL6ER
cdee6d55d3 Minor change 2016-11-20 17:40:22 +01:00