Commit Graph

803 Commits

Author SHA1 Message Date
DL6ER
20ce214c9f Add checkbox if the user wants his debug log to be uploaded automatically 2017-02-22 19:47:58 +01:00
DL6ER
71672319af Another codacy commit 2017-02-22 18:07:12 +01:00
DL6ER
c99f23c995 Codacy 2017-02-22 17:35:31 +01:00
DL6ER
e422e820d1 Show disable timer across all devices 2017-02-22 15:44:07 +01:00
DL6ER
4cc917dd91 Codacy 2017-02-22 15:07:02 +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
Adam Warner
80ad3bac4d Merge pull request #406 from pi-hole/customDisable
Custom disable time
2017-02-19 02:02:31 +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
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
e54ad166cb Codacy loves a complain 2017-02-17 21:15:10 +00:00
Promofaux
5076de084b javascript 2017-02-17 20:46:43 +00: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
cc13cf5e33 Internet explorer + Windows Edge compatibility 2017-02-10 12:26:20 +01:00
DL6ER
9765b38ec2 Added online debug log creator 2017-02-10 12:22:59 +01:00
DL6ER
8c2fbde5ab Fix syntax error 2017-02-09 00:39:53 +01:00
DL6ER
13a73f5217 Move ampersand 2017-02-06 15:40:49 +01:00
Mcat12
b586cb85ba Merge branch 'devel' into fix/IPv6field 2017-02-04 12:51:25 -05:00
Mcat12
1f6537ae7d Remove commented code 2017-02-02 18:23:50 -05:00
DL6ER
44aaed17a7 Back to previously used JS validator fpr IPs (it supports Copy&Paste) 2017-02-02 10:57:41 +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
DL6ER
4c952da6b2 Merge pull request #376 from pi-hole/new/DHCPstaticleases
Add static DHCPv4 leases settings
2017-01-31 21:36:50 +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
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
b9f1c57bbb Codacy fixes 2017-01-25 12:04:28 +01:00
DL6ER
3d8246e4c3 Add static leases table to DHCP settings 2017-01-25 10:11:23 +01:00
DL6ER
f840caf173 codacy... 2017-01-16 16:32:29 +01:00
DL6ER
09f5bfdea8 Added cookie test of login page 2017-01-16 15:45:44 +01:00
DL6ER
3be0cb0de4 Codacy 2017-01-14 15:36:30 +01:00
DL6ER
a6b3bc1cb4 Add IE mode to PHP scripts 2017-01-14 15:29:23 +01:00
DL6ER
b7b7217fb0 Implemented filter functions 2017-01-14 14:02:18 +01:00
DL6ER
f9d353af83 codacy 2017-01-14 13:36:43 +01:00
DL6ER
1b211cbe5c IE test 2017-01-14 13:33:15 +01:00
DL6ER
3aa1ffe114 Merge branch 'devel' into fix/IEonceagain 2017-01-14 13:27:00 +01:00
DL6ER
192d01fa3c Merge pull request #353 from C0rn3j/devel
Fixed querying ads over HTTPS
2017-01-14 09:38:43 +01:00
Martin
019910c319 Update queryads.js 2017-01-14 00:34:18 +01:00
Martin
4cd19dfb60 Update queryads.js 2017-01-14 00:33:31 +01:00
Martin
bd7be220b5 Update queryads.js 2017-01-14 00:22:56 +01:00
DL6ER
6760ba80a7 Allow multiple upstream DNS server selection 2017-01-13 17:49:16 +01:00
DL6ER
5114e4cbd5 Reinsert newline at end of file 2017-01-13 15:43:03 +01:00