Commit Graph

1785 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 1975c261d0 Moved FTL API into own file as well 2017-02-19 14:52:28 +01:00
DL6ER 01283cc7d5 Ensure fallback solution works for all emelemts on the main page 2017-02-19 14:50:04 +01:00
DL6ER 7511010816 Include missing license header in api_PHP.php 2017-02-19 14:26:59 +01:00
DL6ER bbab9f8bfd Removed double license header in api.php 2017-02-19 14:24:23 +01:00
DL6ER 86bfa663f9 Merge branch 'devel' into new/FTL-integration
Conflicts:
	scripts/pi-hole/php/auth.php
	scripts/pi-hole/php/password.php
2017-02-19 14:20:56 +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
Adam Warner 80ad3bac4d Merge pull request #406 from pi-hole/customDisable
Custom disable time
2017-02-19 02:02:31 +00:00
Adam Warner 1aad0c49e7 Merge pull request #407 from pi-hole/dnsWatch
Add DNS.Watch servers to web admin
2017-02-18 19:17:19 +00:00
Promofaux 86880668fa Add DNS.WATCH servers from https://github.com/pi-hole/pi-hole/pull/1253 2017-02-18 17:51:15 +00:00
DL6ER 4f70973cbc EUPL license (#402)
* Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/

* Added header to main PHP files

* Modified scripts in scripts/pi-hole/php

* Added header to scripts/pi-hole/js files

* Added license header to our custom style script

* Slight reformulation
2017-02-18 14:20:51 +01:00
Promofaux a6439d8165 Address more codacy complaints 2017-02-18 01:04:10 +00:00
Promofaux b38808b76a Address codacy complaints 2017-02-18 01:00:32 +00:00
Promofaux 23e7708ee4 add back in 10 second functionality 2017-02-18 00:49:59 +00:00
Promofaux 2039fec556 clear localstorage item on manual enable 2017-02-18 00:45:05 +00:00
Promofaux 18d914322b add an id to the label that gets updated 2017-02-18 00:43:50 +00:00
Promofaux d55a75366b Add a countdown timer next to the enable button. Works across page reloads 2017-02-18 00:38:31 +00:00
Promofaux 3037ef7710 timeout to be the same as whatever is set 2017-02-17 22:11:39 +00:00
Promofaux 4bfcb3e750 formatting 2017-02-17 22:10:39 +00:00
Promofaux e54ad166cb Codacy loves a complain 2017-02-17 21:15:10 +00:00
Promofaux ff5cf63aaf Move modal dialog to footer.php so it works from anywhere 2017-02-17 21:01:54 +00:00
Promofaux 7e986ff008 modal dialog 2017-02-17 20:48:39 +00:00
Promofaux 0e9976902b new button 2017-02-17 20:47:28 +00:00
Promofaux 5076de084b javascript 2017-02-17 20:46:43 +00:00
DL6ER 84c2eb921e Merge pull request #404 from pi-hole/fix/datetime
Fix timezone display in Query Log display
2017-02-16 14:19:04 +01:00
DL6ER 9d18684a58 Merge pull request #403 from PartTimeLegend/PartTimeLegend-patch-1
Part time legend patch 1
2017-02-16 14:17:47 +01:00
DL6ER 3c90f544b9 Fix timezone display in Query Log display 2017-02-16 11:43:09 +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 5b48803f90 Slight reformulation 2017-02-16 08:50:09 +01:00
Antony Bailey b65544639d Set Github logo in footer to be link to Github Org 2017-02-15 21:15:15 +00:00
DL6ER 132a19ed84 Added license header to our custom style script 2017-02-14 15:04:35 +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 9b799819bf Added header to main PHP files 2017-02-14 14:57:58 +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
Adam Warner 11b39e7b62 Merge pull request #401 from LasseSLambertsen/devel
Added hover effect to listview
2017-02-14 11:02:39 +00:00
LasseSLambertsen 6120f10b01 Update pi-hole.css 2017-02-14 11:25: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 2a179b7d6e Merge pull request #398 from pi-hole/fix/teleportervalidation
Improve Teleporter's ZIP validation
2017-02-09 16:30:51 +01: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
Mcat12 cb6e7f8157 Merge pull request #397 from pi-hole/tweak/teleportererror
Give some more details on teleporter failure
2017-02-09 10:20:15 -05:00
DL6ER 279ea1b18b Give some more details on teleporter failure 2017-02-09 15:25:25 +01:00
Mcat12 37c5e9831a Merge pull request #396 from pi-hole/fix/settings.js
Fix syntax error in settings.js
2017-02-09 08:22:02 -05: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
Mcat12 3a002ce72a Merge pull request #393 from pi-hole/fix/queryads
Moving ampersand fixes Query Adlists exact search
2017-02-07 17:51:29 -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