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

No blocking isn't a fatal error #319

Merged
merged 4 commits into from
Dec 29, 2022
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 29, 2022

What does this PR aim to accomplish?:

Replace the red cross and "Pi-hole is offline!" when blocking is disabled by a better description (DNS is still running):

Screenshot from 2022-12-29 08-16-28
Screenshot from 2022-12-29 08-16-13

The information is clearly redundant (and has been before), we should consider removing the checkbox.


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 and I have tested my changes.
  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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@DL6ER DL6ER requested a review from a team December 29, 2022 07:20
@yubiuser yubiuser mentioned this pull request Dec 29, 2022
@yubiuser yubiuser requested a review from rdwebdesign December 29, 2022 09:32
@yubiuser
Copy link
Member

I pushed a commit that decouples the DNS status from blocking status. This reduces redundant information when blocking is disabled. It now only shows "Blocking disabled" in the "status field".

@rdwebdesign
Copy link
Member

rdwebdesign commented Dec 29, 2022

Suggestion:

This is not an error, but also it is not the default state.
What do you think about using yellow text if blocking is disabled?

@DL6ER
Copy link
Member Author

DL6ER commented Dec 29, 2022

Screenshot from 2022-12-29 18-36-55
Screenshot from 2022-12-29 18-37-02

👍 I'd approve but I cannot (this is my PR).

@yubiuser yubiuser merged commit 4096dfa into development Dec 29, 2022
@yubiuser yubiuser deleted the tweak/core_should-be_DNS branch December 29, 2022 18:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants