Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-24 10:50:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,925 Commits 23 Branches 114 Tags
c9f5c9500a30e7cc6cd6faef4c4550338600a8ee
Commit Graph

830 Commits

Author SHA1 Message Date
DL6ER
d1d9d7faff Use htmlentities() to mitigate XSS (this function is identical to htmlspecialchars() in all ways, except with htmlentities(), all characters which have HTML character entity equivalents are translated into these entities) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-06 23:47:06 +02:00
DL6ER
a50525d72b Clean up after import 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-06 23:43:19 +02:00
DL6ER
67855df5c5 Minor corrections 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-06 23:42:49 +02:00
DL6ER
6bb6c6d29f Finished Teleporter 2.0 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-06 21:13:07 +02:00
DL6ER
80b37a7c81 Merge branch 'devel' into tweak/Teleporter_v2.0 2017-10-06 20:26:21 +02:00
DL6ER
2f3dc0befe Oh :codacy: ... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-02 12:27:42 +02:00
DL6ER
fcf2eb663f Specify one common place for defining the IP of a non-local FTL instance. Fixes #589 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-10-02 12:19:24 +02:00
DL6ER
1e89f12d18 Merge branch 'new/clientsovertime' of github.com:pi-hole/AdminLTE into new/clientsovertime 2017-09-30 11:10:03 +02:00
DL6ER
6a75cc2751 Prevent overshoots in the graphs caused by cubic interpolation (just like we do it already for the main graph) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-30 11:09:13 +02:00
WaLLy3K
1ba190bfa2 Merge branch 'devel' into new/clientsovertime 2017-09-30 13:29:36 +10:00
WaLLy3K
2789b69460 Decrease doughnut animation time on first load 2017-09-29 23:12:20 +10:00
DL6ER
0ed1901a8e Apply proper sorting whilst preserve the color order for the doughnut forward destinations chart 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-27 17:03:00 +02:00
DL6ER
b70993368b Change color from "blue" to "#72afd2" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-24 11:53:13 +02:00
DL6ER
dcdec7ca48 Add some dynamic color experiment 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-24 11:48:00 +02:00
DL6ER
8e4b7efcc0 Add dynamic hover text to make the feature more prominent 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-24 11:41:14 +02:00
DL6ER
45af8eb971 Change cursor type from zoom-in to pointer 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-24 00:24:58 +02:00
DL6ER
18079c128f And another one 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-24 00:11:07 +02:00
DL6ER
ddfed41034 Fix some mistakes 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-24 00:09:58 +02:00
DL6ER
d6db559742 Change cursor style to magnifying glass when hovering single-click searching capable entries to highlight the new feature 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-23 14:03:55 +02:00
DL6ER
b0e16975e4 Show reset button only if one-click filtering is actually used 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-23 13:55:09 +02:00
DL6ER
f1a5ec8953 Add "clear" button 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-23 13:46:28 +02:00
DL6ER
269bd09823 Allow one-click filtering on "Type", "Domain", and "Client" 2017-09-23 13:24:23 +02:00
DL6ER
a46f720973 Use absolute instead of relative display 2017-09-23 13:03:55 +02:00
DL6ER
076700fc92 Add "Clients (over time)" graph (needs FTL on branch "new/clientsovertime") 2017-09-22 21:11:57 +02:00
WaLLy3K
0bafeabe49 Allow full stop in top list wildcard exclusions 
* Fix #580
 2017-09-22 18:19:04 +10:00
DL6ER
a18a45e6b8 Detect ${OVER} and mirror its effect properly on the web interface 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-21 20:23:38 +02:00
DL6ER
aef4159f44 Add tooltips to dognuth charts 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-20 22:28:46 +02:00
DL6ER
e7fc65b684 Simplify function updateForwardedOverTime() as data obtained from API is already normalized 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-20 22:15:19 +02:00
DL6ER
b89c40d63f Simplify function updateQueryTypesOverTime() as data obtained from API is already normalized 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-20 22:11:54 +02:00
DL6ER
6eb450a3a6 Show detected number of cores not only when hovering the icon, but also when hovering the Load text 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-16 16:18:51 +02:00
J den Hartog
76891ef43d Whitelisting withOUT password not supported 
*White*listing with password not supported
should be:
*White*listing without password not supported
in my opinion.
 2017-09-16 10:39:21 +02:00
DL6ER
5ab4430ef0 halt -> poweroff 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-09-08 20:30:59 +02:00
DL6ER
f2b77c0bf4 Merge pull request #470 from gedetil/devel 
Add shutdown option
 2017-09-08 20:26:19 +02:00
Adam Warner
fb9bbd97e0 Merge branch 'devel' into elegantize-custom_time_modal 2017-08-28 20:16:58 +01:00
Adam Warner
194b00e783 Merge branch 'devel' into release/3.2 2017-08-28 08:46:16 +01:00
TheME
8ab2148437 footer.php: elegantize 'Disable Custom time' modal 2017-08-27 21:24:02 +02:00
Adam Warner
2390017f8a Merge branch 'devel' into tweak/blockpage 2017-08-27 11:30:16 +01:00
Mcat12
fdbd68b655 Merge pull request #565 from eddturtle/master 
Fix arrow positions in sidebar to be vertically centered
 2017-08-16 15:25:50 -04:00
Edd Turtle
41f5e3fe1b Fix final sidebar button (from devel branch) 2017-08-16 20:03:21 +01:00
Mcat12
4f959ab83f Merge branch 'devel' into master 2017-08-15 22:27:27 -04:00
Edd Turtle
fe35ca3f02 Fix arrow positions in sidebar to be vertically centered 2017-08-15 19:03:12 +01:00
Mcat12
cff98f8ebe Remove testing change 2017-08-08 20:49:31 -04:00
Mcat12
127314e98e Fix undefined total in DB top lists 2017-08-08 20:46:01 -04:00
DL6ER
7f33b102df Re-implement Teleporter with PharData. The advantage is that we don't have to rely on php-zip being installed. 
This commit implements only the re-written Export. The import feature has still to be coded.

Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-08-06 17:56:59 +02:00
Mcat12
2b5a4d8989 Fix undefined variable $timestamp 2017-08-02 21:16:55 -04:00
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