tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,232 Commits 10 Branches 110 Tags 33 MiB
Commit Graph

1232 Commits

Author SHA1 Message Date
Marcus Hildum aac8e45397 Imbue gravity.sh with some consistency 
Mish-mash of tabs and spaces used for indentation. Mostly tabs though,
so going with those. Also indenting blocks and enforcing the

loop statement; do
done

style over the newline for do since it seemed to be more common.
 2016-10-21 23:02:45 -07:00
Marcus Hildum 5ebfa5ecf7 heredoc for helpfunc in pihole 2016-10-21 22:53:04 -07:00
Marcus Hildum 12e041c9ef Merge remote-tracking branch 'upstream/development' into development 2016-10-21 22:49:21 -07:00
Marcus Hildum 54913f06a3 Merge remote-tracking branch 'upstream/master' into development 2016-10-21 22:49:13 -07:00
Adam Warner 44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning 
Add file change warning to header
 2016-10-21 11:24:12 +01:00
Dan Schaper e6bd979aeb Can't spell 
Fix spelling error
 2016-10-20 04:27:12 -07:00
Adam Warner 266c160108 Merge pull request #818 from airencracken/development 
Standardize function declaration
 2016-10-20 12:01:41 +01:00
Dan Schaper b5b6350cc7 Add file change warning to header 2016-10-20 03:42:25 -07:00
Dan Schaper 60a80dd678 Merge pull request #819 from pi-hole/adlistremoval 
Remove problem list, sends in Unicode - Not adware
 2016-10-20 02:41:22 -07:00
Marcus Hildum 0efda04920 Use heredocs instead of multiple calls to echo 
There were a lot of places (like in help functions) that used multiple
echo calls instead of heredocs. Personal opinion but this seems cleaner.
 2016-10-19 20:46:37 -07:00
Dan Schaper 8819e58882 Remove problem list, sends in Unicode - Not adware 
Fixes #816
 2016-10-19 20:15:36 -07:00
Marcus Hildum 28eeaf201b Standardize function declaration 
There were no fewer than three styles of function declaration going
on in these files, so I attempted to standardize them to the typical

myfucn() {
}

style.
 2016-10-19 19:47:45 -07:00
Dan Schaper 16e4f79f09 Merge pull request #809 from pi-hole/PromoTweaks 
Promo tweaks
 2016-10-18 17:37:52 -07:00
Adam Warner 76cae20c33 Merge pull request #803 from pi-hole/attributes 
Create .gitattributes
 2016-10-18 19:51:44 +01:00
Adam Warner b66f23cfd0 account for new update script 2016-10-18 14:19:44 +01:00
Adam Warner 27d6e5d8cf Complete overhaul of update logic. Moved to seperate script 2016-10-18 14:19:25 +01:00
Adam Warner ff5d5b97c3 stash any changes in local repo 2016-10-18 13:54:09 +01:00
Adam Warner ce46c4dec4 remove prematurely added code 2016-10-18 12:11:02 +01:00
Adam Warner 77e8be09a1 handle passing arguments to version script 2016-10-18 12:07:42 +01:00
Adam Warner 013d77488a complete overhaul of version script. Now with optional arguments! 2016-10-18 12:07:11 +01:00
Adam Warner 29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. 2016-10-18 12:05:48 +01:00
Adam Warner 97a013b2b7 Add direction to change upstream servers in setupVars.conf 2016-10-18 10:35:22 +01:00
Adam Warner 77808223dc remove stock comments from 01-pihole.conf and add warning to the top 2016-10-18 10:05:10 +01:00
Jacob Salmela fc89851ce9 Merge pull request #805 from pi-hole/development 
Hotfix for installer bug, MASTER
 2016-10-17 22:41:02 -05:00
Dan Schaper c4c6555814 Merge branch 'master' into development 2016-10-17 19:57:05 -07:00
Dan Schaper df0087fb23 Merge pull request #804 from pi-hole/hotfix/curlRefire 
Refire with curl
 2016-10-17 19:27:46 -07:00
Dan Schaper ef3c13fe2b Refire with curl 2016-10-17 19:22:56 -07:00
Dan Schaper 0ad704e532 Update .gitattributes 2016-10-17 18:31:06 -07:00
Dan Schaper 2220d2dab8 Create .gitattributes 2016-10-17 18:28:38 -07:00
Promofaux 49f48e2aaa wrong word. #admincrimes 2016-10-17 22:24:59 +01:00
Adam Warner dce24df379 Merge pull request #794 from pi-hole/development 
[RELEASE] v2.9.3
 2016-10-17 15:45:21 +01:00
Adam Warner b59136c262 Merge pull request #800 from bcambl/ifcfg_backup 
fix typo
 2016-10-16 22:15:39 +01:00
bcambl fb9664b636 fix typo 2016-10-16 15:11:47 -06:00
Adam Warner 5b736ae05e Merge pull request #799 from bcambl/ifcfg_backup 
use an excluded extension for ifcfg backup
 2016-10-16 20:50:54 +01:00
bcambl ee114b3075 use an excluded extension for ifcfg backup 2016-10-16 13:28:14 -06:00
Adam Warner 123b16991b Merge pull request #798 from pi-hole/dnsmasqrestartchange 
Some bug fixes before release
 2016-10-16 17:25:30 +01:00
Promofaux 5792fc0bef change wording depending on choice 2016-10-16 17:23:26 +01:00
Promofaux 42c93917ef bug I forgot to fix before piholeUpdate was merged to development 2016-10-16 17:19:44 +01:00
Promofaux 8c0f860601 Use systemctl/service calls instead of killall to restart/reload dnsmasq 2016-10-16 17:16:59 +01:00
Adam Warner df30a4c0d1 Merge pull request #779 from bcambl/fedora_fixes 
Fedora fixes
 2016-10-16 15:46:50 +01:00
Adam Warner 9ce13f0035 Merge pull request #790 from pi-hole/piholeUpdate 
Various refactoring.
 2016-10-15 23:51:07 +01:00
Promofaux 3884b01503 Forgot a ` ` 2016-10-15 23:21:13 +01:00
Promofaux a84c3adeab if uniformity then dan = happy 2016-10-15 23:19:26 +01:00
Promofaux a65b784907 repeat after me: repetition is a bit repetitive. 2016-10-15 21:26:41 +01:00
Promofaux 05dadad2e1 repair sounds better than refresh 2016-10-15 21:22:46 +01:00
Promofaux 3a9b39b842 adjust text in update_dialogs() whiptail 2016-10-15 21:12:13 +01:00
Promofaux e612003293 handle arguments better, convert to flags, echo when they're set to true. 2016-10-15 20:52:20 +01:00
Promofaux a43577fa26 add reconfigure flag to -r command 2016-10-15 20:43:03 +01:00
Promofaux 7e10dcdcf0 update pihole bash-completion 2016-10-15 20:12:16 +01:00
Promofaux 7ee1110351 ugh. pihole.conf. 2016-10-15 20:09:38 +01:00