From d25213e729573c0c3d3ae3a68fefe424107b48d6 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Thu, 22 Dec 2016 21:53:53 +0000 Subject: [PATCH 1/5] auto focus on password input --- php/loginpage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/loginpage.php b/php/loginpage.php index f4abf4a0..a0366dfb 100644 --- a/php/loginpage.php +++ b/php/loginpage.php @@ -15,7 +15,7 @@
- +
From 088bf40ce1803f40594c5b36a2d635f7de78ca20 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Fri, 23 Dec 2016 11:02:43 -0500 Subject: [PATCH 2/5] Convert Adlist search string to lowercase Fixes https://www.reddit.com/r/pihole/comments/5jx91b/query_adlists_search_partial_match_feature_request/ --- js/pihole/queryads.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/pihole/queryads.js b/js/pihole/queryads.js index 86822e51..e8b91be4 100644 --- a/js/pihole/queryads.js +++ b/js/pihole/queryads.js @@ -16,7 +16,7 @@ function eventsource() { } var host = window.location.host; - var source = new EventSource("http://"+host+"/admin/php/queryads.php?domain="+domain.val()+"&"+exact); + var source = new EventSource("http://"+host+"/admin/php/queryads.php?domain="+domain.val().toLowerCase()+"&"+exact); // Reset and show field ta.empty(); From d131f387ddd255efbb07f075d121839b84c3a023 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 23 Dec 2016 19:43:25 +0000 Subject: [PATCH 3/5] match pi-hole core templates --- .github/ISSUE_TEMPLATE.md | 41 +++++++++++++++++++++++++++++--- .github/PULL_REQUEST_TEMPLATE.md | 29 +++++++++++++++++----- 2 files changed, 61 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 04303614..07fc4352 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,7 +1,42 @@ -##### Expected Behaviour: +**In raising this issue, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your issue:** + +- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md). +- [] The issue I am reporting can be *replicated* +- [] The issue I'm reporting isn't a duplicate (see [FAQs](https://github.com/pi-hole/pi-hole/wiki/FAQs), [closed issues](https://github.com/pi-hole/pi-hole/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), and [open issues](https://github.com/pi-hole/pi-hole/issues)). + +**How familiar are you with the codebase?:** + +- [] 1 (very unfamiliar) +- [] 2 +- [] 3 +- [] 4 +- [] 5 +- [] 6 +- [] 7 +- [] 8 +- [] 9 +- [] 10 (very familiar) + +--- +**[FEATURE REQUEST | QUESTION | OTHER]:** + +Please [submit your feature request here](https://discourse.pi-hole.net/c/feature-requests), so it is votable by the community. It's also easier for us to track. + +**[BUG | ISSUE] Expected Behaviour:** -##### Actual Behaviour: +**[BUG | ISSUE] Actual Behaviour:** -##### Steps to reproduce this issue: +**[BUG | ISSUE] Steps to reproduce:** + +- +- +- +- + +**(Optional) Debug token generated by `pihole -d`:** + +`` + +_This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 047c8b05..9d6310d0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,28 @@ -Fixes #[issue number] . +**By submitting this pull request, I confirm the following (please check boxes, eg [X]) _Failure to fill the template will close your PR_:** -Changes proposed in this pull request: +***Please submit all pull requests against the `development` branch. Failure to do so will delay or deny your request*** -- +- [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md). +- [] I have checked that [another pull request](https://github.com/pi-hole/pi-hole/pulls) 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?:** -- +- [] 1 (very unfamiliar) +- [] 2 +- [] 3 +- [] 4 +- [] 5 +- [] 6 +- [] 7 +- [] 8 +- [] 9 +- [] 10 (very familiar) -@pi-hole/dashboard +--- +_{replace this line with your pull request content}_ + + +_This template was created based on the work of [`udemy-dl`](https://github.com/nishad/udemy-dl/blob/master/LICENSE)._ From 1e0aa8a822c0b57cae2163ee53638c12a9b62328 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 23 Dec 2016 19:47:01 +0000 Subject: [PATCH 4/5] replace 1-10 checkboxes. Will look tidier overall. --- .github/ISSUE_TEMPLATE.md | 13 ++----------- .github/PULL_REQUEST_TEMPLATE.md | 13 ++----------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 07fc4352..eac55931 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,4 +1,4 @@ -**In raising this issue, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your issue:** +**In raising this issue, I confirm the following (please check boxes, eg [X] - no spaces) Failure to fill the template will close your issue:** - [] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md). - [] The issue I am reporting can be *replicated* @@ -6,16 +6,7 @@ **How familiar are you with the codebase?:** -- [] 1 (very unfamiliar) -- [] 2 -- [] 3 -- [] 4 -- [] 5 -- [] 6 -- [] 7 -- [] 8 -- [] 9 -- [] 10 (very familiar) + --- **[FEATURE REQUEST | QUESTION | OTHER]:** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9d6310d0..6e763b85 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,4 @@ -**By submitting this pull request, I confirm the following (please check boxes, eg [X]) _Failure to fill the template will close your PR_:** +**By submitting this pull request, I confirm the following (please check boxes, eg [X] - no spaces) _Failure to fill the template will close your PR_:** ***Please submit all pull requests against the `development` branch. Failure to do so will delay or deny your request*** @@ -10,16 +10,7 @@ **How familiar are you with the codebase?:** -- [] 1 (very unfamiliar) -- [] 2 -- [] 3 -- [] 4 -- [] 5 -- [] 6 -- [] 7 -- [] 8 -- [] 9 -- [] 10 (very familiar) + --- _{replace this line with your pull request content}_ From a2e062cee91c12885d01d6c39f5cfab9b93968e5 Mon Sep 17 00:00:00 2001 From: Promofaux Date: Fri, 23 Dec 2016 19:49:11 +0000 Subject: [PATCH 5/5] nicer --- .github/ISSUE_TEMPLATE.md | 2 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index eac55931..6f277b21 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -6,7 +6,7 @@ **How familiar are you with the codebase?:** - +_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_ --- **[FEATURE REQUEST | QUESTION | OTHER]:** diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 6e763b85..2c391428 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -10,7 +10,7 @@ **How familiar are you with the codebase?:** - +_{replace this text with a number from 1 to 10, with 1 being not familiar, and 10 being very familiar}_ --- _{replace this line with your pull request content}_