Commit Graph

2397 Commits (6a2b885988673ce60de78af85fcb69d284a836c4)
 

Author SHA1 Message Date
Dan Schaper af1d1bd9c2
One more change
8 years ago
Dan Schaper f32ad7699d Merge pull request #1320 from georou/development
8 years ago
Dan Schaper 79294bb6ca Merge pull request #1332 from pi-hole/varChanges
8 years ago
Jacob Salmela 1cd4710718
replace logo with TM logo
8 years ago
Jacob Salmela 48c19ade8e
add trademarks to Pi-hole name in signifigant places
8 years ago
Adam Warner 0acf70f836 Merge pull request #1340 from AnthonyGiorgio/development
8 years ago
Anthony Giorgio fd584dd03b Formatting cleanup.
8 years ago
Dan Schaper 2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog
8 years ago
Mcat12 62a242a894 Merge pull request #1334 from pi-hole/tweak/interface_detect
8 years ago
DL6ER 8b060e9699 Merge pull request #1333 from Wandmalfarbe/development
8 years ago
Dan Schaper b1f769b671
Output cleaning, IP stack check headers.
8 years ago
Dan Schaper 77378da70a
Cat out temp files to final log.
8 years ago
Dan Schaper 160030b75f
Quiet systemctl output to just the current daemon status.
8 years ago
Dan Schaper 0a0c3a2fb7
Copy working temp to final location.
8 years ago
Dan Schaper e9f1ca338f
Create temp files for working storage, log to working storage temps.
8 years ago
Dan Schaper 073c7e54df Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint
8 years ago
Dan Schaper 2834f2ccc2
Let `ip` determine which links are candidates.
8 years ago
georou 6c56665403 updated travis for new firewalld add service
8 years ago
georou 0d794226ab Removed unsupported POSIX brace expansion
8 years ago
Wandmalfarbe ab2af11775 Fixed minor spelling mistakes in README.md
8 years ago
Adam Warner 83662c9e50
additional requested changes
8 years ago
Adam Warner 6c1d52199f
Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master
8 years ago
Adam Warner cfaf1ac67c
add check on file_parse to not include WEBPASSWORD= in the debug log
8 years ago
Mcat12 a6caa0e680 Merge pull request #1327 from pi-hole/fix/pihole-help-text
8 years ago
Mcat12 c4b43f92ce Fix help text bug
8 years ago
DL6ER 3d1ccd9625 Merge pull request #1312 from pi-hole/pihole-backports
8 years ago
John Taylor 76bd53ef1f replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO}
8 years ago
Mcat12 8fa209f0df Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
8 years ago
Mcat12 88835512dd Merge pull request #1322 from pi-hole/FixWildCardBlacklisting
8 years ago
Adam Warner 6b862dd9e9 Only remove from wildcard list if domain is being added to whitelist or blacklist
8 years ago
DL6ER be0b76c954 Merge pull request #1319 from pi-hole/fix/gravitypath
8 years ago
georou e45559da20 Use Firewalld services instead of ports
8 years ago
DL6ER d7b5870ba6
Use absolute path for pihole command in gravity.sh. Fixes #1318
8 years ago
Dan Schaper df18c7cd59
Merge pull request #1313 from pi-hole/new/piholecheckout
8 years ago
Dan Schaper 2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout
8 years ago
Dan Schaper b0ae954f1e
Only update when `update` flag is set to "true"
8 years ago
Dan Schaper a2404f104a
Just some style and linting. And a `cd` in `fetch_checkout_pull_branch`
8 years ago
DL6ER 38547ced7a
Can only diff once upstream branch is tracked
8 years ago
DL6ER 9a9d9007cd
Add missing "== true"
8 years ago
DL6ER bd2d81f691
source setupVars.conf to see if INSTALL_WEB is true or not
8 years ago
DL6ER 1b9e7fbf2e
Test if branch is locally available is not reliable because of possible ambiguities
8 years ago
DL6ER d4a49d192f
Correct variable name
8 years ago
DL6ER 8cb66544d2
Remove "\ "
8 years ago
DL6ER 140ac192aa
The web repo might actually be missing and this is n error (not installed because the user didn't want it)
8 years ago
DL6ER b961b13d60
Small bugfix
8 years ago
DL6ER febdb4a190
Use git diff to determine if code has changed (no need to run the installer if it hasn't changed at all)
8 years ago
DL6ER 1d60b62e7a
Testing alternative way of fetching/checking out of a single branch
8 years ago
Dan Schaper 41e1e4cb68
Rearrange pull logic, some optimization.
8 years ago
Dan Schaper d5b88e0df8
Get the right name for the options.
8 years ago
Dan Schaper 20fd61468d
Require branch to check out
8 years ago