Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pi-hole/pi-hole.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-02Release 5.12 (#4889)v5.12Adam Warner
2022-08-26Add jq as dependency and remove json_extract (#4878)yubiuser
**What does this PR aim to accomplish?:** Adds `jq` as dependency and removes the now obsolete `json_extract` function. `jq` is a small dependency and adds powerfull json abilities. With `FTL v6` we will have a whole new json-based API where `jq` might be needed anyway. Also for `PADD` to interact with `FTL v6`, `jq` will be a requirement: https://github.com/pi-hole/PADD/pull/247 --- **By submitting this pull request, I confirm the following:** 1. I have read and understood the [contributors guide](https://docs.pi-hole.net/guides/github/contributing/), 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](https://opensource.org/licenses/EUPL-1.1) 5. I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html)) --- - [x] I have read the above and my PR is ready for review. _Check this box to confirm_
2022-08-25Remove json_extract functionjqChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-25Add jq to dependenciesChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-24Remove the email function (#4870)yubiuser
- **What does this PR aim to accomplish?:** We offered to set an administrator email which was shown on the blockpage. With the removal of the blockpage (https://github.com/pi-hole/pi-hole/pull/3910) this function is not needed anymore. Corresponding web interface PR: https://github.com/pi-hole/AdminLTE/pull/2301
2022-08-23Merge pull request #4875 from pi-hole/tweak/version-fileAdam Warner
Store versions as key/value pairs rather than space delimeted values
2022-08-23Review suggestions (and shellcheck complaints)Adam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-22Store versions as key/value pairs rather than space delimeted valuestweak/version-fileAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-21Remove it also from index.php together with more unused variablesemailChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-18Merge pull request #4862 from pi-hole/tweak/lighttpd_headersyubiuser
Add security-related headers to Pi-hole web interface
2022-08-18Remove the email functionChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-17Merge pull request #3910 from pi-hole/removeblockpagefunctionalityAdam Warner
Remove the advanced functionality of the 404 page (Blockpage)
2022-08-17Merge branch 'development' into removeblockpagefunctionalityyubiuser
2022-08-17Merge pull request #4843 from MichaIng/patch-1yubiuser
Skip web server dialog if --disable-install-webserver has been passed
2022-08-17Merge branch 'development' into removeblockpagefunctionalityAdam Warner
2022-08-17Skip web server dialog if --disable-install-webserver has been passedMichaIng
Prior to https://github.com/pi-hole/pi-hole/pull/4772, the web server dialog was skipped if --disable-install-webserver was passed (INSTALL_WEB_SERVER=false). This commit restores this behaviour. Signed-off-by: MichaIng <micha@dietpi.com>
2022-08-08Merge pull request #4864 from pi-hole/debug_FTL_branchyubiuser
Extend FTL information in debug log
2022-08-08Remove the blockpage-focussed customisations to query.shremoveblockpagefunctionalityAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08Do not remove blockingpage.css from existing installations as some users ↵Christian König
might use them for custom.php Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08Apply reviewers suggestion for inline CSSyubiuser
Co-authored-by: RD WebDesign <github@rdwebdesign.com.br> Signed-off-by: yubiuser <ckoenig@posteo.de>
2022-08-08Reproduce blockpage.css for $splashPageChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08Use absolut asset pathsChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08Fix missing PI_HOLE_BLOCKPAGE_DIRChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08Only do one curl call in debug when checking the X-HeaderChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08Remove blockingpage.cssChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-08Fix test_installPiholeWeb_fresh_install_no_errors and ↵Adam Warner
test_installPihole_fresh_install_readableBlockpage Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08X-Pi-hole removed from blocking page...Adam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08no need to declare $viewPortAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-08Extend FTL information in debug logChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-07Merge pull request #4863 from pi-hole/fix/git_indentionyubiuser
Fix git indention
2022-08-07Always indentChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-06Merge pull request #4857 from pi-hole/4856-init-script-ftlDan Schaper
Exit init script with error result code if FTL fails to start
2022-08-06Fix git indentionfix/git_indentionChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-06Add security-related headers to Pi-hole web interfacetweak/lighttpd_headersDL6ER
Signed-off-by: DL6ER <dl6er@dl6er.de>
2022-08-06Merge pull request #4859 from ↵Adam Warner
pi-hole/dependabot/github_actions/development/actions-ecosystem/action-add-labels-1.1.3 Bump actions-ecosystem/action-add-labels from 1.1.0 to 1.1.3
2022-08-06Bump actions-ecosystem/action-add-labels from 1.1.0 to 1.1.3dependabot[bot]
Bumps [actions-ecosystem/action-add-labels](https://github.com/actions-ecosystem/action-add-labels) from 1.1.0 to 1.1.3. - [Release notes](https://github.com/actions-ecosystem/action-add-labels/releases) - [Commits](https://github.com/actions-ecosystem/action-add-labels/compare/v1.1.0...v1.1.3) --- updated-dependencies: - dependency-name: actions-ecosystem/action-add-labels dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-08-06Merge pull request #4860 from ↵Adam Warner
pi-hole/dependabot/github_actions/development/actions/stale-5.1.1 Bump actions/stale from 5.1.0 to 5.1.1
2022-08-06Merge pull request #4861 from ↵Adam Warner
pi-hole/dependabot/github_actions/development/actions/setup-python-4.2.0 Bump actions/setup-python from 4.1.0 to 4.2.0
2022-08-06Bump actions/setup-python from 4.1.0 to 4.2.0dependabot[bot]
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4.1.0 to 4.2.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4.1.0...v4.2.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
2022-08-06Bump actions/stale from 5.1.0 to 5.1.1dependabot[bot]
Bumps [actions/stale](https://github.com/actions/stale) from 5.1.0 to 5.1.1. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/v5.1.1/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5.1.0...v5.1.1) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
2022-08-05Exit with return code if ftl does not start4856-init-script-ftlDan Schaper
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2022-08-04Merge pull request #4855 from pi-hole/fix/dir_not_existyubiuser
Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startup
2022-08-04Ensure user defined FTL_PID_FILE and FTL_PORT_FILE dirs are created on startupChristian König
Signed-off-by: Christian König <ckoenig@posteo.de>
2022-08-01Merge pull request #4851 from pi-hole/keywordsyubiuser
Dont use bash keywords/programs as variable names
2022-08-01type -> list_type per @yubiuser suggestionAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-01Same per @rdwebdesign suggestion.Adam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
2022-08-01Dont use bash keywords/programs as variable namesAdam Warner
2022-08-01Merge pull request #4833 from pi-hole/workflow_versionsAdam Warner
Explicit set minor and patch version on used actions
2022-07-31Merge pull request #4828 from pi-hole/centos7-can-do-oneAdam Warner
Drop explicit support for CentOS 7 from the install script
2022-07-31Move release version check inside the else blockAdam Warner
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 16:04:01 +0300