Commit Graph

168 Commits

Author SHA1 Message Date
Mcat12
f87a94de33 Add CSRF token to ad list section 2017-04-12 21:22:49 -04:00
Mcat12
52a5fb62ff Merge pull request #466 from pi-hole/fix/csrf-security
Add CSRF token
2017-04-06 16:22:18 -04:00
Mcat12
acc83345fd Merge pull request #252 from pi-hole/customizeadlists
Manage adlists
2017-04-06 16:16:05 -04:00
Mcat12
3d0a3506d4 Small HTML compatibility change: <tt> to <code> 2017-04-04 21:03:23 -04:00
Mcat12
1e748446df Require CSRF token for Teleporter 2017-04-04 21:02:48 -04:00
Mcat12
21bd036af6 Merge remote-tracking branch 'origin/devel' into fix/csrf-security 2017-04-04 20:40:31 -04:00
DL6ER
7e68fdecff Make sure license comment is only outputted after header.php has prepared all the stuff that need to be done beforehand. Fixes #450 2017-04-03 10:17:05 +02:00
Mcat12
fe7f3d3873 Require CSRF token when changing settings 2017-04-02 20:04:39 -04:00
Mcat12
db54cdafe7 Change wording of block list label 2017-03-31 20:19:09 -04:00
Mcat12
7a5c8e899e Use button to remove lists 2017-03-31 20:16:58 -04:00
Mcat12
87b92d425c Add delete checkbox 2017-03-31 18:33:10 -04:00
Mcat12
1f6c95a2c0 Lists are no longer reset on updates 2017-03-31 18:23:39 -04:00
Adam Warner
42f4c51f08 move to a more prominent location 2017-03-31 21:07:31 +01:00
Adam Warner
c11172d7c4 modify to work with changes in pihole#1365 2017-03-31 21:05:53 +01:00
Flo
f9151c1e9b Update settings.php 2017-03-26 14:50:01 +02:00
Adam Warner
6038431abf Merge branch '222343a3476a8994be07d3aba813a002d811fe8f' into devel 2017-03-16 22:12:08 +00:00
DL6ER
222343a347 Do not send "action" to teleporter if we want to export settings 2017-03-14 13:57:46 +01:00
DL6ER
832c7f0701 Merge pull request #434 from pi-hole/fix/SettingsFallbackDNSlistening
Fix fallback for default listening behavior
2017-03-10 14:43:26 +01:00
DL6ER
72894238c1 Merge pull request #436 from pi-hole/tweak/noIPv6DNSserverswoIPv6connectivity
IPv6 upstream servers: Require IPv6 scope global address
2017-03-08 23:03:17 +01:00
DL6ER
ba9f0a995c Connect IPv6 detection of the DHCP server 2017-03-07 22:09:01 +01:00
DL6ER
31e8fcfffe HEX it 2017-03-07 22:07:10 +01:00
DL6ER
d64c0aa48f Extend test to accept both ULA and GUA addresses as valid IPv6 addresses 2017-03-07 21:47:51 +01:00
DL6ER
120c7ad6eb Remove cputime display 2017-03-07 17:07:53 +01:00
DL6ER
e90d916356 Strict checking for only the first three bits 2017-03-07 16:58:10 +01:00
DL6ER
8e1c9368ee Test if IPv6 address is within 2000::/3 address range (according to RFC 4291) 2017-03-07 16:56:52 +01:00
DL6ER
a8deaddc5e Improve FTL information box on the Settings page 2017-03-07 16:45:22 +01:00
DL6ER
8c7da67b36 Allow selection of IPv6 upstream DNS servers only if IPv6 scope global address has been detected 2017-03-07 14:02:17 +01:00
DL6ER
21283887ff Fix fallback for default listening behavior (according to what we did in https://github.com/pi-hole/pi-hole/pull/1291) 2017-03-06 11:59:21 +01:00
DL6ER
41cadc5b48 Merge pull request #423 from pi-hole/new/IPv6upstreamDNSservers
Add IPv6 upstream server settings
2017-03-03 14:43:48 +01:00
DL6ER
6adbcea7b1 Loop over all available DNS server entries instead of only 12 2017-03-03 14:42:04 +01:00
DL6ER
4182a83bd4 Codacy and styling 2017-03-03 14:39:51 +01:00
DL6ER
d9cbbde050 Read *all* DNS records in setupVars.conf (remove limitation to 12 servers) 2017-03-03 14:17:28 +01:00
DL6ER
40fd8b8b1d Add IPv6 upstream servers 2017-03-02 22:38:38 +01:00
DL6ER
57d62879bc Merge branch 'devel' into new/FTL-integration 2017-03-01 12:44:51 +01:00
DL6ER
6cef1b3085 Setup interface listening behavior of dnsmasq 2017-03-01 11:25:28 +01:00
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
edd52d0de4 Show FTL version on Settings page 2017-02-22 11:09:08 +01:00
DL6ER
b54a2764e3 Make FTL healtcheck box collapsed on settings page 2017-02-19 19:25:04 +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
9b799819bf Added header to main PHP files 2017-02-14 14:57:58 +01:00
Mcat12
b586cb85ba Merge branch 'devel' into fix/IPv6field 2017-02-04 12:51:25 -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
f428d98fec Pleasing codacy 2017-02-01 15:59:01 +01:00
DL6ER
a21b5e1cd9 Remove ineffective alt="..." 2017-01-31 22:53:19 +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
DL6ER
ba05330cf5 Improved message 2017-01-28 22:07:31 +01:00