20 Commits

Author	SHA1	Message	Date
DL6ER	e24c35a528	Merge branch 'devel' into wildcard_blacklisting	2017-01-11 18:26:10 +01:00
DL6ER	bd36baa18b	Merge branch 'devel' into wildcard_blacklisting	2017-01-09 14:51:54 +01:00
donmahallem	f8dc8f0ccb	Unused variable $tmp ... This variable is in its current form never used	2017-01-08 22:26:11 +01:00
DL6ER	d7afada93c	Fix overTime algorithms	2017-01-06 10:19:41 +01:00
DL6ER	3c3f6ef916	Merge branch 'devel' into wildcard_blacklisting ... Conflicts: scripts/pi-hole/js/queries.js	2017-01-02 16:04:58 +01:00
DL6ER	33d6f6da8f	Exit TopLists loop early, but not too early	2017-01-02 11:29:30 +01:00
DL6ER	3cf00165ba	Merge branch 'devel' into TopItems	2017-01-02 11:25:05 +01:00
DL6ER	2d72ae75b2	Some fixes to some warnings and errors	2017-01-02 11:23:57 +01:00
Adam Warner	57fcb3493e	Merge pull request #304 from pi-hole/new/clickonmaingraph ... Clicking on main graph redirects to the Query Log page	2017-01-01 20:10:34 +00:00
Promofaux	da39612a0b	replace double spaces with single spaces before exploding line to array	2017-01-01 19:57:43 +00:00
DL6ER	01d0f474a3	Minor improvement of couting regexp	2016-12-31 21:11:36 +00:00
DL6ER	2998e0b03a	Improved counting algorithm for blocked queries. Added couting of blocked DNS queries due to wildcard blocking	2016-12-31 21:10:02 +00:00
DL6ER	28bea42f88	Implemented wildcard blocking in Query Log	2016-12-31 17:21:50 +00:00
DL6ER	5cbfe6a5be	Merge branch 'devel' into TopItems	2016-12-30 20:42:33 +00:00
DL6ER	01f31137a3	Merge branch 'devel' into new/clickonmaingraph	2016-12-30 20:37:44 +00:00
Promofaux	8240e2d23b	merge devel	2016-12-29 19:59:09 +00:00
DL6ER	e5a9826078	Moved more private files out of the root directory	2016-12-21 21:10:21 +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
DL6ER	bb2c2e2244	Moved more private files out of the root directory	2016-12-20 12:52:19 +01:00