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

tabs for new domain/regex input #1177

Merged
merged 1 commit into from Mar 8, 2020
Merged

tabs for new domain/regex input #1177

merged 1 commit into from Mar 8, 2020

Conversation

Th3M3
Copy link
Contributor

@Th3M3 Th3M3 commented Mar 8, 2020

By submitting this pull request, I confirm the following: {please fill any appropriate checkboxes, e.g: [X]}

{Please ensure that your pull request is for the 'devel' branch!}

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

improve behavior for adding new domains and regex filters

How does this PR accomplish the above?:

  • add separate tabs for adding regular domains or regex filters.
  • replace type dropdown box and Add button with buttons Add to blacklist and Add to whitelist for faster interacting
  • corresponding semantics in messages when adding/editing/removing domains or regex filters.

add_new

What documentation changes (if any) are needed to support this PR?:

may needed after merging domain_regex_input into release/v5.0

Signed-off-by: Th3M3 <the_me@outlook.de>
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/rename-wildcard-blacklist-whitelist-because-it-is-misleading-and-lead-to-regex-errors/28867/80

@Th3M3
Copy link
Contributor Author

Th3M3 commented Mar 8, 2020

BTW: I saw a missing space character while testing/adding bad_domain.com to exact whilte/blacklist):

This is not due to this files and needs to be fixed somewhere else. I had no closer look at this so far.

@DL6ER
Copy link
Member

DL6ER commented Mar 8, 2020

@Th3M3 Thanks for pointing this out. I've seen it as well a few days ago and I'm pretty sue one of my open PRs already addresses this.

@DL6ER
Copy link
Member

DL6ER commented Mar 8, 2020

@Th3M3 Sorry for another ping but I just wanted to mention that I will set DCO to pass manually as you included a proper Sign-Off (just not the one DCO expected).

@DL6ER DL6ER self-requested a review March 8, 2020 14:51
@DL6ER DL6ER added this to the v5.0 milestone Mar 8, 2020
@Th3M3
Copy link
Contributor Author

Th3M3 commented Mar 8, 2020

... I will set DCO to pass manually as you included a proper Sign-Off (just not the one DCO expected).

Thanks @DL6ER. I am working with Github Desktop software for windows, wich sadly does not offer a proper a --signoff equivalent.

This time I saw what DCO expected in my signed-off line.
I will enter the line as per DCO's expection next time.

@DL6ER DL6ER merged commit cb0eb3e into pi-hole:tweak/domain_regex_input Mar 8, 2020
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.

None yet

3 participants