467 Commits

Author	SHA1	Message	Date
DL6ER	fd3022abb3	Fix check for white/blacklist action on Query Log	2016-12-31 18:11:31 +00:00
DL6ER	28bea42f88	Implemented wildcard blocking in Query Log	2016-12-31 17:21:50 +00:00
DL6ER	33714c540c	codacy fixes	2016-12-31 16:44:03 +00:00
DL6ER	c409cf20bf	Hide h3 headings if list is empty	2016-12-31 16:35:16 +00:00
DL6ER	a33301911a	Made everything working	2016-12-31 16:24:10 +00:00
DL6ER	05f2df720e	Put wildcard blocking entries into their own table	2016-12-31 16:06:21 +00:00
DL6ER	754fa117ec	Detect if wildcard blocking entry on Blacklists page	2016-12-31 15:45:12 +00:00
DL6ER	01f31137a3	Merge branch 'devel' into new/clickonmaingraph	2016-12-30 20:37:44 +00:00
DL6ER	d9c695dc4a	Merge branch 'devel' into new/dhcpv6settings	2016-12-30 20:33:21 +00:00
Mcat12	4cffd16aae	Update tail log and query ads	2016-12-30 15:00:06 -05:00
Promofaux	8240e2d23b	merge devel	2016-12-29 19:59:09 +00:00
Mcat12	fab94e07fd	Fix php links in js files ... Also removed help.js because it's no longer used	2016-12-21 21:10:10 +01:00
Mcat12	2f65430a4d	Move PHP scripts to scripts folder	2016-12-21 21:09:58 +01:00
DL6ER	e188cb6fbc	Revert "Merge pull request #267 from pi-hole/folderStructure" ... This reverts commit fba3d10fa4, reversing changes made to 4ee75f4167.	2016-12-21 17:16:52 +01:00
DL6ER	42c9439d1e	Merge branch 'devel' into folderStructure	2016-12-20 23:09:39 +01:00
Mcat12	30d70baf5e	Fix php links in js files ... Also removed help.js because it's no longer used	2016-12-19 19:59:08 -05:00
Mcat12	d1da1de597	Move PHP scripts to scripts folder	2016-12-19 19:44:51 -05:00