Commit Graph

1230 Commits (12e041c9ef9665e45cf351503d557997d8aa9187)
 

Author SHA1 Message Date
Marcus Hildum 12e041c9ef Merge remote-tracking branch 'upstream/development' into development
8 years ago
Marcus Hildum 54913f06a3 Merge remote-tracking branch 'upstream/master' into development
8 years ago
Adam Warner 44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning
8 years ago
Dan Schaper e6bd979aeb Can't spell
8 years ago
Adam Warner 266c160108 Merge pull request #818 from airencracken/development
8 years ago
Dan Schaper b5b6350cc7 Add file change warning to header
8 years ago
Dan Schaper 60a80dd678 Merge pull request #819 from pi-hole/adlistremoval
8 years ago
Marcus Hildum 0efda04920 Use heredocs instead of multiple calls to echo
8 years ago
Dan Schaper 8819e58882 Remove problem list, sends in Unicode - Not adware
8 years ago
Marcus Hildum 28eeaf201b Standardize function declaration
8 years ago
Dan Schaper 16e4f79f09 Merge pull request #809 from pi-hole/PromoTweaks
8 years ago
Adam Warner 76cae20c33 Merge pull request #803 from pi-hole/attributes
8 years ago
Adam Warner b66f23cfd0 account for new update script
8 years ago
Adam Warner 27d6e5d8cf Complete overhaul of update logic. Moved to seperate script
8 years ago
Adam Warner ff5d5b97c3 stash any changes in local repo
8 years ago
Adam Warner ce46c4dec4 remove prematurely added code
8 years ago
Adam Warner 77e8be09a1 handle passing arguments to version script
8 years ago
Adam Warner 013d77488a complete overhaul of version script. Now with optional arguments!
8 years ago
Adam Warner 29ad2496b6 don't output "elevating with sudo" in pihole script, just do it.
8 years ago
Adam Warner 97a013b2b7 Add direction to change upstream servers in setupVars.conf
8 years ago
Adam Warner 77808223dc remove stock comments from 01-pihole.conf and add warning to the top
8 years ago
Jacob Salmela fc89851ce9 Merge pull request #805 from pi-hole/development
8 years ago
Dan Schaper c4c6555814 Merge branch 'master' into development
8 years ago
Dan Schaper df0087fb23 Merge pull request #804 from pi-hole/hotfix/curlRefire
8 years ago
Dan Schaper ef3c13fe2b Refire with curl
8 years ago
Dan Schaper 0ad704e532 Update .gitattributes
8 years ago
Dan Schaper 2220d2dab8 Create .gitattributes
8 years ago
Promofaux 49f48e2aaa wrong word. #admincrimes
8 years ago
Adam Warner dce24df379 Merge pull request #794 from pi-hole/development
8 years ago
Adam Warner b59136c262 Merge pull request #800 from bcambl/ifcfg_backup
8 years ago
bcambl fb9664b636 fix typo
8 years ago
Adam Warner 5b736ae05e Merge pull request #799 from bcambl/ifcfg_backup
8 years ago
bcambl ee114b3075 use an excluded extension for ifcfg backup
8 years ago
Adam Warner 123b16991b Merge pull request #798 from pi-hole/dnsmasqrestartchange
8 years ago
Promofaux 5792fc0bef change wording depending on choice
8 years ago
Promofaux 42c93917ef bug I forgot to fix before piholeUpdate was merged to development
8 years ago
Promofaux 8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq
8 years ago
Adam Warner df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes
8 years ago
Adam Warner 9ce13f0035 Merge pull request #790 from pi-hole/piholeUpdate
8 years ago
Promofaux 3884b01503 Forgot a ` `
8 years ago
Promofaux a84c3adeab if uniformity then dan = happy
8 years ago
Promofaux a65b784907 repeat after me: repetition is a bit repetitive.
8 years ago
Promofaux 05dadad2e1 repair sounds better than refresh
8 years ago
Promofaux 3a9b39b842 adjust text in update_dialogs() whiptail
8 years ago
Promofaux e612003293 handle arguments better, convert to flags, echo when they're set to true.
8 years ago
Promofaux a43577fa26 add reconfigure flag to -r command
8 years ago
Promofaux 7e10dcdcf0 update pihole bash-completion
8 years ago
Promofaux 7ee1110351 ugh. pihole.conf.
8 years ago
Promofaux 51c4c51d9e Add trap to check existence of setupVars
8 years ago
Promofaux fc4fe54099 standardise function naming
8 years ago