Commit Graph

3667 Commits (a4ba8d4b8fd0e44e11deeecf33267c82c3d8735e)
 

Author SHA1 Message Date
Mark Drobnak 308b296285
Merge pull request #2401 from pi-hole/fix/checkout-readonly
6 years ago
Mcat12 d55012f724
Append versions (after the first) instead of overwriting in updatecheck
6 years ago
Mcat12 7c6eecc9c8
Ignore shellcheck warning
6 years ago
Mcat12 e4cbf5023a
Fix error when reading in new password
6 years ago
Mark Drobnak 46356d3027
Merge pull request #2434 from pi-hole/fix/2200
6 years ago
Mark Drobnak 958a263437
Merge pull request #2431 from pi-hole/fix/use_PHP_comments_in_pihole-FTL.conf_template
6 years ago
Mark Drobnak a89ae82270
Merge pull request #2430 from pi-hole/chrono-lc-all
6 years ago
Mark Drobnak cedc39bf09
Merge pull request #2426 from mrmajik45/master
6 years ago
Adam Warner 0131055ec9
Submission stale, addressing @mcat12's comments
6 years ago
Adam Warner 0627e68078
Shellcheck is not a fan of sourcing scripts it does not know about. Add Directive to stop shellcheck from checking this.
6 years ago
Adam Warner 7d78f6314a
Source Setupvars file and only check local/remote Web branch/version if the web interface is installed.
6 years ago
mrmajik45 0f509f4a34
Update piholeDebug.sh
6 years ago
DL6ER b043000044
Improve template by removing it. PHP cannot digest comments starting in "#" as of v7.0.0
6 years ago
DL6ER c338eab3c6
According to the PHP documentation, PHP 7.0.0+ does not longer recognize hash marks (#) as comments. As FTL has been trained to understand PHP-style (comment lines start with ";") as well, we switch to using them.
6 years ago
WaLLy3K 24e1dc92ba
Resolve issue #2428
6 years ago
mrmajik45 00f98543ad
read without -r will mangle backslashes.
6 years ago
mrmajik45 8684356b44
read without -r will mangle backslashes.
6 years ago
Mark Drobnak a89615365e
Merge pull request #2410 from stuartskelton/norton_dns_EOL_2018_11_15
6 years ago
Stuart Skelton 3c36c22ca8 Remove Norton Connect Safe as its EOL 2018-11-15
6 years ago
Mark Drobnak 7a2f5f43f9
Merge pull request #2408 from pi-hole/fix/2299
6 years ago
Mark Drobnak dac27f1f18
Only get the first gateway for chronometer
6 years ago
Mark Drobnak 6f276ae4bb
Merge pull request #2299 from nullr0ute/net-tools
6 years ago
Mark Drobnak 537e288758
Merge pull request #2407 from pi-hole/fix/lighttpd-external-conf
6 years ago
Mark Drobnak 3cea1bd423
Fix lighttpd v1.4.50 crashing on startup
6 years ago
Mark Drobnak c976bbcfd2
Fix checkout error due to readonly variable
6 years ago
Mark Drobnak ec29829550
Merge pull request #2388 from Sh4d1/ipv6_brackets
6 years ago
Mark Drobnak cf7180af5b
Merge pull request #2398 from pi-hole/rpm_distro_checks
6 years ago
bcambl c58e3acc78 add unsupported RPM distro warnings
6 years ago
DL6ER b78aef1e7e
Merge pull request #2356 from pi-hole/tweak/reload_on_enable_disable
6 years ago
DL6ER f20e4ddf3b
Change message for unknown state to something more useful
6 years ago
DL6ER 40656641b6
Merge branch 'development' into tweak/reload_on_enable_disable
6 years ago
bcambl 6f8e8e98bb update centos version check test
6 years ago
bcambl 24b4aabae9 allow installer to continue with additional rpm based distros
6 years ago
Mark Drobnak a9c6d79cda
Merge pull request #2394 from pi-hole/fix/pihole-FTL_owner_group
6 years ago
DL6ER 45bf4b02e7
Ensure that when pihole-FTL is launched as user root, it will drop permissions as soon as this is possible. We tell pihole-FTL to change UID/GID to pihole:pihole instead of the default nobody:nogroup. This default causes conflicts with our SQLite3 database. See that corresponding pull request for further details.
6 years ago
Mark Drobnak 667c5138cc
Merge pull request #2381 from pi-hole/fix/existing_dnsmasq.conf
6 years ago
Patrik Cyvoct 85cf98888d
Merge remote-tracking branch 'origin/development' into ipv6_brackets
6 years ago
Patrik Cyvoct 048e5bb9a2
Remove external ipv6 brackets if any in servername
6 years ago
DL6ER b9d47d0dd2
Merge pull request #2378 from pi-hole/fix/pihole-FTL-no-caps
6 years ago
DL6ER 1813c25117
If config file was backed up: Print info message
6 years ago
DL6ER 940c9c3bae
Merge pull request #2383 from pi-hole/feature/privacy-level-4
6 years ago
Mcat12 5d0d7336ff
Echo with newline when setting privacy level
6 years ago
Mcat12 6a26a05dbf
Fix privacy level whiptail option format
6 years ago
Mcat12 c22e94c9c7
Update test to include empty FTL config
6 years ago
Mcat12 4aafa8cf47
Set the FTL privacy level during install
6 years ago
Mark Drobnak 9235a11d5f
Merge pull request #2382 from pi-hole/tweak/no-extra-logging
6 years ago
Mcat12 f141b9f778
Add support for privacy level 4
6 years ago
DL6ER 1dca1efbc6
Don't use extra query logging
6 years ago
DL6ER 28c6b1393f
Backup existing /etc/dnsmasq.conf if present and ensure that /etc/dnsmasq.conf contains only "conf-dir=/etc/dnsmasq.d"
6 years ago
DL6ER 6c97b8b875
Merge pull request #2377 from pi-hole/fix/service-touch-leases
6 years ago