Commit Graph

1892 Commits (v2.11.2)
 

Author SHA1 Message Date
Adam Warner 47196d86ad Merge pull request #1115 from pi-hole/development
8 years ago
Mcat12 a713cf7952 Merge pull request #1116 from pi-hole/fix/multi_interface
8 years ago
Dan Schaper 6cd7b8ff5e Merge branch 'master' into fix/multi_interface
8 years ago
Dan Schaper f8264f8277
Merge branch 'development' of github.com:pi-hole/pi-hole into development
8 years ago
Dan Schaper 0e4d5e9103
Bash splitting and globin
8 years ago
DL6ER d9e949b27c Merge pull request #1096 from pi-hole/fix/updater
8 years ago
DL6ER b65fe9d64f Merge pull request #1099 from pi-hole/fix/webpageshtypo
8 years ago
DL6ER 168397e90d
Fixed typo in webpage.sh
8 years ago
DL6ER e3c1fcd2c6
NEW LOGIC FOR THE UPDATER
8 years ago
Dan Schaper a2bc86fbcb Merge pull request #1085 from pi-hole/development
8 years ago
Dan Schaper 26c6446252
Merge branch 'master' into development
8 years ago
Dan Schaper e5e44db5ac
Merge branches 'development' and 'master' of github.com:pi-hole/pi-hole into development
8 years ago
DL6ER d4f833c739 Merge pull request #1090 from pi-hole/fix/dead-led-link
8 years ago
Jacob Salmela 806f44abe6
replace dead link to another LED blink project page
8 years ago
Mcat12 900bdc5ee2 Merge pull request #1083 from pi-hole/fix/DHCP
8 years ago
DL6ER 200995bf29
Make IPv6 features of Pi-hole DHCP server switchable
8 years ago
DL6ER 3a90c1c192
Source setupVars.conf before trying to access variables
8 years ago
Dan Schaper cc68155dfa
Merge remote-tracking branch 'origin/master'
8 years ago
Mcat12 b8545eb1df Merge pull request #1074 from pi-hole/development
8 years ago
Mcat12 76531da340 Merge pull request #1067 from pi-hole/fix/firewall_redux
8 years ago
Adam Warner 12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh
8 years ago
DL6ER ad61852804
Test against empty string
8 years ago
DL6ER dbd8aee4ee
Add 'local' domain if not set in setupVers.conf
8 years ago
DL6ER 677694b01a
Set 24h lease time if settings was empty before
8 years ago
DL6ER 85f0241c0d
Reprocess DHCP settings after update
8 years ago
Dan Schaper ade2185a9f Merge pull request #1073 from pi-hole/tweak/quidsup
8 years ago
Dan Schaper 0d27005dda
Comment out QuidsUp
8 years ago
Dan Schaper 8ee2bdec4d
Plain grep, escape the special characters.
8 years ago
Dan Schaper de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux
8 years ago
Dan Schaper fbea81dcd7 Merge pull request #1068 from pi-hole/fix/anti_glob
8 years ago
Dan Schaper 502c349b8b
Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux
8 years ago
Adam Warner 5fb0aa70de Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages
8 years ago
Dan Schaper 7750e1344c
DRY `displayFinalMessage`
8 years ago
Dan Schaper 8be37130e9
Move first check to `main()`, `basic-install.sh` can now be sourced.
8 years ago
Dan Schaper fa055481a7
Shellcheck screen size
8 years ago
Dan Schaper d080e5d7a8
Merge branch 'fix/anti_glob' of github.com:pi-hole/pi-hole into fix/anti_glob
8 years ago
Dan Schaper ad07655630
Defensive git cloning
8 years ago
Dan Schaper 7cceb8615a
`make_repo` more defensive.
8 years ago
Dan Schaper ab9c8f4859
`make_repo` more defensive.
8 years ago
Dan Schaper ffb8a74111
Defensive `is_repo`
8 years ago
Dan Schaper 45587194e5
Regex fun
8 years ago
Dan Schaper ccbf391913
More intelligence in iptables rulesets. Account for Policy ACCEPT, with
8 years ago
Mcat12 7765efa6c4 Merge pull request #1063 from pi-hole/fix/chmod_scripts
8 years ago
DL6ER 02d4b6794c Merge pull request #1066 from dgnthr/patch-1
8 years ago
Dominik G 836b717346 Fixed a typo in the installation script
8 years ago
Dan Schaper fc596e41d4
All scripts set executable
8 years ago
Mcat12 1f9b0f7cef Merge pull request #1061 from pi-hole/fix/blockpage-whitelist-path
8 years ago
Mcat12 7bcc15e416 Adjust blocking page paths from admin restructure
8 years ago
DL6ER 1a3bdbaabf Merge pull request #1057 from pi-hole/new/whitelistonblockingpage
8 years ago
Mcat12 5e35fdbc52 Save blocking page CSS to pihole directory instead of admin
8 years ago