Commit Graph

657 Commits

Author SHA1 Message Date
Mcat12 18a44efd95 Disable Whitelist/Blacklist feature for release
See #39 for why this is needed
2016-02-21 15:02:48 -05:00
Mcat12 4829dde9bc Merge pull request #41 from pi-hole/Internet-Free
Load from local files
2016-02-21 14:57:04 -05:00
Mcat12 827db695ac Added fonts and other files to be loaded from local storage 2016-02-21 14:52:51 -05:00
Mcat12 82e7108afe Loads from local files 2016-02-20 18:13:21 -05:00
Mcat12 eb415cf03f Merge pull request #38 from pi-hole/Mobile-Animation
Do not animate on mobile
2016-02-17 22:42:25 -05:00
Mcat12 b72e78a933 Do not animate on mobile
Animations are slow on mobile devices.
2016-02-17 22:33:32 -05:00
Mcat12 681e2cbb45 Merge pull request #36 from pi-hole/Dropdown-Changes
Updated dropdown with more intuitive buttons and links
2016-02-17 20:27:37 -05:00
Mcat12 711caa1f81 Updated Dropdown with more intuitive buttons and links 2016-02-17 16:15:32 -05:00
Mcat12 82010e1ba4 Merge pull request #35 from slamanna212/devel
Add Meta Tags and Images
2016-02-17 06:25:37 -05:00
slamanna212 6c225f3374 Fix Pi-Hole Icon Escaping 2016-02-16 15:45:55 -05:00
slamanna212 60a4b8692d Icon Cleanup
Remove a couple more extra image files that are no longer needed and
added an a link to the small favicon for older browsers. Also removed
Mainfest.json as it does not apply to this project
2016-02-16 15:41:33 -05:00
slamanna212 8eda463998 Remove Un Needed Icons
Removed Un Needed Icons
2016-02-16 14:17:57 -05:00
slamanna212 45f1a743cf Add Meta Tags for icons
Add Meta tags for icons for mobile and desktop and theme color for
mobile browsers
2016-02-16 11:04:23 -05:00
slamanna212 e12fefbb7c Add Images For Meta Tags 2016-02-16 10:56:50 -05:00
Mcat12 7e097a4978 Merge pull request #33 from pi-hole/Kill-Coinbase
Remove coinbase
2016-02-16 07:08:36 -05:00
Mcat12 37bc21a0ab Remove coinbase 2016-02-15 21:54:22 -05:00
Mcat12 8a01b42c9b Merge pull request #25 from bricej13/advancedstats
Advanced stats
2016-02-13 18:11:12 -05:00
Brice Johnson dd2b72627f Removed whitelist/blacklist links. Fixed merge error 2016-02-13 12:22:43 -06:00
Brice Johnson 43be39ffd5 Merge branch 'devel' of https://github.com/pi-hole/AdminLTE into advancedstats
Conflicts:
	footer.php
2016-02-13 12:17:45 -06:00
Brice Johnson 0d1e4a33c2 Removed recent queries from main page 2016-02-13 12:13:48 -06:00
Brice Johnson b80c373cfa Added page to view daily query log history 2016-02-13 00:01:50 -06:00
Brice Johnson e73ba8b28c Added fix for time gaps in log for the 'over time' graph 2016-02-12 22:54:09 -06:00
Brice Johnson 01276cbe4d Removed legends from charts 2016-02-11 23:52:30 -06:00
Brice Johnson 4fa6b3dc6b Added radar graph for top clients 2016-02-11 23:41:31 -06:00
Brice Johnson e5b73c31cf Added some legends 2016-02-10 23:55:06 -06:00
Brice Johnson 0544cfb398 Added forwarding destination chart 2016-02-10 23:40:20 -06:00
Brice Johnson 5d68c72477 Added query types graph 2016-02-10 23:18:11 -06:00
Brice Johnson f72d28d45e Changed array indexing to be more robust 2016-02-09 18:50:47 -06:00
Brice Johnson 83cc057e7a Added placeholder for summary stats while ajax is loading. Added loading
indicators to all other boxes.
2016-02-06 22:45:39 -06:00
Mcat12 3627421a66 Moved contributor info 2016-02-05 17:34:53 +00:00
Brice Johnson 51796f351c Enabled auto-update for summary statistics. Top row statistics update
every 20 seconds.
2016-02-04 23:37:08 -06:00
Brice Johnson 21741094f1 Moved data retrieval to Ajax call. Fixed ipv6 number. Fixed top
domains/advertisers tables.
2016-02-02 22:27:42 -06:00
Brice Johnson 98f0bb0d94 Fixed merge conflict in api.php. Moved js code to index.php from
footer.html
2016-01-30 19:06:15 -06:00
Mcat12 ad70393d35 Merge pull request #28 from pi-hole/newVersioning
Dynamic versions in footer - New Versioning System
2016-01-30 12:57:59 -05:00
Mcat12 e19b584e29 Dynamic versions in footer
- Shows Pi-hole and Web Interface versions
2016-01-30 11:26:18 -05:00
Mcat12 63e5405a62 Merge pull request #26 from pi-hole/listButtonEffect
Added highlight effect when removing an item from a list
2016-01-28 20:27:19 -05:00
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
Mcat12 d6fd5fb109 Added highlight effect when removing an item from a list
- Uses jQuery UI
2016-01-27 19:46:10 -05:00
Brice Johnson c6c227de43 Added most recent queries 2016-01-25 21:20:53 -06:00
Brice Johnson 740f69f7a7 Removed advertising domains from top domains list 2016-01-25 20:56:39 -06:00
Brice Johnson 6cafb226d5 Fixed bugs in over-time graph 2016-01-25 20:41:46 -06:00
Promofaux 4b0e1d9ca2 Resolving conflicts 2016-01-25 20:10:51 +00:00
Mcat12 b67db0573e More contributor tips 2016-01-24 21:35:18 -05:00
Mcat12 45e7166c23 Contributor tips++ 2016-01-23 23:51:06 -05:00
Mcat12 2738feafb1 Contributor tips 2016-01-23 19:13:18 -05:00
Jacob Salmela a5e2f53ee6 Update to reflect new version 2016-01-21 10:45:31 -06:00
Mcat12 07eb397f06 Update README.md 2016-01-21 08:25:27 -05:00
Mcat12 1fa759909d Update README.md 2016-01-21 08:21:49 -05:00
Mcat12 2721328c1d Update README.md 2016-01-21 08:20:43 -05:00
Mcat12 88372a6b19 Merge Conflict Resolution
Merging frequent_queries into devel
2016-01-21 07:55:37 -05:00