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 Web Admin 2.3 #316

Merged
merged 119 commits into from
Jan 2, 2017
Merged

[RELEASE] Pi-hole Web Admin 2.3 #316

merged 119 commits into from
Jan 2, 2017

Conversation

PromoFaux
Copy link
Member

Staging

DL6ER and others added 30 commits December 16, 2016 17:32
@DL6ER
Add privacy mode
dbbc1a7
@PromoFaux @DL6ER
Organise folder structure a bit better... Seperates vendor packages f…
d0553ef 
…rom self-written scripts.
@AzureMarker @DL6ER
Move PHP scripts to scripts folder
2f65430
@AzureMarker @DL6ER
Fix php links in js files
fab94e0 
Also removed help.js because it's no longer used
@DL6ER
Moved more private files out of the root directory
e5a9826
@DL6ER
help.js has been removed
db8e0ba
@DL6ER
Merge branch 'devel' into privacymode
a608193 
Conflicts:
	data.php
@DL6ER
Allow underscores in domain names
4f76dd8
@DL6ER
Domain validation: Allow underscore in subdomain and domain names. Pr…
5bda56e 
…event _ and - in TLD
@DL6ER
Change temperature value when switching from gren to red from 45 to 60°C
87ac94a
@AzureMarker
Merge pull request #293 from pi-hole/fix/temperature
c095884 
Increase critical CPU temperature value
@AzureMarker
Merge pull request #292 from pi-hole/fix/allow_underscores_in_domains
bdb8a8e 
Allow underscores in domain names
@AzureMarker
Fix temperature readings on a few OSes
077d943 
Fixes #294
@AzureMarker
Merge pull request #296 from pi-hole/fix/tempReading
7c7cf24 
Fix temperature readings on a few OSes
@DL6ER
New routines for Top Items generation (use same criteria as Query Log)
d168dbf
@DL6ER
Be ablw to specify how many Top Items a user wants to see through the…
dfa1737 
… API call
@DL6ER
Improved comments
e83dc56
@DL6ER
New algorithm also for main graph (function getOverTimeData() and fun…
b38a6c8 
…ction getOverTimeData10mins())
@askmrsinh
Update header.php
67573a2 
Small change which makes the Pi-hole logo automatically resize when the hamburger menu icon is clicked.
@DL6ER
Silence two PHP warnings
7e45652
@AzureMarker
Merge pull request #300 from pi-hole/fix/istrue
1fc547c 
Fix istrue pointer reference
@AzureMarker
Allow custom port in CORS check
2254af7
@DL6ER
Only half of the work was done ;-)
72befd7
@DL6ER
Removed superfluous "http://" strings
563cba7
@DL6ER
Merge pull request #301 from pi-hole/fix/custom-port-cors
7cdfd5b 
Allow custom port in CORS check
@DL6ER
Allow missing TLD (like local host names as "raspberrypi")
ae3fcc3
@AzureMarker
Merge pull request #303 from pi-hole/fix/excludelist_allow_noTLD
21a21d8 
Exclude lists: allow also domains without TLD
@DL6ER
Merge pull request #299 from user501254/patch-1
5738806 
Make Pi-hole logo responsive in main-sidebar
@DL6ER
Add callback for click on main graph
53bdd3b
@DL6ER
Append to=... and until=... to API call if those parameters are passe…
3ddca5c 
…d to queries.php
PromoFaux and others added 24 commits January 1, 2017 20:10
@PromoFaux
Merge pull request #304 from pi-hole/new/clickonmaingraph
57fcb34 
Clicking on main graph redirects to the Query Log page
@PromoFaux
Merge pull request #309 from pi-hole/new/dhcpv6settings
79073e1 
Add DHCP lease time settings.
@DL6ER
Some fixes to some warnings and errors
2d72ae7
@DL6ER
Merge branch 'devel' into TopItems
3cf0016
@DL6ER
Exit TopLists loop early, but not too early
33d6f6d
@DL6ER
Add 'Flush Logs' button also to the Query Logging dialog box
17df978
@DL6ER
Add tooltips to the advanced DNS check boxes
a6ec11c
@DL6ER
Resolve "Undefined index: DHCP_LEASETIME" warning
f4e5339
@DL6ER
Fix indentation of "Privacy mode" check box
acc3616
@DL6ER
Show warning if PHP has been compiled without IPv6 support (compile f…
7252338 
…lag --disable-ipv6)
@DL6ER
Add glowing notification that users should disabled their router's DH…
4209320 
…CP server when first activating the DHCP server
@DL6ER
Strg+Return -> Go immediately to Settings page
ed01434
@DL6ER
Codacy fixes ( Strings must use doublequote. )
207be6b
@DL6ER
Merge pull request #297 from pi-hole/TopItems
32464ab 
Rewrite Top Items computation
@DL6ER
Fix three codacy issues
6da6805
@AzureMarker
Merge pull request #319 from pi-hole/codacy
76d7329 
Fix three codacy issues
@DL6ER
Add infotext
b41e4e0
@DL6ER
Logout -> Go to Settings page instead of Main page (will show log in …
06cc3ca 
…page again)
@DL6ER
Rephrase explaination what the code is doing because it is doing more…
fba19e6 
… than we expected
@AzureMarker
Merge pull request #320 from pi-hole/tweak/makecommentpretty
ec36131 
Rephrase explanation what the code is doing because it is doing more than we expected
@DL6ER
Try to detect it also on non-Unix platforms
8220c27
@DL6ER
Display which page will be shown when hitting Return + Logout always …
1438a9d 
…goes to the very same URL
@DL6ER
Fix codacy
0e37bc8
@DL6ER
Merge pull request #317 from pi-hole/tweak/settings
be36de8 
Several minor tweaks for the Settings page
@dschaper
Copy link
Member

dschaper commented Jan 2, 2017 •
edited
Loading

Approved

Approved with PullApprove

1 similar comment
@jacobsalmela
Copy link
Contributor

jacobsalmela commented Jan 2, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@AzureMarker
Merge pull request #318 from pi-hole/tweak/loginpage
3e139b1 
Ctrl+Return on login page -> Go immediately to Settings page
@AzureMarker
Copy link
Contributor

AzureMarker commented Jan 2, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@dschaper
Copy link
Member

dschaper commented Jan 2, 2017 •
edited
Loading

Approved

Approved with PullApprove

@AzureMarker AzureMarker merged commit f76317b into master Jan 2, 2017
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.
7 participants
@PromoFaux @dschaper @jacobsalmela @AzureMarker @DL6ER @askmrsinh @JdenHartog