Commit Graph

5 Commits

Author SHA1 Message Date
Brice Johnson
fa6f0a42a5 Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into devel
Conflicts:
	api.php
	index.php
2016-01-27 23:03:58 -06:00
Adam Warner
46a7bac6e4 Update api.php
Consume JSON output of chronometer.sh

Relies on [this pull](https://github.com/jacobsalmela/pi-hole/pull/193) being merged.
2016-01-18 23:04:03 +00:00
Brice Johnson
f018e0f6f9 Added lists of top domains/ads. Moved data collection to separate file. 2016-01-15 22:29:18 -06:00
Brice Johnson
293d2e7d21 Added top domains for queries and ads 2016-01-14 23:26:58 -06:00
Brice Johnson
8479530c67 Added basic read-only api 2016-01-09 20:04:24 -06:00