DL6ER
1fd20eb5bf
Merge pull request #585 from moritzbeck01/domain-databases-examples-fix
...
Fixed a database example
2021-10-23 09:39:54 +02:00
moritzbeck01
f23fea3c67
Fixed a database example
...
When the whitelisted domain is assigned to group 2...
- all other will be blocked because they are a member of the default group which gets blocked
- client 1 will be blocked because it is a member of a blocklist that includes this domain (Example 2)
- client 2 will not be blocked because the whitelist overrides the block from the default group (Example 3 Step 3)
- client 3 will be blocked because it is a member of the default group
2021-10-22 23:34:00 +02:00
DL6ER
effab40b8e
Merge pull request #583 from bmn001/patch-1
...
Update uninstall.md
2021-10-20 18:59:35 +02:00
bmn001
b9292c9164
Merge branch 'master' into patch-1
2021-10-18 10:45:28 -07:00
DL6ER
a7f19d22f1
Merge pull request #569 from pi-hole/dependabot/pip/mkdocs-git-revision-date-localized-plugin-0.10.0
...
Bump mkdocs-git-revision-date-localized-plugin from 0.9.3 to 0.10.0
2021-10-17 13:12:23 +02:00
dependabot[bot]
bc87121583
Bump mkdocs-git-revision-date-localized-plugin from 0.9.3 to 0.10.0
...
Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin ) from 0.9.3 to 0.10.0.
- [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases )
- [Commits](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/compare/v0.9.3...v0.10.0 )
---
updated-dependencies:
- dependency-name: mkdocs-git-revision-date-localized-plugin
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-17 05:54:05 +00:00
DL6ER
eae15ff26c
Merge pull request #582 from pi-hole/dependabot/pip/mkdocs-material-7.3.3
...
Bump mkdocs-material from 7.2.6 to 7.3.3
2021-10-17 07:53:28 +02:00
bmn001
034982d51a
Update uninstall.md
...
typo
2021-10-16 16:36:44 -07:00
dependabot[bot]
63252f9323
Bump mkdocs-material from 7.2.6 to 7.3.3
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.2.6 to 7.3.3.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.2.6...7.3.3 )
---
updated-dependencies:
- dependency-name: mkdocs-material
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-10-16 10:04:40 +00:00
DL6ER
32fd09e771
Merge pull request #577 from davidjb/https-urls
...
Use https for URLs in docs and guides
2021-10-06 08:20:00 +02:00
David Beitey
c161e4b7b7
Use https for URLs in docs and guides
...
Signed-off-by: David Beitey <david@davidjb.com >
2021-10-05 18:10:25 +10:00
DL6ER
7f3a4b0004
Merge pull request #575 from pi-hole/REPLY_WHEN_BUSY
...
Change default order of options for REPLY_WHEN_BUSY
2021-09-30 18:04:39 +02:00
yubiuser
1a123cadb6
Change default order of options for REPLY_WHEN_BUSY
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-30 16:48:23 +02:00
DL6ER
5270a4370c
Merge pull request #573 from pi-hole/update/FTL_v5.10
...
Update documentation for FTL v5.10
2021-09-30 10:58:33 +02:00
DL6ER
664d8e8a63
Merge branch 'master' into update/FTL_v5.10
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-30 10:37:28 +02:00
DL6ER
4c400f867e
Merge pull request #574 from yubiuser/iRelay
...
Add `BLOCK_ICLOUD_PR` config option
2021-09-30 10:35:01 +02:00
yubiuser
eb910586e1
Copy paste error
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-30 09:29:16 +02:00
yubiuser
3a7d8303c0
Fix links
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-30 09:28:04 +02:00
yubiuser
2bf3bc5c1f
Add config option
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-30 09:23:48 +02:00
DL6ER
60195eadd3
Add BLOCK_TTL documentation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-27 12:09:22 +02:00
DL6ER
074b5fdf76
Add new PIHOLE_PTR=HOSTNAME option documentation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-27 12:01:30 +02:00
DL6ER
f3d042e731
Clarify when and where REPLY_ARRD{4,6} is used
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-27 11:45:59 +02:00
DL6ER
4485645120
Merge pull request #570 from yubiuser/fix_link
...
Fix link in coverage
2021-09-21 20:29:07 +02:00
yubiuser
f51ab6f803
Add slash
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-21 09:47:25 +02:00
yubiuser
5dac5af711
Fix link in coverage
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-21 09:45:18 +02:00
Isaac
00763e6266
Fix infinite redirect ( #567 )
2021-09-16 06:01:46 -07:00
DL6ER
73a7b00534
Merge pull request #566 from a1346054/fixes
...
Simple maintenance improvements
2021-09-16 11:52:28 +02:00
a1346054
93a501ab1b
Trim excess whitespace
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2021-09-15 23:30:48 +00:00
a1346054
5f606a16e4
Fix spelling
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2021-09-15 23:30:48 +00:00
a1346054
dee1973fe2
Remove executable file mode bit from text files
...
Signed-off-by: a1346054 <36859588+a1346054@users.noreply.github.com >
2021-09-15 23:30:48 +00:00
yubiuser
11bde099eb
Add missing FTL config options ( #564 )
...
* Add missing FTL config options
Signed-off-by: yubiuser <ckoenig@posteo.de >
* Fix TOC
Signed-off-by: yubiuser <ckoenig@posteo.de >
* Remove from Telnet API label
Signed-off-by: yubiuser <ckoenig@posteo.de >
* Address reviewers comments
Signed-off-by: yubiuser <ckoenig@posteo.de >
* Empty
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-14 09:25:57 +02:00
yubiuser
6db62978a9
Add Raspbian Bullseye to supported distros ( #563 )
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-12 13:05:22 -07:00
DL6ER
1218b1b2c3
Merge pull request #562 from pi-hole/tweak/regex_reply
...
Add ;reply= regex extension documentation
2021-09-12 08:08:52 +02:00
Adam Warner
4afd7cae70
Merge branch 'master' into tweak/regex_reply
2021-09-11 23:50:55 +01:00
DL6ER
a0169c020b
Merge pull request #554 from yubiuser/ftl_option
...
Add FTL config option `REPLY_WHEN_BUSY`
2021-09-11 23:24:34 +02:00
DL6ER
be65b155be
Merge branch 'master' into ftl_option
2021-09-11 23:23:52 +02:00
Adam Warner
cf60ac395b
Merge branch 'master' into tweak/regex_reply
2021-09-11 22:23:39 +01:00
Adam Warner
7fd80a7a3e
Merge pull request #557 from yubiuser/bullseye
...
Add Debian 11 and Ubuntu 21.x to supported distros
2021-09-11 22:23:03 +01:00
DL6ER
b7887ef0f8
Merge branch 'master' into ftl_option
2021-09-11 23:22:27 +02:00
Adam Warner
9708bee723
Merge branch 'master' into bullseye
2021-09-11 22:21:49 +01:00
DL6ER
1a3146826a
Add ;reply= regex extension documentation
...
Signed-off-by: DL6ER <dl6er@dl6er.de >
2021-09-11 21:36:16 +02:00
dependabot[bot]
b6223ce996
Bump markdownlint-cli2 from 0.2.0 to 0.3.0 ( #559 )
...
Bumps [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2 ) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/DavidAnson/markdownlint-cli2/releases )
- [Commits](https://github.com/DavidAnson/markdownlint-cli2/compare/v0.2.0...v0.3.0 )
---
updated-dependencies:
- dependency-name: markdownlint-cli2
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: XhmikosR <xhmikosr@gmail.com >
2021-09-09 08:05:52 +00:00
DL6ER
8d490521da
Merge pull request #561 from pi-hole/dependabot/pip/mkdocs-git-revision-date-localized-plugin-0.9.3
...
Bump mkdocs-git-revision-date-localized-plugin from 0.9.2 to 0.9.3
2021-09-05 13:26:34 +02:00
dependabot[bot]
79360e3afc
Bump mkdocs-git-revision-date-localized-plugin from 0.9.2 to 0.9.3
...
Bumps [mkdocs-git-revision-date-localized-plugin](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin ) from 0.9.2 to 0.9.3.
- [Release notes](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases )
- [Commits](https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/compare/v0.9.2...v0.9.3 )
---
updated-dependencies:
- dependency-name: mkdocs-git-revision-date-localized-plugin
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-05 11:10:29 +00:00
DL6ER
3ba5936404
Merge pull request #560 from pi-hole/dependabot/pip/mkdocs-material-7.2.6
...
Bump mkdocs-material from 7.2.5 to 7.2.6
2021-09-05 13:09:49 +02:00
dependabot[bot]
8302a78fc2
Bump mkdocs-material from 7.2.5 to 7.2.6
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.2.5 to 7.2.6.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.2.5...7.2.6 )
---
updated-dependencies:
- dependency-name: mkdocs-material
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
2021-09-04 10:22:10 +00:00
dependabot[bot]
425aebe058
Bump mkdocs-material from 7.2.2 to 7.2.5 ( #556 )
...
Bumps [mkdocs-material](https://github.com/squidfunk/mkdocs-material ) from 7.2.2 to 7.2.5.
- [Release notes](https://github.com/squidfunk/mkdocs-material/releases )
- [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/docs/changelog.md )
- [Commits](https://github.com/squidfunk/mkdocs-material/compare/7.2.2...7.2.5 )
---
updated-dependencies:
- dependency-name: mkdocs-material
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Dan Schaper <dan.schaper@pi-hole.net >
2021-09-03 18:59:40 -07:00
DL6ER
a484eb83f3
Merge pull request #558 from yubiuser/screenshot_os
...
Update OS warning screenshot
2021-09-03 07:43:23 +02:00
yubiuser
cb747bbf98
Update OS warning screenshot
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-02 06:54:44 +02:00
yubiuser
96325a7340
Add Debian 11 and Ubuntu 21.x to supported distros
...
Signed-off-by: yubiuser <ckoenig@posteo.de >
2021-09-01 07:05:44 +02:00