Commit Graph

1735 Commits

Author SHA1 Message Date
Adam Warner 789f111348 Merge branch 'devel' into patch-1 2017-07-30 16:05:39 +01:00
Flo 60b11c376b Simplify info-box links 2017-07-30 16:50:32 +02:00
Adam Warner f9f69cc19a Merge branch 'devel' into tweak/blockpage 2017-07-29 16:44:01 +01:00
DL6ER 849b987ad9 Move update checker from header into footer (#553)
* Move update checker from header into footer

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Remove version output in dropdown menu.

Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-07-27 23:13:33 +01:00
DL6ER fe3e8fcb08 Ensure excess whitespace is split when white/blacklisting multiple domains 2017-07-28 00:01:18 +10:00
Mcat12 1ae7247213 Change success check to a more stable indicator
Fixes #540
2017-07-26 22:16:32 -04:00
WaLLy3K 3a17f9da13 Rebase off devel to only add "-bp" functionality
* Included pcre.recursion_limit as a safety cutoff measure
2017-07-19 00:29:47 +10:00
DL6ER a13b7bd692 Add an apply button to the new Audit log page (#532)
* Add an apply button to the new Audit log page

* The button is not actually called "Apply"
2017-07-14 22:50:09 +02:00
DL6ER 40ae7fb0ca Add long-term graph page (#542)
* Add api_db.php?getGraphData

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Add new DB Graph page

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Adjust x-axis format

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Tweaks to long term stats (#543)

* add maxDate to Datepicker

* remove `GO` Button from datepicker input, instead hook into the apply event to update the graphs/charts when the date range is selected

* :codacy:

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Fix comment + another :codacy:

* Remove duplicated code

* Add click callback to DB graph that sends the user to the DB query log page. This required some re-write of the DB queries page.

* Remove uneeded global variable

* Remove minDate and MaxDate as it is causing issues on fresh installs

* Oh :codacy: ...
2017-07-08 23:42:21 +02:00
DL6ER a540c851c9 Add hostname in header (#541)
* Add hostname in header

* Removed class attribute of <li> element and replaced <tt>
2017-07-08 20:24:26 +02:00
DL6ER 93732f12b1 Re-add doughnut charts (#544)
* Re-add doughnut charts as this has been requested by some users

* Smaller optimizations

* Don't use rotation animation for further updates

* Apply attribute to correct graph

* Ask for unsorted list of forward destinations

* :codacy:

* Move setting to correct graph
2017-07-08 20:18:26 +02:00
DL6ER 94bdb18fe1 Fix domain validation function (#538) 2017-07-01 21:38:04 +10:00
Mcat12 220a47f67e Merge pull request #537 from pi-hole/tweak/long_term_24H
Daterangepicker: Display time in 24H modus
2017-06-30 11:11:06 -04:00
DL6ER 76e4cc6a40 Fix datrangepicker for "Today" and "Yesterday". Add "All Time" option. (#535)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-06-30 17:04:10 +02:00
DL6ER 273f9373b2 Display time in 24H instead of 12H mode
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-06-30 13:40:13 +02:00
TheME dd101b3b0a header.php: set 'Tools' menu active correctly 2017-06-30 12:07:34 +02:00
DL6ER d4bcede042 Accept underscores when validating domain names (#533) 2017-06-30 17:43:30 +10:00
DL6ER 9f7fb18f31 Long-term statistics implementation (using FTL's database) (#521)
* - Add DB Top Lists
- Add DB Query Log
- Add DB API

* Allow to select only queries that are equal/newer than the oldest entry in the database
2017-06-29 20:57:09 +02:00
DL6ER 99ffef6c8e Don't update list after each click but in regular intervals (once per second) (#534)
Signed-off-by: DL6ER <dl6er@dl6er.de>
2017-06-29 20:37:57 +02:00
TheME 74a6dc3276 Fix glow effect (#528)
* index.js: fix glow effect

* header.php: fix glow effect rule
2017-06-28 23:26:47 +01:00
DL6ER 557ebbbc7c Merge pull request #479 from pi-hole/new/audit-log
Audit log
2017-06-27 10:53:31 +02:00
Mcat12 68794061a5 Use DataTable's safe renderer in query log
See https://datatables.net/manual/security
2017-06-24 22:31:31 -04:00
DL6ER 2c99183d33 Merge pull request #526 from pi-hole/tweak/dash_statistics
Add unique clients to dash board summary
2017-06-21 20:09:34 +02:00
Mcat12 d061355ff3 Fix FTL offline message 2017-06-20 18:53:10 -04:00
Adam Warner f204b71707 [Staging] 3.1 (#514)
* Remove double click handler

* ~Today~ Over Last 24 Hours

* Rename Top Advertisers to Top Blocked Domains

* percentage should be a float instead of an integer

* Define $over_time as array. Fixes #501

* Add hover/hit radius for Forward Destinations over Time graph

* Add custom callback for tooltips and disable legend for Forward Destinations over Time graph

* Remove legend, add tooltips and increase hit/hover radius for Query Types over Time graph. Fixes #502

* Don't hide detailed graphs on small screens any longer

*  🌮 is the new :shipit: squirrel

* revise wording on main page

shorter text to fit in one line on smaller screens

* Show warning in browser when fopen() failed

* open links in new tab

* open links in new tab

* Update header.php

* select 'Login' in Navbar when showing loginpage

using the same term as it is already used to show up the loginpage (in line 565)

* set the mainbox wider on smaller screens

solves issue of overlapping text with loginbutton when using smaller screens

* also fix overlapping loginpage on footerbar

* remove border on logo

* add link feedback (on hover)

* sessiontimer in bold letters

* use AdminLTE function to toggle dropdown-menu

AdminLTE has already an implemented function to toggle the user menu.
So there is no need to use an own script in footer.js
 
Benefit: The dropdown-menu closes if you click on a blank Place

* align donate-url with url in footerbar

* remove function to open user menu

AdminLTE has already an implemented function to toggle the user menu.
So there is no need to use an own script in footer.js

Benefit: The dropdown-menu closes if you click on a blank Place

* Update LICENSE of the project to EUPL v1.2

* Major overhaul of update checker - checks only every 30 minutes to reduce number of GitHub API requests

* Add version info to dropdown menu (top right) for viewing on small screens. Addresses #333 partially

* Fix typo

* footer.php: improve and clean up

move animation-stylesheet to pi-hole.css (Have you noticed that there is even a text- and text-shadow animation set, but for webkit-browsers only)
added <!-- Version Infos -->
correct continuous hide of version info (AdminLTEs classed widths as `xs` > `sm` > `md` > `lg`)
display Donate-text alwas in one line (do not wrap in between when version info string gets very long)

* pi-hole.css: pasted animation stylesheet

and improved the text-shadow-animation to work correctly with and without -webkit-prefix
(for me this wasn't working until now)

* header.php: some corrections & improvements

pull dropdown-menu always to right side
changed <!-- Update alerts --> to <!-- Version Infos --> (just like it is in footer)
hide version infos in dropdown-menu if it gets shown in footer
repaired update-urls, they also should open up in new tab & gets underlined on hover
`background:none` is needed because AdminLTE adds dark bg on hover to links when using it on smallscreen (xs)

* Minor change to make the dashboard's javascript compatible with escaped characters (like apostrophe) in client names

* Add the same for the top domains

* ... and Top Ads

* Minor change to comments

* footer.php: edited as discussed

* header.php: edited as discussed

* Update queryads.js

* Update list.js

* queryads.js: codacy fixes

* list.js: codacy fixes

* list.js: small correction

* queryads.js: small correction

* Be able to interpret status 5

* Sort list entries (black-/whitelist) alphabetically before creating the table

* queryads.js: Update*

* removed double comment and updated code to center and separate the buttons on small screens, like in my last screenshot.

* list.js: update*

updated code to center and separate the buttons on small screens, like in my last screenshot.
2017-06-20 22:17:37 +01:00
DL6ER a604037d33 Add unique clients to summary 2017-06-20 13:01:30 +02:00
Mcat12 0dcf45d271 Merge pull request #520 from Th3M3/form-group_responsive_style
Form group responsive style
2017-06-19 14:37:57 -04:00
TheME 53068e0fef list.js: update*
updated code to center and separate the buttons on small screens, like in my last screenshot.
2017-06-19 11:31:46 +02:00
TheME 3ab8c8d0f9 queryads.js: Update*
* removed double comment and updated code to center and separate the buttons on small screens, like in my last screenshot.
2017-06-19 11:29:50 +02:00
Mcat12 399f2ad029 Merge pull request #524 from pi-hole/new/Exact_blacklisting_display
Correctly interpret black.list status in Query Log
2017-06-17 11:47:36 -04:00
DL6ER a9b020c006 Sort list entries (black-/whitelist) alphabetically before creating the table 2017-06-17 14:44:22 +02:00
DL6ER 2aff81f0ba Be able to interpret status 5 2017-06-17 14:39:14 +02:00
TheME ae58c6c60e header.php: removed inline-stylesheet
move it to pi-hole.css
2017-06-10 23:26:41 +02:00
Mcat12 b116f7ef18 Merge pull request #519 from pi-hole/fix/apostrophe_clientname
Fix for escaped HTML characters in clients/domains names
2017-06-08 12:18:30 -04:00
TheME 89864baa76 queryads.js: small correction 2017-06-06 20:48:39 +02:00
TheME 07e2ef6f6d list.js: small correction 2017-06-06 20:47:35 +02:00
TheME 5b6c025de3 list.js: codacy fixes 2017-06-06 19:22:00 +02:00
TheME fb7df298c0 queryads.js: codacy fixes 2017-06-06 19:21:09 +02:00
TheME 4e06783cb2 Update list.js 2017-06-06 18:37:30 +02:00
TheME cfaf12cd63 Update queryads.js 2017-06-06 18:35:19 +02:00
TheME 2de0f4dfb3 header.php: edited as discussed 2017-06-04 18:43:48 +02:00
TheME ceac8cf2d1 footer.php: edited as discussed 2017-06-04 18:41:04 +02:00
DL6ER 9b2f4e4673 Minor change to comments 2017-06-04 13:34:46 +02:00
DL6ER 1ee66f36bd ... and Top Ads 2017-06-04 13:32:35 +02:00
DL6ER 1e1da89a9c Add the same for the top domains 2017-06-04 13:32:09 +02:00
DL6ER f66650be1c Minor change to make the dashboard's javascript compatible with escaped characters (like apostrophe) in client names 2017-06-04 13:29:24 +02:00
TheME f2b4544929 header.php: some corrections & improvements
pull dropdown-menu always to right side
changed <!-- Update alerts --> to <!-- Version Infos --> (just like it is in footer)
hide version infos in dropdown-menu if it gets shown in footer
repaired update-urls, they also should open up in new tab & gets underlined on hover
`background:none` is needed because AdminLTE adds dark bg on hover to links when using it on smallscreen (xs)
2017-06-04 12:47:45 +02:00
TheME 6b1ecfc31c footer.php: improve and clean up
move animation-stylesheet to pi-hole.css (Have you noticed that there is even a text- and text-shadow animation set, but for webkit-browsers only)
added <!-- Version Infos -->
correct continuous hide of version info (AdminLTEs classed widths as `xs` > `sm` > `md` > `lg`)
display Donate-text alwas in one line (do not wrap in between when version info string gets very long)
2017-06-04 12:12:27 +02:00
DL6ER 58f6406f48 Merge pull request #515 from Th3M3/improve_dropdown-menu
Improve dropdown-menu
2017-06-03 18:57:43 +02:00
DL6ER 49fcaed05a Fix typo 2017-06-03 16:56:41 +02:00