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.

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

Add ability to specify domains, lists, clients and group names as arrays #2707

Merged
merged 4 commits into from
Oct 24, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Sep 11, 2023

What does this implement/fix?

This PR accompanies the related FTL PR pi-hole/FTL#1629. It depends on #2700 which should be merged first to ease the reviewing process.

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

@DL6ER DL6ER marked this pull request as ready for review September 29, 2023 20:37
@DL6ER DL6ER requested review from rdwebdesign and a team September 29, 2023 20:37
@rdwebdesign
Copy link
Member

rdwebdesign commented Oct 7, 2023

Do we need to merge development-v6 here?

@DL6ER DL6ER force-pushed the tweak/domain_array branch from 48f27ef to a6ba2a8 Compare October 7, 2023 19:38
@DL6ER
Copy link
Member Author

DL6ER commented Oct 7, 2023

I just did it - it never hurts and we should pull in the theme changes.

@DL6ER DL6ER enabled auto-merge October 7, 2023 19:39
@rdwebdesign
Copy link
Member

Yeah... the theme was broken.
Now it's working.

Thanks.

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

Conflicts have been resolved.

scripts/pi-hole/js/utils.js Outdated Show resolved Hide resolved
@DL6ER
Copy link
Member Author

DL6ER commented Oct 24, 2023

Review comments addressed

@DL6ER DL6ER requested a review from rdwebdesign October 24, 2023 17:34
@DL6ER DL6ER merged commit 82f1965 into development-v6 Oct 24, 2023
7 checks passed
@DL6ER DL6ER deleted the tweak/domain_array branch October 24, 2023 19:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants