Commit Graph

2898 Commits

Author SHA1 Message Date
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
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
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
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
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
b9f1c57bbb Codacy fixes 2017-01-25 12:04:28 +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
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