Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-23 04:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,823 Commits 19 Branches 112 Tags
c42c06be2dea820da599e1598b51a6aa6c39aafc
Commit Graph

744 Commits

Author SHA1 Message Date
DL6ER
e695f490c0 Add datetimestamp to downloaded filename (e.g. "pi-hole-teleporter_2017-03-05_01-37-52.zip") 2017-03-05 13:38:06 +01:00
Barisi
5f4578738f changed whitespace to non-breaking space 2017-03-04 12:59:14 +00:00
Barisi
04a9987cb9 Added space between temperature reading and unit 2017-03-03 23:28:58 +00: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
4182a83bd4 Codacy and styling 2017-03-03 14:39:51 +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
8cca0b96e4 Merge branch 'devel' into new/FTL-integration 2017-03-01 00:05:11 +01:00
DL6ER
a2f2fbfccf Show info text 2017-02-28 23:59:24 +01:00
DL6ER
220b31a714 Try to derive number of cores from /proc/cpuinfo if nproc is not available 2017-02-28 23:51:58 +01:00
DL6ER
107ae02887 Round load display to precision two 2017-02-28 23:41:03 +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
276f2c1628 Allow usage of Teleporter and QueryAds backend only if a valid session is detected (#415) 2017-02-27 22:32:03 +01:00
DL6ER
f328595d6d Remove [ ] from SERVER_NAME variable (#405) 2017-02-27 22:17:46 +01:00
Dan Schaper
110ab455b6 Merge pull request #399 from pi-hole/new/OnlineDebug 
Added online debug log creator
 2017-02-27 12:30:48 -08:00
Dan Schaper
5a19394977 Add undocumented -w flag to alter the countdown behavior. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-02-27 11:12:18 -08:00
Adam Warner
0abee8efb6 Merge pull request #412 from pi-hole/tweak/customDisableTimeGlovalCountdown 
Show disable timer across all devices
 2017-02-24 10:42:18 +00:00
Jacob Salmela
c4cdcd9e94 change verbiage Main Page to Dashboard 2017-02-23 11:35:58 -06:00
DL6ER
9471594bdf Move tailLog function into own file 2017-02-23 15:12:23 +01:00
DL6ER
20ce214c9f Add checkbox if the user wants his debug log to be uploaded automatically 2017-02-22 19:47:58 +01:00
DL6ER
e422e820d1 Show disable timer across all devices 2017-02-22 15:44:07 +01:00
DL6ER
081d8f35c6 Merge branch 'devel' into new/FTL-integration 
Conflicts:
	api.php
 2017-02-22 12:19:10 +01:00
DL6ER
d1ed5652a8 Another small change to ensure the remining line endings are also gone 2017-02-20 23:11:38 +01:00
Adam Warner
81ed75eb84 same thing on gravity.sh.php 2017-02-20 21:43:37 +00:00
Adam Warner
94539d3952 whitespace in licence header causing issues with query adlists page 2017-02-20 21:41:55 +00:00
DL6ER
d7fdaf9273 Fix whitespace caused by added license headers 2017-02-19 21:19:02 +01:00
DL6ER
dc61eb82d4 Show summary if no arguments are passed to API 2017-02-19 19:10:49 +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
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
18d914322b add an id to the label that gets updated 2017-02-18 00:43:50 +00:00
Promofaux
4bfcb3e750 formatting 2017-02-17 22:10:39 +00:00
Promofaux
ff5cf63aaf Move modal dialog to footer.php so it works from anywhere 2017-02-17 21:01:54 +00:00
Promofaux
0e9976902b new button 2017-02-17 20:47:28 +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
Antony Bailey
b65544639d Set Github logo in footer to be link to Github Org 2017-02-15 21:15:15 +00:00
DL6ER
1c73016f6a Modified scripts in scripts/pi-hole/php 2017-02-14 15:00:11 +01:00
DL6ER
9765b38ec2 Added online debug log creator 2017-02-10 12:22:59 +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
f5c4065b89 Check if time zone is set the mute some PHP warnings 2017-02-06 15:59:20 +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
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