Commit Graph

1764 Commits

Author SHA1 Message Date
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
7e986ff008 modal dialog 2017-02-17 20:48:39 +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
Adam Warner
11b39e7b62 Merge pull request #401 from LasseSLambertsen/devel
Added hover effect to listview
2017-02-14 11:02:39 +00:00
LasseSLambertsen
6120f10b01 Update pi-hole.css 2017-02-14 11:25:13 +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
2a179b7d6e Merge pull request #398 from pi-hole/fix/teleportervalidation
Improve Teleporter's ZIP validation
2017-02-09 16:30:51 +01: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
Mcat12
cb6e7f8157 Merge pull request #397 from pi-hole/tweak/teleportererror
Give some more details on teleporter failure
2017-02-09 10:20:15 -05:00
DL6ER
279ea1b18b Give some more details on teleporter failure 2017-02-09 15:25:25 +01:00
Mcat12
37c5e9831a Merge pull request #396 from pi-hole/fix/settings.js
Fix syntax error in settings.js
2017-02-09 08:22:02 -05: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
Mcat12
3a002ce72a Merge pull request #393 from pi-hole/fix/queryads
Moving ampersand fixes Query Adlists exact search
2017-02-07 17:51:29 -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
74fc014e6b Merge pull request #390 from pi-hole/fix/IPv6field
Settings page - fix IPv6 field validation
2017-02-04 12:53:54 -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
Mcat12
25c962ac1e Merge pull request #387 from pi-hole/queryLog
Add hostnames to querylog page
2017-01-31 17:03:11 -05: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
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
e285a101d2 Merge pull request #383 from pi-hole/fix/whitelisted_ads
Exclude whitelisted domains from showing up in the Top Ads List
2017-01-31 11:58:48 +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