Commit Graph

64 Commits

Author SHA1 Message Date
Promofaux 8bb172aae6 Simple turn off animations for now. Toggling to come later. 2016-04-15 21:17:18 +01:00
Promofaux 9b8c92ed5d Fix query type display on pi-chart as raised in #54 2016-03-08 15:51:58 +00:00
Mcat12 bc04b1c994 Made tooltip correct color on graph 2016-02-29 20:41:16 -05:00
Mcat12 53f1f7c9c8 Made colors match 2016-02-29 20:34:44 -05:00
Verpz 2e36517240 Use Local CSS Instead Of CDN 2016-02-28 14:44:08 +11:00
Verpz 55cc148e8e CSS Fix 2016-02-28 11:31:11 +11:00
Verpz 01ce4bc6ad Add Javascript Disabled Warning / Popup
This displays a small lightweight popup when a user has Javascript disabled when they load the dashboard. 

This was tested on my local Pi Hole and worked perfectly.

https://github.com/pi-hole/AdminLTE/issues/47

https://github.com/Verpz/Javascript-Disabled-Warning-Popup
2016-02-28 09:19:37 +11:00
Mcat12 9bab0c5036 Merge branch 'master' into devel
Conflicts:
	header.html
	index.php
	js/jquery.min.js
2016-02-21 16:19:51 -05:00
Mcat12 82e7108afe Loads from local files 2016-02-20 18:13:21 -05:00
Mcat12 b72e78a933 Do not animate on mobile
Animations are slow on mobile devices.
2016-02-17 22:33:32 -05: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 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 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
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 67934591fe Dynamic versions in footer
- Shows Pi-hole and Web Interface versions
2016-01-30 13:05:28 -05:00
Mcat12 e19b584e29 Dynamic versions in footer
- Shows Pi-hole and Web Interface versions
2016-01-30 11:26:18 -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
Dan Schaper 589165a42a Update Version in Admin 2016-01-26 08:36:04 -08: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 62bd7a845f Revert "Update from devel" 2016-01-25 21:12:21 +00:00
Promofaux 4b0e1d9ca2 Resolving conflicts 2016-01-25 20:10:51 +00:00
Jacob Salmela a5e2f53ee6 Update to reflect new version 2016-01-21 10:45:31 -06:00
Mcat12 88372a6b19 Merge Conflict Resolution
Merging frequent_queries into devel
2016-01-21 07:55:37 -05:00
Matej Bellus 14dfa0bc42 fixed conflicts 2016-01-21 11:29:23 +01:00
Jacob Salmela 6b89b27bd3 Merge pull request #15 from PromoFaux/PendingChronometerChanges
Pending chronometer.sh changes
2016-01-18 20:16:00 -06:00
Adam Warner 6685d7bde0 Update index.php
Consume JSON output of chronometer.sh

Relies on [this pull](jacobsalmela/pi-hole#193) being merged.
2016-01-18 23:04:37 +00:00
OkashiOdayakana 00f68a1142 Update index.php 2016-01-18 12:55:21 -05:00
Matej Bellus 7495ee5fd8 matched colors 2016-01-18 16:13:12 +01:00
Matej Bellus af6ec1cf26 Added frequent queries table 2016-01-18 16:05:04 +01:00
Brice Johnson 96d4254e8b Changed "Percentage" to Frequency 2016-01-15 23:42:00 -06:00
Brice Johnson 81a81c517e Added chart of queries over time 2016-01-15 23:40:15 -06:00
Brice Johnson f018e0f6f9 Added lists of top domains/ads. Moved data collection to separate file. 2016-01-15 22:29:18 -06:00
Mcat12 3f3ebef42f Integrated list managment with admin site
- Made favicon work across pages
- No longer needs root access to tee command, still needs root access for gravity.sh and whitelist.sh
- Added call to gravity.sh when you remove an item
- Moved header and footer into separate files
- Moved files from list into the main folder
- Got rid of extra dependencies from the old list setup
- Added home button to sidebar
- Renamed original whitelist to "Old Whitelist"
- Added buttons to sidebar for Whitelist and Blacklist
2016-01-13 20:34:43 -05:00
Jacob Salmela e36ced86d4 fixes #8 2016-01-10 21:58:33 -06:00
Mcat12 f79a4a8ebc Made button more descriptive 2016-01-10 16:46:42 -05:00
Mcat12 4dff31a6de Added advanced whitelist/blacklist site
- Accessed under the "Whitelist" tab
- Added "Add: " in front of the text box for the simple whitelist
- Added "ad.example.com" as a placeholder in the text box

Currently www-data needs root access to gravity.sh (for adding to the blacklist). If we get a blacklist.sh, we may be able to get rid of the need for root.
2016-01-10 16:31:41 -05:00
Jacob Salmela 48952c50ce script to run whitelist.sh 2016-01-03 15:36:31 -06:00
Jacob Salmela b1b43512e9 expandable whitelist sidebar menu
Script output will display when the user presses enter without the need
to load a different page.
2016-01-03 15:31:15 -06:00
X O 3acde44969 fix index 2015-12-28 16:56:08 +10:30
X O 2e0e62306d fix index 2015-12-28 16:55:44 +10:30
X O 53cd9bc15c add app.js back 2015-12-28 16:54:41 +10:30