Commit Graph

830 Commits

Author SHA1 Message Date
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
e73c521a71 Updated AdminLTE app 2017-01-21 01:53:00 +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
DL6ER
ed8790736b Create zip file which contains whitelist, blacklist and setupVars.conf 2017-01-20 16:41:36 +01:00
DL6ER
57c99cb04d Extend CORS check to IPv6. Fixes #1109 2017-01-18 13:28:25 +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
Mcat12
b96fc9ca73 Merge pull request #356 from pi-hole/tweak/Pi-hole-style
Add pi-hole.css file
2017-01-13 17:26:10 -05: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
0924f20214 Required backend changes in savesettings.php 2017-01-13 13:47:06 +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
DL6ER
a7261bd157 Merge pull request #355 from pi-hole/DNSSEC
Add DNSSEC to web UI
2017-01-12 21:40:23 +01:00
DL6ER
8ff6c77ad4 Make statistics not selectable 2017-01-12 17:15:13 +01:00
DL6ER
225c2791fe Remove debug statement 2017-01-12 16:30:18 +01:00
DL6ER
99fb6ad8ce Add DNSSEC to web UI 2017-01-12 16:02:09 +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
donmahallem
f8dc8f0ccb Unused variable $tmp
This variable is in its current form never used
2017-01-08 22:26:11 +01:00
donmahallem
8707e04c55 If domain removal fails unhide the domain
Currently the domain keeps hidden if the domain removal fails.
2017-01-08 18:26:55 +01:00
Mcat12
a05c03fec1 Merge pull request #345 from pi-hole/tweak/querylogactionbuttons
Prevent query log action buttons from line breaking
2017-01-08 11:16:01 -05:00
Mcat12
0cee14816f Merge pull request #346 from pi-hole/tweak/display_IPs
Display IP addresses in Top Clients and Forward Destinations
2017-01-08 11:13:31 -05:00
Mcat12
b2279add88 Merge pull request #343 from pi-hole/tweak/multiadd
Add multiple domains separated by whitespace
2017-01-08 10:57:36 -05:00