Commit Graph

91 Commits

Author SHA1 Message Date
DL6ER
c99f23c995 Codacy 2017-02-22 17:35:31 +01:00
DL6ER
e422e820d1 Show disable timer across all devices 2017-02-22 15:44:07 +01:00
Adam Warner
80ad3bac4d Merge pull request #406 from pi-hole/customDisable
Custom disable time
2017-02-19 02:02:31 +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
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
e54ad166cb Codacy loves a complain 2017-02-17 21:15:10 +00:00
Promofaux
5076de084b javascript 2017-02-17 20:46:43 +00:00
DL6ER
8c2fbde5ab Fix syntax error 2017-02-09 00:39:53 +01:00
DL6ER
13a73f5217 Move ampersand 2017-02-06 15:40:49 +01:00
Mcat12
b586cb85ba Merge branch 'devel' into fix/IPv6field 2017-02-04 12:51:25 -05:00
Mcat12
1f6537ae7d Remove commented code 2017-02-02 18:23:50 -05: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
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
Mcat12
bc484338b4 Fit closer to Bootstrap layout sizes 2017-01-30 17:05:55 -05:00
Mcat12
f53f2e8836 Move buttons out of the way on small screens 2017-01-30 16:52:24 -05:00
DL6ER
fb0ca79584 Ensure input fields are always at the bottom of the table (and stay there when the user applies custom sorting) 2017-01-25 13:30:25 +01:00
DL6ER
b9f1c57bbb Codacy fixes 2017-01-25 12:04:28 +01:00
DL6ER
3d8246e4c3 Add static leases table to DHCP settings 2017-01-25 10:11:23 +01:00
DL6ER
f840caf173 codacy... 2017-01-16 16:32:29 +01:00
DL6ER
09f5bfdea8 Added cookie test of login page 2017-01-16 15:45:44 +01:00
DL6ER
3be0cb0de4 Codacy 2017-01-14 15:36:30 +01:00
DL6ER
a6b3bc1cb4 Add IE mode to PHP scripts 2017-01-14 15:29:23 +01:00
DL6ER
b7b7217fb0 Implemented filter functions 2017-01-14 14:02:18 +01:00
DL6ER
f9d353af83 codacy 2017-01-14 13:36:43 +01:00
DL6ER
1b211cbe5c IE test 2017-01-14 13:33:15 +01:00
DL6ER
3aa1ffe114 Merge branch 'devel' into fix/IEonceagain 2017-01-14 13:27:00 +01:00
DL6ER
192d01fa3c Merge pull request #353 from C0rn3j/devel
Fixed querying ads over HTTPS
2017-01-14 09:38:43 +01:00
Martin
019910c319 Update queryads.js 2017-01-14 00:34:18 +01:00
Martin
4cd19dfb60 Update queryads.js 2017-01-14 00:33:31 +01:00
Martin
bd7be220b5 Update queryads.js 2017-01-14 00:22:56 +01:00
DL6ER
6760ba80a7 Allow multiple upstream DNS server selection 2017-01-13 17:49:16 +01:00
DL6ER
5114e4cbd5 Reinsert newline at end of file 2017-01-13 15:43:03 +01:00
DL6ER
d597b52f49 Some more IE compatibility tricks 2017-01-13 15:39:28 +01:00
DL6ER
6958f50039 Change data-mask extension to one that supports both IPv4 and IPv6 addresses. Add IPv6 DNS server fields on the settings page 2017-01-13 13:37:36 +01:00
Martin
fed83cb49f Fix HTTPS
small edit
2017-01-12 11:25:36 +01:00
Martin
fd21d04bfb Fixed querying ads over HTTPS
changed http: to // to always use the correct protocol

Fixes #352
2017-01-12 11:07:49 +01:00
DL6ER
fce8fe6021 Show headings if entry is added to list 2017-01-11 22:38:50 +01:00
DL6ER
e24c35a528 Merge branch 'devel' into wildcard_blacklisting 2017-01-11 18:26:10 +01:00
DL6ER
3c0c92e8b1 Hide "Whitelist" button on wildcard blocked entries (Query Log page) 2017-01-11 12:41:35 +01:00
Mcat12
c98399d6b1 Merge pull request #350 from pi-hole/tweak/querylogbuttonserrormessage
Add more detailed error output recently added to the lists page to the query log action buttons
2017-01-10 18:01:19 -05:00
DL6ER
bc5dbac376 Merge pull request #347 from donmahallem/patch-1
Unhide the domain if the list removal fails
2017-01-09 16:54:07 +01:00
DL6ER
bd36baa18b Merge branch 'devel' into wildcard_blacklisting 2017-01-09 14:51:54 +01:00
DL6ER
9eadc26d30 Add more detailed error output recently added to the lists page to the query log action buttons 2017-01-09 14:40:40 +01:00