3688 Commits (e967fe2266212dea68ab3dc63b9d7848d26afd42)

 

All Branches   

Search

Author	SHA1	Message	Date
Gusher123	4238e36d7f	Merge branch 'patch-1' of https://github.com/Gusher123/pi-hole into patch-1	6 years ago
Gusher123	03a9d3bc5b	Not hardcoding dns and covering all blockingmodes ... Using double brackets Mode double brackets	6 years ago
Gusher123	fe46dee194	Mode double brackets	6 years ago
Gusher123	1c6c35f861	Using double brackets	6 years ago
Gusher123	926b25fd54	Not hardcoding dns and covering all blockingmodes	6 years ago
Gusher123	e58142b4ac	Added comments	6 years ago
Gusher123	3e5c6afaee	Don't let one blocklist, block an other ... If a blocklist is blocked by an other and 'pihole -g' is run, update the blocked blocklist by useing an alternate dns server (in this case 1.1.1.1) to acquire the IP adres and download the blocklist using the 'curl --resolve' (https://curl.haxx.se/docs/manpage.html#--resolve)	6 years ago
WaLLy3K	a1bf9fad98	Fix colour tail for use with new blocking methods ... Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	6 years ago
Mark Drobnak	afdc4219d0	Merge pull request #2343 from pi-hole/tweak/audit_log ... Add facility to add multiple audit list entries at once and to nuke audit list	6 years ago
DL6ER	94e4ed6644	Add facility to add multiple audit list entries at once and to nuke audit list ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mark Drobnak	ef8aaba014	Merge pull request #2320 from TronPaul/fix/no-tty ... set noninteractive during unattended install	6 years ago
Mark Drobnak	d2ae07e69b	Merge pull request #2334 from pi-hole/fix/gravity-count-regex ... Fix gravity's regex counting logic	6 years ago
DL6ER	760dd01b50	Use grep invert-match ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	5bf90cb77d	Use alternative logic for counting regex file entries, skipping commented out lines ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	f5c3dc5d9d	Improve download error message that is shown when downloading or verifying the binary failed ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	f2b820079a	Merge pull request #2329 from pi-hole/tweak/remove-ppc ... Remove PowerPC from FTL binaries	6 years ago
WaLLy3K	083024496a	Merge pull request #2327 from pi-hole/header-fix ... Fix Chronometer heading	6 years ago
Mcat12	e01eea8ba8	Remove PowerPC from FTL binaries ... It is no longer built, and may cause 404 errors if it attempts to download the binary. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
WaLLy3K	eef948d797	Fix header newlines ... * Added \\n to each $xxx_ver_str, resolving issue #2325 Signed-off-by: WaLLy3K <wally3k@pi-hole.net>	6 years ago
DL6ER	8017be7d09	Merge pull request #2322 from pi-hole/release/v4.0 ... Git Flow - Release/v4.0 merge back to development.	6 years ago
Dan Schaper	5b628a4c77	Merge branch 'development' into release/v4.0	6 years ago
Dan Schaper	ddbdb51d20	Merge pull request #2308 from pi-hole/release/v4.0 ... Release/v4.0	6 years ago
Mark McGuire	0081a7ca92	set noninteractive during unattended install ... Signed-off-by: Mark McGuire <mark.b.mcg@gmail.com>	6 years ago
Dan Schaper	e80ae4906f	Merge pull request #2318 from pi-hole/tweak/wildcard-regex-format ... Use simpler regex format for wildcards	6 years ago
Mcat12	e4e22fb58e	Fix permissive regex ... The `\.?` is too permissive, letting in anything that ends in the domain Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	7086a400e8	Use simpler regex format for wildcards ... Use `\.?domain\.com$` instead of `((^)|(\.))domain\.com$` Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mark Drobnak	a25a13fde0	Merge pull request #2317 from pi-hole/fix/parse_pihole-FTL.conf ... Add empty pihole-FTL.conf file	6 years ago
Dan Schaper	993beab3b7	Changed wording. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	06875f2cc9	Merge branch 'release/v4.0' into fix/parse_pihole-FTL.conf	6 years ago
Dan Schaper	448fc7231c	Installed to `/etc/pihole` as PI_HOLE_CONFIG_DIR variable. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	d0d030bafc	Moved file creation to proper function. Included bash variables for file ... location. Set to pihole:pihole ownership with 644 permissions. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	833131e15f	Merge pull request #2315 from pi-hole/fix/regex-file-ownership ... Allow PHP to edit the regex file if web is installed	6 years ago
Dan Schaper	fb2810557a	Allow web user group to access regex.list ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	82a64db42b	Merge pull request #2313 from pi-hole/fix/pihole-man-usage ... Fix wildcard/regex usage formatting	6 years ago
Mcat12	57af0ba0a4	Use `install` to make the regex file ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	17c1e64f7e	Moved FTL configuration copy in to scripts copy function. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	af13ceac24	Touch file as ${USER} instead of copying template. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	af2ec61965	Convert [] to () ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Mcat12	a55cc55338	Only `touch` the regex file if it doesn't already exist ... The other permission calls will always be run so that the file is in the expected state after install and repair. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	b2fb3fd35a	Merge pull request #2310 from pi-hole/feature/pihole-FTL.conf ... Include template pihole-FTL.conf	6 years ago
Dan Schaper	94b7c8eb59	Added header for file. Not using standard Pi-hole copyright header. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	6d671007dd	Merge pull request #2314 from pi-hole/fix/ftl-install-error-output ... Fix FTL install leaking error output	6 years ago
Mcat12	1a8d5fb4a9	Allow PHP to edit the regex file if installed ... Fixes permissions error on the web interface when modifying the regex. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	f90c412b35	nroff checked pihole.8 for formatting. `nroff -man pihole.8` ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Mcat12	c73b5456eb	Fix "which" error leaking ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	3d87398721	Fix `check_service_active` leaking error output ... Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mcat12	96681887b8	Fix wildcard/regex usage formatting ... Fix whitespace issue and missing backslashes in the regex example. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Dan Schaper	f2c675cff6	Formatted pihole-FTL.conf for readability. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	1844bf17a7	Merge pull request #2311 from pi-hole/fix/git-head-flag ... Fix wrong git command flag	6 years ago
Mark Drobnak	47b56d6123	Fix wrong git command flag ... I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago