Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 18:53:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
2134 commits 8 branches 109 tags 27 MiB
Commit graph

2134 commits

This branch
This branch
All branches
Author SHA1 Message Date
DL6ER
2bafa2f2ac Add reboot option 2016-12-11 22:33:27 +01:00
DL6ER
9ac378ae09 Set domains and clients which are excluded by the API 2016-12-11 19:30:04 +01:00
DL6ER
bf867bd9fd Set DNS servers from web UI 2016-12-11 16:54:27 +01:00
Adam Warner
7fd9ff43af Merge pull request #970 from trinapicot/fix/remove_lighty_conf 
Update uninstall.sh for check on lighttpd installation
 2016-12-09 23:40:50 +00:00
Adam Warner
bebb569c43 Merge pull request #964 from pi-hole/queryadsonlyexactmatches 
pihole -q: Add option to show all partial or only exact matches
 2016-12-09 23:25:15 +00:00
Mcat12
74e33bb1a0 Merge pull request #973 from pi-hole/taillog 
Add tail argument to automatically "tail -f" pihole.log
 2016-12-08 16:40:17 -05:00
Mcat12
b591df55b0 Tell user how to exit tail command 2016-12-08 16:35:50 -05:00
Mcat12
bddf31443c Merge pull request #974 from pi-hole/Mcat12-add-reconfigure-help 
Add Reconfigure command to Pi-hole's list of commands
 2016-12-08 15:55:36 -05:00
Mcat12
b9e0e88fe9 Update pihole 2016-12-08 15:47:30 -05:00
DL6ER
5120d9ec33 Add tail option 2016-12-08 21:15:03 +01:00
trinapicot
0a423ffd40 Fix check for lighttpd install before configuration directory removal 2016-12-07 20:31:34 -07:00
DL6ER
505c9e8979 Minor change 2016-12-06 14:08:45 +01:00
DL6ER
75deb02961 Don't query pihole if page is hidden anyhow 2016-12-06 14:05:48 +01:00
DL6ER
480211033d Detect if blocking page is loaded within frame or iframe. If so, hide everything 2016-12-06 14:05:02 +01:00
DL6ER
c0886cb5c6 pihole -q <domain> is partial matching (as before), pihole -q <domain> -exact is exact matching (new behavior) 2016-12-06 13:18:01 +01:00
DL6ER
294df8690c Do only one grep on each of the lists and count the number of non-empty lines in the result. Improves speed by factor of 2x 2016-12-06 09:55:17 +01:00
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