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 Admin Page v2.4 #372

Merged
merged 109 commits into from
Jan 29, 2017
Merged

[RELEASE] Pi-hole Admin Page v2.4 #372

merged 109 commits into from
Jan 29, 2017

Conversation

PromoFaux
Copy link
Member

By submitting this pull request, I confirm the following (please check boxes, eg [X])Failure to fill the template will close your PR:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

  • 10 (very familiar)

This template was created based on the work of udemy-dl.

DL6ER and others added 30 commits December 31, 2016 15:36
@DL6ER
Make ADD, SUB and GET compatible with the wildcard blocking list
8080afa
@DL6ER
Detect if wildcard blocking entry on Blacklists page
754fa11
@DL6ER
Put wildcard blocking entries into their own table
05f2df7
@DL6ER
Made everything working
a333019
@DL6ER
Hide h3 headings if list is empty
c409cf2
@DL6ER
codacy fixes
33714c5
@DL6ER
Implemented wildcard blocking in Query Log
28bea42
@DL6ER
Fix check for white/blacklist action on Query Log
fd3022a
@DL6ER
Improved counting algorithm for blocked queries. Added couting of blo…
2998e0b 
…cked DNS queries due to wildcard blocking
@DL6ER
Minor improvement of couting regexp
01d0f47
@DL6ER
Merge branch 'devel' into wildcard_blacklisting
3c3f6ef 
Conflicts:
	scripts/pi-hole/js/queries.js
@codacy-badger
Add Codacy badge
e84f2e4
@DL6ER
Fix overTime algorithms
d7afada
@AzureMarker
Only show token when authorized
7765eee
@DL6ER
Add error callback to Query Log page
ea71b64
@DL6ER
Clear processing label + remove table content
3c761b4
@AzureMarker
Merge pull request #337 from pi-hole/fix/maingraph
2386059 
Fix overTime algorithms
@AzureMarker
Add semicolon
459027e
@AzureMarker
Merge pull request #339 from pi-hole/tweak/querylogpage
9ff6561 
Add error callback to Query Log page
@AzureMarker
Do not hide the session info
ed496af 
The JS will handle that
@DL6ER
Merge pull request #340 from pi-hole/fix/leaked-token
c32b3c2 
Only show token when authorized and sanitize list action output
@AzureMarker
Sanitize error output
79f7d93
@AzureMarker
Merge pull request #341 from pi-hole/fix/add-domain-output
b2b5a00 
Sanitize error output
@PromoFaux
These don't need to be links
f53ea25
@AzureMarker
Preserve <a> but take off href
bac5bd7 
Need the styling provided by <a>
@AzureMarker
Merge pull request #342 from pi-hole/whyarestatusitemshyperlinks
f45ebbf 
These don't need to be links
@AzureMarker
Merge pull request #330 from codacy-badger/codacy-badge
29f3c2f 
Add a Codacy badge to README.md
@AzureMarker
Add multiple domains separated by whitespace
066bb14
@DL6ER
Revert "Add multiple domains separated by whitespace"
f5ac510 
This reverts commit 066bb14.
@DL6ER
Change function check_domain() to validate multiple domains separated…
3808f74 
… by spaces
@CLAassistant
Copy link

CLAassistant commented Jan 22, 2017 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@DL6ER
Copy link
Member

DL6ER commented Jan 28, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@AzureMarker
Copy link
Contributor

AzureMarker commented Jan 29, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@dschaper
Copy link
Member

dschaper commented Jan 29, 2017 •
edited
Loading

Approved

Approved with PullApprove

@jacobsalmela
Copy link
Contributor

jacobsalmela commented Jan 29, 2017 •
edited by dschaper
Loading

Approved

Approved with PullApprove

@AzureMarker AzureMarker merged commit 406877d into master Jan 29, 2017
@DL6ER
Copy link
Member

DL6ER commented Jan 29, 2017 •
edited
Loading

Approved 🚢

Approved with PullApprove

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.
8 participants
@PromoFaux @CLAassistant @DL6ER @AzureMarker @dschaper @jacobsalmela @codacy-badger @C0rn3j