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
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
18d914322b
add an id to the label that gets updated
2017-02-18 00:43:50 +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
4bfcb3e750
formatting
2017-02-17 22:10:39 +00:00
Promofaux
e54ad166cb
Codacy loves a complain
2017-02-17 21:15:10 +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
Promofaux
5076de084b
javascript
2017-02-17 20:46:43 +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
8c2fbde5ab
Fix syntax error
2017-02-09 00:39:53 +01:00
Mcat12
ca8debea80
Merge pull request #394 from pi-hole/fix/PHPwarningCentOS
...
Check if time zone is set to mute some PHP warnings
2017-02-07 17:54:47 -05:00
DL6ER
f5c4065b89
Check if time zone is set the mute some PHP warnings
2017-02-06 15:59:20 +01:00
DL6ER
13a73f5217
Move ampersand
2017-02-06 15:40:49 +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
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
Mcat12
1951453de7
Merge pull request #371 from pi-hole/updateAdminLTE
...
[WIP] Update AdminLTE v2.1.2 -> v2.3.8
2017-02-02 18:41:58 -05:00
Mcat12
b7ff4656b4
Merge pull request #388 from pi-hole/new/DHCPdynamictostatic
...
Copy leases to static table
2017-02-02 18:37:01 -05:00
Mcat12
1f6537ae7d
Remove commented code
2017-02-02 18:23:50 -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
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
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
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
494e9c2884
Merge pull request #382 from pi-hole/tweak/list-buttons
...
Move list buttons out of the way on small screens
2017-01-31 12:07:13 +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