Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[RELEASE] Pi-hole WebAdmin 2.0.1 #287

Merged
merged 40 commits into from
Dec 23, 2016
Merged

[RELEASE] Pi-hole WebAdmin 2.0.1 #287

merged 40 commits into from
Dec 23, 2016

Conversation

PromoFaux
Copy link
Member

No description provided.

DL6ER and others added 30 commits December 15, 2016 18:10
@DL6ER
Try to resolve local IPs to hostnames if API_GET_CLIENT_HOSTNAME is true
f14b474
@DL6ER
Implemented function resolveIPs(&$array)
90bc298
@DL6ER
Improved function getForwardDestinations()
433b3c6
@DL6ER
Add API_GET_UPSTREAM_DNS_HOSTNAME option
b6adeb5
@DL6ER
Implemented the corresponding Settings part
cc7b03d
@DL6ER
codacy fix: added missing global statements
41f3a80
@DL6ER
Pass pointer to variable to function istrue() to prevent "undefined v…
5cda21d 
…ariable" errors
@DL6ER
Use $value instead of $array[$key]
04c1fed
@DL6ER
Refined function resolveIPs(&$array). It's now faster, cleaner and mo…
a0b4083 
…re readable
@DL6ER
Simplified function getBlockedQueries()
5cbc20f
@DL6ER
Greatly simplified function countBlockedQueries()
42e9644
@DL6ER
Removed preg_replace
a30d891
@DL6ER
== to ===
2d7ef8f
@DL6ER
Don't need to get $hostname anymore
c04c8f9
@DL6ER
Removed another $hostname = ...
10ef50a
@DL6ER
make function getBlockedQueries(\SplFileObject $log) compatible with …
815c4a7 
…extra logging format of dnsmasq
@DL6ER
Merge branch 'devel' into overhaulGetBlockesQueries
ef9e5cb
@DL6ER
Merge branch 'devel' into clienthosts
40edcf6
@DL6ER
Only look for query[A, i.e. query[A] and query[AAAA]
dfa2f07
@DL6ER
Change from getDnsQueriesAll($log) to getDnsQueries($log). Don't have…
ad5f111 
… to check if the line includes "query" since we only collect "query" lines now
@DL6ER
Add support for port != 80
623ef32
@PromoFaux
Merge pull request #275 from pi-hole/nonstandardport
4fb5417 
Add support for web server port != 80
@AzureMarker
Handle no IPv4 address when guessing initial DHCP
a0554e9
@AzureMarker
Fix typo
688f7dd
@DL6ER
Empty suggestion instead of 0.0.0.0
765db73
@DL6ER
Merge pull request #278 from pi-hole/Mcat12-fix-noIPv4-DHCP
17c4a43 
Handle no IPv4 address when guessing initial DHCP
@DL6ER
Merge branch 'devel' into overhaulGetBlockesQueries
a1d8874
@DL6ER
Merge branch 'devel' into clienthosts
41cd382 
Conflicts:
	data.php
@DL6ER
Fix small screen behavior
8e60791
@DL6ER
Merge pull request #283 from pi-hole/fix/smallscreens
8e3e9e3 
Fix display of summary on small screens
PromoFaux and others added 4 commits December 22, 2016 21:53
@PromoFaux
auto focus on password input
d25213e
@PromoFaux
Merge pull request #253 from pi-hole/clienthosts
f92d138 
Improve API calls for Top Clients and Forward Destinations
@DL6ER
Merge pull request #264 from pi-hole/overhaulGetBlockesQueries
2b2c3bb 
New logic for API functions getBlockedQueries() and countBlockedQueries()
@DL6ER
Merge pull request #284 from pi-hole/FOCUS
b29e3cd 
auto focus on password input
@jacobsalmela
Copy link
Contributor

jacobsalmela commented Dec 23, 2016 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@AzureMarker
Copy link
Contributor

AzureMarker commented Dec 23, 2016 •
edited by dschaper
Loading

Approved

Approved with PullApprove

1 similar comment
@jacobsalmela
Copy link
Contributor

jacobsalmela commented Dec 23, 2016 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@AzureMarker
Copy link
Contributor

AzureMarker commented Dec 23, 2016 •
edited by dschaper
Loading

Approved

Approved with PullApprove

1 similar comment
@dschaper
Copy link
Member

dschaper commented Dec 23, 2016 •
edited
Loading

Approved

Approved with PullApprove

@PromoFaux PromoFaux merged commit d4b0fd1 into master Dec 23, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@PromoFaux @jacobsalmela @AzureMarker @dschaper @DL6ER