418 commits

Author	SHA1	Message	Date
DL6ER	bb28d94884	Merge branch 'development' into customblockpage ... Conflicts: automated install/basic-install.sh	2016-12-22 19:22:09 +01:00
DL6ER	ee8f29d178	Fixed typo, extended help text	2016-12-20 16:28:28 +01:00
DL6ER	da363070c7	Added Kelvin	2016-12-20 12:21:08 +01:00
DL6ER	715838cf89	Allow disabling second DNS server	2016-12-19 13:42:42 +01:00
Mcat12	a0019d86c5	Merge pull request #983 from pi-hole/cronpath ... Fix missing path information for cron	2016-12-15 07:01:20 -05:00
DL6ER	3c4a9bba78	Minor change	2016-12-15 10:38:24 +01:00
Adam Warner	4348653431	Merge pull request #985 from pi-hole/pi.hole ... A man has no name. Even though his name is Jaqen H'ghar	2016-12-15 08:49:22 +00:00
Promofaux	e7713a9028	add missing pihole autocomplete commands	2016-12-14 19:53:40 +00:00
Promofaux	684ac98c8e	Remove hostname and pi.hole entries, move to /etc/pihole/local.list	2016-12-14 19:28:01 +00:00
DL6ER	9a2ffabc33	Fix missing path information	2016-12-14 17:33:20 +01:00
DL6ER	2977168da1	dnsmasq "bogus-priv" property	2016-12-14 16:16:25 +01:00
DL6ER	85e3f37503	dnsmasq "domain-needed" property	2016-12-14 16:09:57 +01:00
DL6ER	ba015c1918	Set domain name via Settings page	2016-12-14 14:24:09 +01:00
DL6ER	1556adb678	Also remove quiet-dhcp setting when disabling/enabling the Pi-Hole DHCP server	2016-12-14 12:12:36 +01:00
Adam Warner	6bfe729112	Merge pull request #979 from pi-hole/wwwdatapassword ... Prevent web UI password change by web user	2016-12-13 16:33:41 +00:00
DL6ER	207422f83a	Added a missing space	2016-12-13 15:54:41 +01:00
DL6ER	004ba28378	Prevent web UI password change by web user	2016-12-13 15:52:28 +01:00
DL6ER	6f38801ed8	Add "Interface appearence" option	2016-12-13 14:59:52 +01:00
DL6ER	b8d2bfc890	Wait 5 seconds before rebooting so the web UI can finish loading before being unreachable due to the reboot	2016-12-13 12:42:40 +01:00
DL6ER	bc91716082	Suppress logging of DHCP actions to /var/log/pihole.log	2016-12-12 17:14:52 +01:00
DL6ER	8dc0dc4d69	Add DHCP-Server backend	2016-12-12 15:34:05 +01:00
DL6ER	2f4b7ce3dd	Update dnsmasq file when changing upstream DNS servers and restart the service to get it active	2016-12-12 14:17:02 +01:00
DL6ER	d4f83cb1d4	Be able to set API_QUERY_LOG_SHOW	2016-12-12 13:15:07 +01:00
DL6ER	aaab3306a8	Add restart DNS capability	2016-12-12 10:38:21 +01:00
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
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	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
DL6ER	78cb43d0dc	Revert "Simplified EscapeRegexp()" ... This reverts commit 509cfd15f2.	2016-12-03 00:32:37 +01: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
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	2ec4acfe52	Begin fixing exit values. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2016-12-01 12:21:08 -08:00
DL6ER	7b26b308ad	No need for echo and pipe here!	2016-11-21 15:50:05 +01:00