Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-25 21:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,785 Commits 19 Branches 112 Tags
dc61eb82d4b33df02ba68432e00a334453a80331
Commit Graph

177 Commits

Author SHA1 Message Date
DL6ER
dc61eb82d4 Show summary if no arguments are passed to API 2017-02-19 19:10:49 +01:00
DL6ER
8a0839f439 Small security update to the indicidual API files 2017-02-19 19:05:06 +01:00
DL6ER
91c563692e Codacy 2017-02-19 14:58:20 +01:00
DL6ER
01283cc7d5 Ensure fallback solution works for all emelemts on the main page 2017-02-19 14:50:04 +01:00
DL6ER
f88092175e Conflicts: 
api.php
	scripts/pi-hole/php/FTL.php
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
 2017-02-19 14:17:52 +01:00
DL6ER
aabff35bef Squashed commit of the following: 
- Dynamically fall back to PHP API functions to ensure API does always repond even if FTL is not runnung for some reason
- Update PHP API from current devel branch
- Increase flexibility in getQueryTypes API call
- Hide top ads list if nothing to display
- Proper display of activated privacy mode
- Remove spinner (would otherwise not be removed for zero results)
- Update tables every 10 seconds
- Update query types and forward destinations plots every 10 seconds
- More verbose output in top lists (total number next to percentage in tooltip)
- Implemented "recentBlocked" keyword for API
- Ensure compatibility with PHP5 version < 5.4
- Adjust output format of overTimeData10mins to comply with PHP API
- Further speedup of Query Log page by showing only the recent 10 minutes by default
- Hide temperature if FTL is not running and show FTL status
- Add information to Settings page
- Adjust error message when loading of query log failed
- Move processing of domainname, clientIP, clientname and time interval filters for the Query Log page to FTL for speed enhancement
- Generate link if pi.hole comes up in the Top Domains list
- Remove resolve DNS names option - this is now enabled by default (daemon will only do it once per day instead of PHP-API which did it on every reloading of the web interface)
- Add socket timeout of 10 seconds + modification to Settings page since FTL backend supports API_EXCLUDE_CLIENTS filtering with both IP addresses and host names (also mixed)
- Improved Query Log page
 2017-02-16 08:52:30 +01:00
DL6ER
e5d4ca328a Added header to scripts/pi-hole/js files 2017-02-14 15:01:40 +01:00
DL6ER
1c73016f6a Modified scripts in scripts/pi-hole/php 2017-02-14 15:00:11 +01:00
DL6ER
1b3904f67e Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/ 2017-02-14 14:51:13 +01:00
Mcat12
ee41dbdc70 Merge pull request #391 from pi-hole/fix/xss-settings 
Clean any inputs being added to $success or $error
 2017-02-09 16:21:00 -05:00
DL6ER
b8d6550096 Detect mime type of uploaded file on the server instead of relying on what the uploading OS tells us. Fixes #395 2017-02-09 16:21:21 +01:00
DL6ER
279ea1b18b Give some more details on teleporter failure 2017-02-09 15:25:25 +01:00
DL6ER
8c2fbde5ab Fix syntax error 2017-02-09 00:39:53 +01:00
Mcat12
ca8debea80 Merge pull request #394 from pi-hole/fix/PHPwarningCentOS 
Check if time zone is set to mute some PHP warnings
 2017-02-07 17:54:47 -05:00
DL6ER
f5c4065b89 Check if time zone is set the mute some PHP warnings 2017-02-06 15:59:20 +01:00
DL6ER
13a73f5217 Move ampersand 2017-02-06 15:40:49 +01:00
Mcat12
8c821357ff Merge pull request #392 from pi-hole/revert-371-updateAdminLTE 
Revert "Update AdminLTE v2.1.2 -> v2.3.8"
 2017-02-05 14:38:28 -05:00
Mcat12
b586cb85ba Merge branch 'devel' into fix/IPv6field 2017-02-04 12:51:25 -05:00
DL6ER
179e7bd2c0 Revert "[WIP] Update AdminLTE v2.1.2 -> v2.3.8" 2017-02-03 10:26:30 +01:00
Mcat12
3a3883aa39 Clean any inputs being added to $success or $error 
Changes htmlentities to htmlspecialchars as well, because
htmlentities is not adequate to protect against XSS attacks:
http://php.net/manual/en/function.htmlentities.php#99896

Fixes #365
 2017-02-02 19:39:51 -05:00
Mcat12
1951453de7 Merge pull request #371 from pi-hole/updateAdminLTE 
[WIP] Update AdminLTE v2.1.2 -> v2.3.8
 2017-02-02 18:41:58 -05:00
Mcat12
b7ff4656b4 Merge pull request #388 from pi-hole/new/DHCPdynamictostatic 
Copy leases to static table
 2017-02-02 18:37:01 -05:00
Mcat12
1f6537ae7d Remove commented code 2017-02-02 18:23:50 -05:00
DL6ER
e645d953cd Removing validation for IPv6 field entirely. Fixes #389 2017-02-02 11:47:52 +01:00
DL6ER
44aaed17a7 Back to previously used JS validator fpr IPs (it supports Copy&Paste) 2017-02-02 10:57:41 +01:00
DL6ER
11bee7f45d Do not accept :: or 0:0:0:0:0:0:0:0 as valid IPv6 address 2017-02-02 10:49:55 +01:00
DL6ER
f428d98fec Pleasing codacy 2017-02-01 15:59:01 +01:00
DL6ER
250389126d Copy row from currently active DHCP leases to input fields for static releases 2017-01-31 22:50:43 +01:00
Promofaux
bc4e5bb22a get Hostnames for query log page 2017-01-31 21:25:50 +00:00
DL6ER
4c952da6b2 Merge pull request #376 from pi-hole/new/DHCPstaticleases 
Add static DHCPv4 leases settings
 2017-01-31 21:36:50 +01:00
DL6ER
494e9c2884 Merge pull request #382 from pi-hole/tweak/list-buttons 
Move list buttons out of the way on small screens
 2017-01-31 12:07:13 +01:00
DL6ER
9bb7f86b0f Apply fix also for overTime graph 2017-01-31 11:51:24 +01:00
DL6ER
5e728255fa Exclude whitelisted domains from showing up in the Top Ads List 2017-01-31 11:48:02 +01:00
DL6ER
c81e2591bd Remove debug mode 2017-01-30 23:44:14 +01:00
DL6ER
68a48aef2f added -> removed 2017-01-30 23:19:28 +01:00
Mcat12
bc484338b4 Fit closer to Bootstrap layout sizes 2017-01-30 17:05:55 -05:00
Mcat12
f53f2e8836 Move buttons out of the way on small screens 2017-01-30 16:52:24 -05:00
DL6ER
940324551f Strip https:// and http:// in CORS test 2017-01-29 11:45:38 +01:00
Mcat12
11c28bc1be Merge pull request #369 from pi-hole/new/takeout 
Pi-hole Teleporter
 2017-01-28 19:03:47 -05:00
DL6ER
771c548a7f Renamed zip file 2017-01-27 22:11:02 +01:00
DL6ER
cd5f5bb936 Expanable box + renamed 2017-01-27 22:08:55 +01:00
DL6ER
2f80018f51 Echo OK if everything was successful 2017-01-27 22:02:26 +01:00
DL6ER
837f98e6ed Removed debug output 2017-01-27 22:01:11 +01:00
DL6ER
fc7cf611b4 log_and_die() is not defined 2017-01-27 21:59:22 +01:00
Mcat12
96826da1f2 Return numbers as numbers in summaryRaw 2017-01-26 21:33:18 -05:00
DL6ER
fb0ca79584 Ensure input fields are always at the bottom of the table (and stay there when the user applies custom sorting) 2017-01-25 13:30:25 +01:00
DL6ER
6af5fe73ae Added comments 2017-01-25 13:10:57 +01:00
DL6ER
3ba37d7793 Also allow (manually set dhcp-host=hostname,ip.add.re.ss) in table. As this has been added manually, don't allow deleting it 2017-01-25 13:08:36 +01:00
DL6ER
b9f1c57bbb Codacy fixes 2017-01-25 12:04:28 +01:00
DL6ER
8646507f37 Make sure variables are empty before call of sscanf() 2017-01-25 11:47:20 +01:00