4556 Commits (95a28ae1257e1500d2b1ff1fb910698d6f4834ba)

 

All Branches   

Search

Author	SHA1	Message	Date
Mcat12	422680ee9f	Fix chronometer refresh incorrectly reading the long argument sleep time ... `-r` worked, but `--refresh` did not. Fixes #2703 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mark Drobnak	42c7653e99	Merge pull request #2696 from pi-hole/tweak/FTL-privacy-doc-link ... Add a link to the documentation on FTL privacy levels during install	5 years ago
Mcat12	78c0c58946	Add a link to the documentation on FTL privacy levels during install ... Closes #2695 Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	5 years ago
Mark Drobnak	cae61614f4	Merge pull request #2688 from pi-hole/fix/2687 ... Add Check to `pihole -q -exact` to ensure there is no `#` char preceding a space before the domain	6 years ago
Adam Warner	a7f6c9b3a0	Ignore matches that start `# ` using negative lookbehind ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>	6 years ago
Mark Drobnak	5950b4bb78	Merge pull request #2646 from pi-hole/fix/FTL_arch_detect_rpm ... Don't fail when trying to detect OS architecture on RPM-based systems	6 years ago
DL6ER	817b19888f	Merge branch 'development' into fix/FTL_arch_detect_rpm	6 years ago
Mark Drobnak	b64fb578fc	Merge pull request #2674 from NiGhTTraX/development ... Fix uninstalling lighttpd when it's not installed	6 years ago
Andrei Picus	e9e92368b0	Fix uninstalling lighttpd when it's not installed ... Signed-off-by: Andrei Picus <NiGhTTraX@users.noreply.github.com>	6 years ago
Dan Schaper	ffcb173a7f	Merge pull request #2672 from pi-hole/fix/test-version-pinning ... Pin Python package versions to the versions in the last successful build	6 years ago
Mcat12	b9c9c2797f	Pin Python package versions to the versions in the last successful build ... The last successful build was https://travis-ci.org/pi-hole/pi-hole/builds/500825408 When `testinfra` became `2.0.0`, it removed the deprecated features that the tests currently use. Signed-off-by: Mcat12 <newtoncat12@yahoo.com>	6 years ago
Mark Drobnak	204a4e459b	Merge pull request #2637 from TheNoim/patch-1 ... Support pi hole behind a reverse proxy with ssl	6 years ago
DL6ER	0a53e966ea	Merge pull request #2659 from pi-hole/tweak/warn_if_FTL_not_on_master ... Warn user during update if FTL is on a custom branch	6 years ago
DL6ER	2e17c23333	Don't warn if user is on development as this branch is constantly updated ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	63f3381a2b	Warn user if FTL is not on branch master ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mark Drobnak	2292720fed	Merge pull request #2650 from mmphego/patch-1 ... Update README.md	6 years ago
Mpho Mphego	b77efa521f	Update README.md ... Removed the extra double quote. Signed-off-by: Mpho Mphego <mpho112@gmail.com>	6 years ago
Mpho Mphego	cfe221706b	Update README.md ... Changed badges from HTML code to markdown for consistency Signed-off-by: Mpho Mphego <mpho112@gmail.com>	6 years ago
Dan Schaper	54ae9d83b0	Stickler-lints ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
Dan Schaper	293e2a8e80	Merge pull request #2647 from pi-hole/feature/curl_debug ... Use `curl` instead of `openssl` for debug upload.	6 years ago
Dan Schaper	71cd6c137b	Use `curl` instead of `openssl` for transmission of unmodified ... log file. We want ansi color codes to be sent. Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	6 years ago
DL6ER	0e14d11a20	Merge branch 'development' into new/gravitydb	6 years ago
DL6ER	bbc392caeb	More review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	61840edb30	Fill comment field with NULL (default) instead of empty string and use a variable for the timestamp instead of periodically calling date ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	9867b7fccf	Don't fail when trying to detect OS architecture on RPM-based systems ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Mark Drobnak	58f198626a	Merge pull request #2640 from pi-hole/new/DebugAdditions ... Add git status/diff to debug log	6 years ago
Adam Warner	a145f1d931	Be more verbose with debug script output ... If output of `git status -s` is non-null display changes if output of `git diff` is non-null, display diff Signed-off-by: Adam Warner <adamw@rner.email>	6 years ago
Mark Drobnak	9748f19172	Merge pull request #2639 from pi-hole/hotfix/v4.2.2 ... Update development from hotfix/v4.2.2	6 years ago
DL6ER	ba1e94d3d9	Merge pull request #2626 from pi-hole/hotfix/v4.2.2 ... Pi-hole Core v4.2.2	6 years ago
Nils Bergmann	cd9fadbc44	Remove protocol determination ... No protocol determination is neede, if you just use double slash. Signed-off-by: Nils Bergmann <nilsbergmann@noim.io>	6 years ago
Mark Drobnak	062a180a1c	Merge pull request #2621 from cryptomilk/development-fix ... A bunch of fixes for basic-install.sh	6 years ago
Andreas Schneider	860ec1a7c4	basic_install: Use install for sudoers ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
DL6ER	5ca1bfc11c	Delete /dev/shm/FTL-* files on (re)start of pihole-FTL ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Andreas Schneider	2f189cd076	basic_install: There is no pihole group, remove it ... Only a user has been created beforehand. Only some distributions create a group with the same name based on their configuration. We cannot assume this is always the default. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
Andreas Schneider	2f0e6a6dda	basic_install: Make sure the PI_HOLE_CONFIG_DIR exists ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
Andreas Schneider	f187b42a98	basic_install: Define webroot globally as a variable ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
DL6ER	f9250d91a5	Explictly escape the escape. ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	491c828661	Improved code, ensure that gravity.sh passes shellcheck as a whole ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	644ec36e64	Review comments ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Andreas Schneider	838e1b19ec	basic_install: Set permissons for PI_HOLE_DASHBOARD_DIR ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
Andreas Schneider	d5bbb2b640	basic_install: Use a varibale for the pihole dashboard dir ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
Andreas Schneider	dc91d4b1f9	basic_install: If a static interface is already set up we are done ... Signed-off-by: Andreas Schneider <asn@cryptomilk.org>	6 years ago
DL6ER	9984647ebb	After renaming column in regex, it also needs to be renamed in vw_regex ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	ec5b16ef85	Fix incomplete comment ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	c3c60e10f1	Rename regex field from domain to filter because this described better what it is ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	8a2363621d	Rename fields from DateAdded to dateadded ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
DL6ER	dbbf21071b	Invert logic to use ENABLED instead of DISABLED. We make sure to set "enabled = 1 WHERE enabled IS NULL" in gravity_store_in_database() ... Signed-off-by: DL6ER <dl6er@dl6er.de>	6 years ago
Dan Schaper	e967fe2266	Merge pull request #2612 from pi-hole/hotfix/v4.2.1 ... Remove user/group from dnsmasq config	6 years ago
Dan Schaper	b5c7657e01	Merge pull request #2614 from pi-hole/hotfix/v4.2.1 ... Merge v4.2.1 hotfix to dev	6 years ago
Mcat12	680d6e2d31	Merge branch 'release/v4.2' into development ... # Conflicts: # automated install/basic-install.sh	6 years ago