5365 Commits (73ca4ebdbc10b39b29ced4babc6238ff48c1d5c3)

 

All Branches   

Search

Author	SHA1	Message	Date
Christian König	73ca4ebdbc	Update test requirements ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	da6596e516	Master -> Dev (#4925)	2 years ago
Adam Warner	d88629e23f	v5.12.2 (#4922)	2 years ago
yubiuser	d581401f4e	Fix gravity database integrity check (#4921)	2 years ago
Christian König	60c35cb93c	Remove unused check_database_integrity() ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	2c3fea321b	Remove FAQ_ULA as it is unused in `core` ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	40f00c6f0b	Fix gravity database integrity check ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	7eff36b3bb	Update workflow python to 3.10 and allow any python3 version in tests (#4914)	2 years ago
yubiuser	5332b31b92	Add comment in lighttpd.conf how to change the server port (#4917)	2 years ago
yubiuser	16640ee174	Bump actions/stale from 5.1.1 to 5.2.0 (#4918)	2 years ago
dependabot[bot]	5fe170666a	Bump actions/stale from 5.1.1 to 5.2.0 ... Bumps [actions/stale](https://github.com/actions/stale) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2 years ago
Christian König	7e6f81f814	Add comment in lighttpd.conf how to change the server port ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	80c770357c	Fixing texts forgotten after Blocking Page removal (#4915)	2 years ago
RD WebDesign	5cc317de5b	Change texts after Block Page removal ... Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>	2 years ago
Adam Warner	515e5f8c8a	Store docker version in versions file (If `PIHOLE_DOCKER_TAG` variable is set) (#4913)	2 years ago
Adam Warner	3d53bda121	Update advanced/Scripts/updatecheck.sh ... Co-authored-by: yubiuser <ckoenig@posteo.de> Signed-off-by: Adam Warner <github@adamwarner.co.uk>	2 years ago
Christian König	8bc5b16527	Set tox envlist to py3 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	c1a927fff1	Run test workflows on python 3.10 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	760325eb76	Update piholeDebug to source versions file for DOCKER_VERSION instead of reading PIHOLE_DOCKER_TAG ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	bf256aa5a7	If docker version env var is set, store it in /etc/pihole/versions file for later use ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	8dbe6fc0b7	master-> Dev (#4912)	2 years ago
Adam Warner	fe8b0e98ab	v5.12.1 (#4908)	2 years ago
yubiuser	ef45578af3	Fix 4898 (#4899)	2 years ago
Christian König	89b88416b3	Fix 4898 ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	5d913ad192	Release 5.12 (#4889) (#4897)	2 years ago
yubiuser	711035fd8f	Update FTL Binary test to ensure we catch incompatibility issues early (#4893)	2 years ago
Adam Warner	0f74165c9d	Drop Ubuntu 18 tests ... Tweek version_check to only output 1st char of the reported version Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	46e1a87e9e	Tweak FTL test to ensure we don't get false positives on incompatible OS (Will remote Ub18 in a separate commit) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	f998eee467	Release 5.12 (#4889)	2 years ago
yubiuser	d6cfa57ef3	Add jq as dependency and remove json_extract (#4878) ... **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_	2 years ago
Christian König	49b9dc8888	Remove json_extract function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	1335c44deb	Add jq to dependencies ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	66eeee5548	Remove the email function (#4870) ... - **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	2 years ago
Adam Warner	597c045f9e	Merge pull request #4875 from pi-hole/tweak/version-file ... Store versions as key/value pairs rather than space delimeted values	2 years ago
Adam Warner	a4b899c256	Review suggestions (and shellcheck complaints) ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Adam Warner	5421aad03e	Store versions as key/value pairs rather than space delimeted values ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	eeccfb27f8	Remove it also from index.php together with more unused variables ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	4cf3280500	Merge pull request #4862 from pi-hole/tweak/lighttpd_headers ... Add security-related headers to Pi-hole web interface	2 years ago
Christian König	8c4a9aa6e3	Remove the email function ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Adam Warner	9ab566884d	Merge pull request #3910 from pi-hole/removeblockpagefunctionality ... Remove the advanced functionality of the 404 page (Blockpage)	2 years ago
yubiuser	37102e5a01	Merge branch 'development' into removeblockpagefunctionality	2 years ago
yubiuser	5a98fa1f76	Merge pull request #4843 from MichaIng/patch-1 ... Skip web server dialog if --disable-install-webserver has been passed	2 years ago
Adam Warner	114f562758	Merge branch 'development' into removeblockpagefunctionality	2 years ago
MichaIng	b3c8045b52	Skip web server dialog if --disable-install-webserver has been passed ... 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>	2 years ago
yubiuser	a0419bc1f0	Merge pull request #4864 from pi-hole/debug_FTL_branch ... Extend FTL information in debug log	2 years ago
Adam Warner	e35a9da921	Remove the blockpage-focussed customisations to query.sh ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	2 years ago
Christian König	97447b2f3b	Do not remove blockingpage.css from existing installations as some users might use them for custom.php ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
yubiuser	c67f313ee8	Apply reviewers suggestion for inline CSS ... Co-authored-by: RD WebDesign <github@rdwebdesign.com.br> Signed-off-by: yubiuser <ckoenig@posteo.de>	2 years ago
Christian König	49a9f6f2db	Reproduce blockpage.css for $splashPage ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago
Christian König	e6683803ed	Use absolut asset paths ... Signed-off-by: Christian König <ckoenig@posteo.de>	2 years ago