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

Added information about group assignment of whitelisted/blacklisted d… #2186

Merged
merged 8 commits into from
Apr 28, 2022
Merged

Added information about group assignment of whitelisted/blacklisted d… #2186

merged 8 commits into from
Apr 28, 2022

Conversation

martinbrose
Copy link
Contributor

@martinbrose martinbrose commented Apr 24, 2022 •
edited
Loading

…omains

Signed-off-by: Martin Brose 13284268+martinbrose@users.noreply.github.com

By submitting this pull request, I confirm the following:

  • 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?:

Resolves pi-hole/pi-hole#4581.
By adding additional information about group assignment of whitelisted/blacklisted domains.

How does this PR accomplish the above?:

Added a sentence below the box to enter whitelisted or blacklisted domains.

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

No additional changes necessary. This PR is a documentation change.
No additional comments within the code necessary. Hence, I left the related checkbox empty above.

@martinbrose martinbrose force-pushed the fix-pi-hole-4581-documentation_whitelist branch from 3c005a8 to fed14db Compare April 24, 2022 22:05
rdwebdesign
rdwebdesign requested changes Apr 24, 2022
View reviewed changes
Copy link
Member

@rdwebdesign rdwebdesign left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to add a link to the page.
Also, I think the note should be moved after the tabs box, like this:

image

                <div>
                  <p><strong>Note:</strong><br>
                    The domain or regex filter will be assigned to the Default Group.<br>
                    Other groups will need to be selected within <a href="groups-domains.php">Group Management > Domains</a>.</p>
                </div>

@martinbrose
Copy link
Contributor Author

@rdwebdesign Thanks for looking at my pull request and the proposed changes.
I agree with all of your points and have updated the PR.

@martinbrose martinbrose mentioned this pull request Apr 25, 2022
Merged
8 tasks
yubiuser
yubiuser reviewed Apr 25, 2022
View reviewed changes
groups-domains.php Outdated Show resolved Hide resolved
PromoFaux
PromoFaux previously requested changes Apr 25, 2022
View reviewed changes
groups-domains.php Outdated Show resolved Hide resolved
@martinbrose
Copy link
Contributor Author

Sorry, looks like I still need to sign the last two commits. Will do by the weekend.

@rdwebdesign
Copy link
Member

Could you please "squash" your commits (git rebase) and sign it?

martinbrose and others added 6 commits April 26, 2022 23:29
@martinbrose
Added information about group assignment of whitelisted/blacklisted d…
3297d5d 
…omains

Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>
@martinbrose
Moved note to own div class
b8afa3d 
Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>
@martinbrose
Added note to regular expresions also.
b330195 
Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>
@martinbrose
Added link and moved after the tabs box.
ff43b43 
Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>
@martinbrose @yubiuser
Update groups-domains.php
5fcb4fb 
Addressed review point to emphasize assignment to Default Group "only"

Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>
@martinbrose @PromoFaux
Update groups-domains.php
89442f3 
Make clear that assigning to other groups is optional.

Co-authored-by: Adam Warner <github@adamwarner.co.uk>
Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>
@martinbrose martinbrose force-pushed the fix-pi-hole-4581-documentation_whitelist branch from c62dc65 to 89442f3 Compare April 26, 2022 22:29
@martinbrose
Copy link
Contributor Author

I performed the git rebase HEAD~6 --signoff and then force pushed it. Hope that was it. Let me know if anything else is needed.

@rdwebdesign
Copy link
Member

rdwebdesign commented Apr 27, 2022 •
edited
Loading

Just a note:
When we say "you need to sign your commit" you just need to add to your commit message:
Signed-off-by: + your name + your e-mail,
like you did in first commit (Signed-off-by: Martin Brose <13284268+martinbrose@users.noreply.github.com>).

yubiuser
yubiuser requested changes Apr 27, 2022
View reviewed changes
groups-domains.php Outdated Show resolved Hide resolved
@martinbrose
Changed msg based on White/Blacklist or Domains
272a0b7 
Signed-off-by: martinbrose <13284268+martinbrose@users.noreply.github.com>
@yubiuser yubiuser requested a review from PromoFaux April 28, 2022 04:18
@yubiuser yubiuser dismissed PromoFaux’s stale review April 28, 2022 04:19

Changes were applied

@yubiuser yubiuser merged commit fae9e4b into pi-hole:devel Apr 28, 2022
@martinbrose
Copy link
Contributor Author

Thanks @PromoFaux @rdwebdesign @yubiuser for the quick and friendly reviews!

@martinbrose martinbrose deleted the fix-pi-hole-4581-documentation_whitelist branch April 28, 2022 18:08
@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/pi-hole-ftl-v5-16-web-v5-13-and-core-v5-11-1-released/56384/1

arevindh added a commit to arevindh/AdminLTE that referenced this pull request Jul 9, 2022
@arevindh @PromoFaux
@rdwebdesign @yubiuser @DL6ER @martinbrose @dependabot @dschaper @anthony-de-jong @Pingger
V5.13 (#57)
3b87dfd 
* Using the correct dimensions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add content type header

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add codespell.yml

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix some suggestions / ignore others

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Allow delete multiple items - Group pages

- add checkboxes, buttons and functions to groups page;
- add checkboxes, buttons and functions to clients page;
- add checkboxes, buttons and functions to domains page;
- add checkboxes, buttons and functions to adlists page;
- move function to `utils.js`;
- fix CSS after insert a new table column;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Pass config file path when reloading pihole-FTL.conf

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use DEFAULT_FTLCONFFILE

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add QUERY_SPECIAL_DOMAIN as new query status

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Review comments

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Fix dropdown background color (dark theme)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Show "other" destination as the last graphic item

- Show the item only if it's different than zero

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix `xo`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Added information about group assignment of whitelisted/blacklisted d… (pi-hole#2186)

* Added information about group assignment of whitelisted/blacklisted domains

Signed-off-by: martinbrose <13284268+martinbrose@users.noreply.github.com>

Co-authored-by: yubiuser <ckoenig@posteo.de>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>

* Applying the reviewer's suggestions

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix `data.columns` ID replaced by mistake

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Quote SQL reserved word and fix javascript output.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove unused variable

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Only remove last data point for line charts as it is not representative there (pi-hole#2195)

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Scale axes to integer

Signed-off-by: Christian König <ckoenig@posteo.de>

* Only remove last data point for line charts as it is not representative there

Signed-off-by: Christian König <ckoenig@posteo.de>

* Reduce border size of line charts

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fixing weird bug

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fixing minor inconsistencies

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove duplicate function declarations

and move functions to `func.php`.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* /var/log/ -> /var/log/pihole/

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Add missing columns `reply_type`, `reply_time`, `dnssec`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix multiplier (`reply_time` field unit is second)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Using global `utils.showAlert` function

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix prettier

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Removing old function call

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Clean text fields after success.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Keep field values when deleting + Fix typo

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Bump xo from 0.48.0 to 0.49.0

Bumps [xo](https://github.com/xojs/xo) from 0.48.0 to 0.49.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.48.0...v0.49.0)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Remove unused case

* Remove empty line before PHP opening tag

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Bump postcss from 8.4.12 to 8.4.14

Bumps [postcss](https://github.com/postcss/postcss) from 8.4.12 to 8.4.14.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.12...8.4.14)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump autoprefixer from 10.4.4 to 10.4.7

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.4.4 to 10.4.7.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md)
- [Commits](postcss/autoprefixer@10.4.4...10.4.7)

---
updated-dependencies:
- dependency-name: autoprefixer
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Drop IE 11

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unused eslint compat rule

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove repo specific PR template

Signed-off-by: Christian König <ckoenig@posteo.de>

* Also check wildcard domains for validity before adding

Signed-off-by: Christian König <ckoenig@posteo.de>

* Replace `queries` with `query_storage`

- use client names, when available;
- use column names instead of indexes;

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Change lighttpd log file names

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use IP if there is no client name

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fix DNSSEC info

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Fixing prettier line break

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use the same types, as returned by FTL

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Make it clearer where to find the debug token

Signed-off-by: Christian König <ckoenig@posteo.de>

* Use consistent output for both query lists

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use the correct endpoint for MAXLOGAGE

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Show suggested domains in group domains page

Signed-off-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>

* Fix possible XSS in `queryads.php`

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Base DHCP settings on default gateway address and not on IPV4_ADDRESS from setupVars.conf

Signed-off-by: Christian König <ckoenig@posteo.de>

* Do not use IPvX from setupVars in

Signed-off-by: Christian König <ckoenig@posteo.de>

* Fix indention

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove unnecessary else case

Signed-off-by: Christian König <ckoenig@posteo.de>

* Omit DHCPdomain

Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>

* Add a default option for PORTFILE

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Use API gateway endpoint

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unnecessary requirement

* Bump xo from 0.49.0 to 0.50.0

Bumps [xo](https://github.com/xojs/xo) from 0.49.0 to 0.50.0.
- [Release notes](https://github.com/xojs/xo/releases)
- [Commits](xojs/xo@v0.49.0...v0.50.0)

---
updated-dependencies:
- dependency-name: xo
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Use simpler logic

Co-authored-by: Adam Warner <me@adamwarner.co.uk>

Signed-off-by: yubiuser <ckoenig@posteo.de>

* Update dependabot.yml

Add requested reviewers 

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

* Fix part of issue pi-hole/FTL#1319

Signed-off-by: Pingger Shikkoken <Pingger@users.noreply.github.com>

* Bump prettier from 2.6.2 to 2.7.1

Bumps [prettier](https://github.com/prettier/prettier) from 2.6.2 to 2.7.1.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](prettier/prettier@2.6.2...2.7.1)

---
updated-dependencies:
- dependency-name: prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Upgrade stale action to v5

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add stale-issue-reason

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add github-action to dependabot

Signed-off-by: Christian König <ckoenig@posteo.de>

* Adjust debug log scroll position

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add .editorconfig

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add yml editorconfig style

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add editorconfig-checker action workflow

Signed-off-by: Christian König <ckoenig@posteo.de>

* Remove unused parameter

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Adjust .editorconfig to avoid warning messages

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Remove old debug output

and fix indentation.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>

* Add stickler-CI to test yaml and mkdowm files

Signed-off-by: Christian König <ckoenig@posteo.de>

* Exclude vendor files from stickler check

Signed-off-by: Christian König <ckoenig@posteo.de>

* Bump postcss-cli from 9.1.0 to 10.0.0

Bumps [postcss-cli](https://github.com/postcss/postcss-cli) from 9.1.0 to 10.0.0.
- [Release notes](https://github.com/postcss/postcss-cli/releases)
- [Changelog](https://github.com/postcss/postcss-cli/blob/master/CHANGELOG.md)
- [Commits](postcss/postcss-cli@9.1.0...10.0.0)

---
updated-dependencies:
- dependency-name: postcss-cli
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Switch to node 16.x

Signed-off-by: Christian König <ckoenig@posteo.de>

* Run stale workflow at 8:00 once per day

Signed-off-by: Christian König <ckoenig@posteo.de>

* Change FTL's default log file path from /var/log/pihole/pihole-FTL.log to /var/log/pihole/FTL.log

Signed-off-by: DL6ER <dl6er@dl6er.de>

* Use a random name when creating intermediat archive for teleporter

Signed-off-by: Christian König <ckoenig@posteo.de>

* Show names in top clients list from long-term data

Signed-off-by: Christian König <ckoenig@posteo.de>

* Address reviewer's comment

Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>

Signed-off-by: yubiuser <ckoenig@posteo.de>

* Fix close-issue-reason

Signed-off-by: Christian König <ckoenig@posteo.de>

* Add yamllint config, fix some indentation

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

Co-authored-by: Adam Warner <me@adamwarner.co.uk>
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br>
Co-authored-by: yubiuser <ckoenig@posteo.de>
Co-authored-by: DL6ER <dl6er@dl6er.de>
Co-authored-by: martinbrose <13284268+martinbrose@users.noreply.github.com>
Co-authored-by: Adam Warner <github@adamwarner.co.uk>
Co-authored-by: DL6ER <DL6ER@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net>
Co-authored-by: Anthony de Jong <11158888+anthony-de-jong@users.noreply.github.com>
Co-authored-by: Pingger Shikkoken <Pingger@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yubiuser yubiuser yubiuser approved these changes

@rdwebdesign rdwebdesign rdwebdesign approved these changes

@PromoFaux PromoFaux Awaiting requested review from PromoFaux

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@martinbrose @rdwebdesign @pralor-bot @PromoFaux @yubiuser