Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-03-04 00:19:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,776 Commits 24 Branches 113 Tags
c4cdcd9e943dfa0938a15aeddb3620cede37c19d
Commit Graph

114 Commits

Author SHA1 Message Date
Jacob Salmela
c4cdcd9e94 change verbiage Main Page to Dashboard 2017-02-23 11:35:58 -06: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
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
Antony Bailey
b65544639d Set Github logo in footer to be link to Github Org 2017-02-15 21:15:15 +00: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
Promofaux
bc4e5bb22a get Hostnames for query log page 2017-01-31 21:25:50 +00: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
9bb7f86b0f Apply fix also for overTime graph 2017-01-31 11:51:24 +01:00
DL6ER
5e728255fa Exclude whitelisted domains from showing up in the Top Ads List 2017-01-31 11:48:02 +01:00
DL6ER
c81e2591bd Remove debug mode 2017-01-30 23:44:14 +01:00
DL6ER
68a48aef2f added -> removed 2017-01-30 23:19:28 +01:00
DL6ER
940324551f Strip https:// and http:// in CORS test 2017-01-29 11:45:38 +01:00
Mcat12
11c28bc1be Merge pull request #369 from pi-hole/new/takeout 
Pi-hole Teleporter
 2017-01-28 19:03:47 -05:00
DL6ER
771c548a7f Renamed zip file 2017-01-27 22:11:02 +01:00
DL6ER
cd5f5bb936 Expanable box + renamed 2017-01-27 22:08:55 +01:00
DL6ER
2f80018f51 Echo OK if everything was successful 2017-01-27 22:02:26 +01:00
DL6ER
837f98e6ed Removed debug output 2017-01-27 22:01:11 +01:00
DL6ER
fc7cf611b4 log_and_die() is not defined 2017-01-27 21:59:22 +01:00
Mcat12
96826da1f2 Return numbers as numbers in summaryRaw 2017-01-26 21:33:18 -05:00
DL6ER
6af5fe73ae Added comments 2017-01-25 13:10:57 +01:00
DL6ER
3ba37d7793 Also allow (manually set dhcp-host=hostname,ip.add.re.ss) in table. As this has been added manually, don't allow deleting it 2017-01-25 13:08:36 +01:00
DL6ER
8646507f37 Make sure variables are empty before call of sscanf() 2017-01-25 11:47:20 +01:00
DL6ER
915bbb3e5d Add and remove static DHCPv4 releases using Settings page, prevent adding more than one entry with the same MAC address 2017-01-25 11:44:17 +01:00
DL6ER
1eb8f32755 Allow omitting host name 2017-01-25 10:13:51 +01:00
DL6ER
3d8246e4c3 Add static leases table to DHCP settings 2017-01-25 10:11:23 +01:00
DL6ER
fd0764d92c Codacy 2017-01-20 17:40:20 +01:00
DL6ER
9d09d61b7f Make selectable what should be imported from the uploaded archive 2017-01-20 16:43:33 +01:00
DL6ER
4633f800ab Import of whitelist / blacklist / wildcard list added 2017-01-20 16:43:31 +01:00
DL6ER
21a5b2af69 Add only files that exist (no empty files if the source is not there, e.g. no blacklist.txt) and don't backup adlists.default 2017-01-20 16:43:29 +01:00
DL6ER
cd12288625 Backup also setupVars.conf 2017-01-20 16:43:27 +01:00
DL6ER
db9f224ad9 Export wildcard blocked domains 2017-01-20 16:43:25 +01:00
DL6ER
4d6fa7db44 Removed debug statements 2017-01-20 16:43:23 +01:00
DL6ER
0826ae911b Added box to Settings page + added reading routines to takeout.php 
Conflicts:
	scripts/pi-hole/php/takeout.php
 2017-01-20 16:43:03 +01:00