Mcat12
9ee96d6176
Merge pull request #500 from yoosi/remove-toilet
...
Replace toilet with echo in chronometer.sh
2016-05-11 16:53:38 -04:00
Carter Maxwell
c0e1772e21
Replace toilet with echo
2016-05-07 11:44:18 -07:00
Mcat12
62dc160c65
Merge pull request #491 from pi-hole/dont-frame-me
...
Make sure web interface can't be loaded into a frame
2016-05-06 14:30:13 -04:00
Mcat12
f03303e5aa
Add X-Pi-hole header
2016-05-03 11:58:13 -04:00
Mcat12
7bc2844b9d
Remove X-Pi-hole header
...
Also adds `X-Frame-Options: DENY` for the admin directory, so that
an ad can't load it into a frame
2016-05-02 18:51:02 -04:00
Mcat12
ba283755be
Merge pull request #472 from jim-liu/development
...
Save custom IP
2016-05-02 09:32:35 -04:00
Jim Liu
00cc480bc1
Update basic-install.sh
2016-04-26 16:10:51 +08:00
Jacob Salmela
d7de5b2afa
link to pihole menubar
2016-04-23 15:56:14 -05:00
Jim Liu
221b72439b
Update basic-install.sh
2016-04-22 01:46:27 +08:00
Jim Liu
08e6f60941
Update blacklist.sh
2016-04-22 01:42:43 +08:00
Jim Liu
10066209e7
Update whitelist.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:41:11 +08:00
Jim Liu
08e95ed606
Update gravity.sh
...
Change piholeIPfile to a permanent location.
2016-04-22 01:40:42 +08:00
Jim Liu
a5ad48aa18
Update gravity.sh
2016-04-21 23:40:44 +08:00
Jim Liu
81fdfcba22
Update whitelist.sh
2016-04-21 23:40:38 +08:00
Mcat12
aec6fcd00b
Merge branch 'BugFix463' into development
2016-04-20 15:55:26 -04:00
Mcat12
619082dbed
Merge branch 'development' into BugFix463
...
Conflicts:
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
2016-04-20 15:54:58 -04:00
Adam Warner
b702c1d9a8
Merge pull request #468 from mayurkr/mayur-bugfix
...
fixed non execution of the function helpFunc
2016-04-17 17:32:56 +01:00
Mayur Raiturkar
56ac04c48e
fixed helpFunc 2
2016-04-17 18:22:06 +05:30
Mayur Raiturkar
b58519b974
fixed helpFunc 1
2016-04-17 18:21:32 +05:30
Promofaux
ad574f5e90
Replace kill with killall
2016-04-16 15:52:38 +01:00
Promofaux
4941a657bf
remove -s switch, as it turns out it worked afterall.
2016-04-16 12:59:40 +01:00
Promofaux
3d4bff9414
Add -s switch to kill command to increase compatability
2016-04-16 10:56:49 +01:00
Adam Warner
2d03616c10
Merge pull request #460 from pi-hole/LighttpdDebugLogging
...
Added lighttpd error.log to debug output
2016-04-15 21:56:58 +01:00
Adam Warner
fcb9ba08a8
Merge pull request #452 from notracking/patch-2
...
Added hosts-blocklists lists
2016-04-15 21:56:23 +01:00
Adam Warner
77f4126f9b
add root check to whitelist script
2016-04-13 15:51:48 +01:00
Adam Warner
4c890ab202
Add root check to blacklist script
2016-04-13 15:50:48 +01:00
Adam Warner
d10e9b1b6e
add pihole/webui version numbers
2016-04-12 08:47:30 +01:00
Adam Warner
a6bee76581
add location of debug log output file!
2016-04-12 08:24:34 +01:00
nate
2f4f5a6ad2
Added lighttpd error.log to debug output
2016-04-11 18:35:44 -05:00
Adam Warner
76899c9ac5
Merge pull request #459 from pi-hole/BugFix409
...
remove all mentions of spinner
2016-04-11 12:41:42 +01:00
Adam Warner
99a5b3a98a
remove all mentions of spinner
2016-04-11 11:29:14 +01:00
Adam Warner
219aff9a93
Merge pull request #457 from pi-hole/BigFix453
...
Fix whitespace
2016-04-10 21:44:26 +01:00
Promofaux
b6e1b3bff0
Last one, promise! tabs are behaving strangely here...
2016-04-10 21:43:12 +01:00
Promofaux
1ce888e828
more whitespace fixes......
2016-04-10 21:41:46 +01:00
Promofaux
1c10a801dc
Fix whitespace...
2016-04-10 21:39:44 +01:00
Promofaux
48fa83c9ac
Fix whitespace
2016-04-10 21:36:33 +01:00
Adam Warner
31ea3a2757
Merge pull request #456 from pi-hole/BigFix453
...
Fixes issue #453
2016-04-10 21:20:46 +01:00
Promofaux
05e0003555
Fixes issue #453
2016-04-10 21:17:58 +01:00
notracking
be79281418
Added hosts-blocklists lists
...
The hosts-blocklist is a semi-automatically updated list, based on various well known public sources, for more details read: https://github.com/notracking/hosts-blocklists/
Please be aware that one file is for domain blocking and the other file for hostname based blocking, these lists are complimentary and should therefore be used simultaneously.
2016-04-10 16:12:40 +08:00
Adam Warner
01f53f6d6c
Merge pull request #450 from pi-hole/SmallFixesToWhitelistBlacklist
...
Small fixes to whitelist blacklist
2016-04-08 23:03:30 +01:00
Promofaux
107e0404de
Move exit 1 outside of if block on verbose check to stop dnsmasq reloading
2016-04-08 23:01:13 +01:00
Promofaux
ab99e80333
indent
2016-04-08 23:00:46 +01:00
Promofaux
3154a378a6
Remove clear in DisplayWlist and force verbose to false to tidy up output.
2016-04-08 20:12:30 +01:00
Promofaux
8e04f1c03e
Remove clear in DisplayBlist and forse verbose to false to tidy up output.
2016-04-08 20:11:39 +01:00
Promofaux
c0aadeab3d
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:27 +01:00
Promofaux
6c87698f1a
fix spelling in name of variable ($versbose -> $verbose)
2016-04-08 20:10:10 +01:00
Adam Warner
db2e9f8bf3
Merge pull request #447 from 7h3ju57/issue#442
...
Add list option to blacklist and whitelist
2016-04-08 20:07:24 +01:00
Justin Theberge
9a4c5cef86
fix indentations
2016-04-08 10:14:17 -04:00
Justin Theberge
bdfc86f850
fix formatting
2016-04-07 21:58:57 -04:00
Justin Theberge
70dadfba28
add list options requested from issue#442
2016-04-07 21:52:47 -04:00
