Commit Graph

15 Commits

Author SHA1 Message Date
DL6ER
7a73053bfd Merge branch 'devel' into new/FTL-integration
Conflicts:
	api.php
2017-02-28 13:49:34 +01:00
DL6ER
d104539708 API QR token generator (#410)
* Added API QR token generator

* Pass only token

* Corrected link
2017-02-27 22:33:35 +01: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
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
1b3904f67e Move whole project to EUPL, copy MIT license to scripts/vendor/ and style/vendor/ 2017-02-14 14:51:13 +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
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
e73c521a71 Updated AdminLTE app 2017-01-21 01:53:00 +01:00
DL6ER
6958f50039 Change data-mask extension to one that supports both IPv4 and IPv6 addresses. Add IPv6 DNS server fields on the settings page 2017-01-13 13:37:36 +01:00
Promofaux
d0553ef169 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-21 21:09:45 +01:00
DL6ER
e188cb6fbc Revert "Merge pull request #267 from pi-hole/folderStructure"
This reverts commit fba3d10fa4, reversing
changes made to 4ee75f4167.
2016-12-21 17:16:52 +01:00
Promofaux
6a13796d99 Organise folder structure a bit better... Seperates vendor packages from self-written scripts. 2016-12-19 18:30:16 +00:00