arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-10-18 13:59:15 +00:00
Code Issues Releases Wiki Activity
1,255 Commits 7 Branches 109 Tags 18 MiB
acff90c000
Commit Graph

1255 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacob Salmela
acff90c000 fix check box spacing 
I have seen several issues/PRs with the extra space.  removing the
extra whitespace might help to keep the formatting when being submitted.
 2016-10-24 14:58:13 -05:00
Adam Warner
5f9e72dd71 Merge pull request #835 from pi-hole/debugFixes 
Debug script tweaks.
 2016-10-24 19:40:27 +06:00
Adam Warner
be0bcb8f7d Merge pull request #838 from airencracken/hotfix-missing-newline 
Fix missing newline
 2016-10-24 15:48:53 +06:00
Adam Warner
44c3d56439 Merge pull request #836 from pi-hole/UdemyAttribution 
Udemy attribution
 2016-10-24 13:54:14 +06:00
Marcus Hildum
519d731ddd Fix missing newline 
My mistake
 2016-10-23 16:45:51 -07:00
Dan Schaper
119c00c22a Merge pull request #837 from pi-hole/UdemyAttribution-1 
Update PULL_REQUEST_TEMPLATE.md
 2016-10-23 15:53:27 -07:00
Dan Schaper
12596dd697 Update PULL_REQUEST_TEMPLATE.md 2016-10-23 15:50:59 -07:00
Dan Schaper
cb38f5f0d7 Move attribution to bottom since our bots quote from top 
Bot's keeps quoting the attribution line in snippets (Discourse, GitLab, Mattermost)
 2016-10-23 15:50:03 -07:00
Promofaux
c958bed418 Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function 2016-10-23 22:31:20 +01:00
Promofaux
2b2c240d39 Fix shebang line broken in #831 
Remove root check and references to ${SUDO}

Check for /etc/pihole/setupVars.conf and use piholeInterace in IPv6 checks as suggest by @jacobsalmela https://github.com/pi-hole/pi-hole/pull/831#issuecomment-255606854
 2016-10-23 22:15:10 +01:00
Adam Warner
1f0ae16216 Merge pull request #831 from airencracken/development 
Consistent Style in Bash
 2016-10-23 20:03:30 +01:00
Marcus Hildum
5d6072524c Consistency 
Missed one
 2016-10-22 10:26:00 -07:00
Marcus Hildum
07a66a70fc Consistency 
More of the same
 2016-10-22 10:12:05 -07:00
Marcus Hildum
69ba8a3c2f Consistency 
Again trying to move the repo to one style. Doesn't matter if it's
changed afterwards, but one style instead of about five seems
saner.
 2016-10-22 10:01:15 -07:00
Marcus Hildum
a30c75ef71 Consistency 
Cleanup!
 2016-10-22 00:35:44 -07:00
Marcus Hildum
d0b3727c5d Consistency 
Yet more cleanup
 2016-10-22 00:32:36 -07:00
Marcus Hildum
6e94bf5b6d Consistency 
You know the drill
 2016-10-22 00:14:38 -07:00
Marcus Hildum
0f04e270a7 consistency 
Just more cleanup
 2016-10-22 00:10:25 -07:00
Marcus Hildum
ec4f5007e7 remove bad { 2016-10-21 23:59:31 -07:00
Marcus Hildum
21b906e0e0 Consistency 
More of the same
 2016-10-21 23:57:47 -07:00
Marcus Hildum
7ebaf8e843 Consistency 
Now with block indents!
 2016-10-21 23:23:31 -07:00
Marcus Hildum
640398ced4 Consistency 
We went with tabs earlier, may as well make that the "standard".
Easy enough to switch to spaces too if that's desired with expand(1)
 2016-10-21 23:17:14 -07:00
Marcus Hildum
ebbe1fc236 More consistency 
Odd mix of variables quoted with and without no-op parameter expansion

(i.e. ${thing})

More ${thing} than not, make that the standard
 2016-10-21 23:11:17 -07:00
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