ca56ca5bd8
promo-tweak
...
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
a0f0dff88e
replace hardcoded interface with var
...
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
2016-11-06 08:18:57 -06:00
6cb5bb7200
Merge pull request #903 from pi-hole/feature/PRGuide
...
PR against Development guide
2016-11-04 21:17:20 +00:00
563696e291
PR against Development guide
...
PA will tag PR to Master with -1 approval in the next release. That will deny any PR's against Master from users and changing branches after the PR is started does not appear to modify the PA actions.
2016-11-04 14:01:01 -07:00
8c08e9e473
Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
...
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
4300759287
Fix logic. If both v6 and v4 divide by two, else dont.
2016-11-03 08:01:25 +00:00
fc1854cadd
Merge pull request #897 from pi-hole/feature/travisDevBadge
...
Update README.md
2016-11-03 07:49:30 +00:00
933973b12c
Merge pull request #898 from pi-hole/fix/removeCC
...
Remove CodeClimate yaml, Travis new ShellChecker
2016-11-03 07:48:36 +00:00
d958b3ff65
Remove CodeClimate yaml, Travis new ShellChecker
2016-11-02 20:14:04 -07:00
a4aeb9a1dd
Update README.md
2016-11-02 20:07:51 -07:00
d7d6d6f991
Update to use new Var name
2016-11-02 21:46:30 +00:00
5986121cfc
Merge pull request #896 from pi-hole/bugfix/649
...
Check for missing index.html, replace if missing.
2016-11-02 21:27:45 +00:00
c452a4569e
.js
2016-11-02 21:17:00 +00:00
a182a208dc
Tidy up output
2016-11-02 21:06:12 +00:00
d273b4b48b
Check for missing index.html, replace if missing.
2016-11-02 20:57:56 +00:00
afed7d4af0
Merge pull request #890 from pi-hole/feature/defensiveTweaks
...
Feature/defensive tweaks
2016-11-02 20:23:04 +00:00
b429e890ad
move web interface message inside "if not update" block. Check for pi-hole deps AFTER whiptails
2016-11-02 20:16:36 +00:00
2f976504e8
switch out -eq for ==
2016-11-02 20:06:21 +00:00
b5fc88227b
Merge .gitignore
2016-11-02 12:36:00 -07:00
4b7b859db9
Gotta catch 'em all...'
2016-11-02 12:29:55 -07:00
f7d0de53bb
Compare string to string.
2016-11-02 12:11:34 -07:00
603ec997ba
Remove testing block.
2016-11-02 12:09:33 -07:00
f7266ef4c8
Version remote check returns -1 on failure to detect curl silent failing. Update detects loss of contact to GitHub or fallthrough condition and reports to user.
2016-11-02 12:07:59 -07:00
3d43e1568c
Use explicit calls for function to self-document
2016-11-02 11:39:22 -07:00
3cf6a65da9
Remove *.yml ignoring
...
Travis YAML might not be good to ignore.
2016-11-02 11:32:53 -07:00
c1a3f003e8
Rename the only utilty function left that didn't say repo
2016-11-02 11:18:13 -07:00
3f61aea7fc
Utility functions fully quiet now. Calling functions have the echos.
2016-11-02 11:09:53 -07:00
bd68db51e0
ShellCheck split local declaration and assignment.
2016-11-02 11:01:50 -07:00
b8a5ed710e
Take echos out of utility functions and move up a level.
2016-11-02 10:51:09 -07:00
34be601dd7
Test for lexicographically less than tag version.
2016-11-02 10:42:05 -07:00
1d64ad1ccd
Stash all changed files, clean directory and pull updates.
2016-11-02 10:39:27 -07:00
dfb4ac0365
Keep .yml's from going to user local repos.
2016-11-02 09:52:15 -07:00
f2d7a3d26d
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
2016-11-02 09:48:00 -07:00
6d415a7384
Merge pull request #894 from diginc/InstallFixes_UnitTests
...
Unit tests framework and some basic tests
2016-11-02 09:42:20 -07:00
0ef8832b04
whitespace
2016-11-02 09:36:30 -07:00
e42a037b7d
Grep -i instead of cat.
2016-11-02 09:28:00 -07:00
fe18d69b65
Grep should start at the beginning of line to make sure it doesn't fire on # beginning lines.
2016-11-02 09:25:32 -07:00
a1a9a7fa9e
Clarify which DNS entry we are modifying.
2016-11-02 08:52:23 -07:00
07029f93e3
Match team convention in naming.
2016-11-02 08:34:56 -07:00
e99ef9c093
Cap the variables and echo out the proper environment.
2016-11-02 08:22:45 -07:00
fef9ab674e
Pi-hole CORE installer variables are being changed to standardize scripts.
2016-11-02 07:53:02 -07:00
ee37c37cab
fix update output logic. version number variables should not be read only!
2016-11-02 14:29:20 +00:00
b636c1e1f8
Whitespace.
2016-11-02 07:00:43 -07:00
8b9f0487c0
Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks
...
# Conflicts:
# advanced/Scripts/update.sh
# automated install/basic-install.sh
2016-11-02 06:57:33 -07:00
a6cbd5a2fd
Merge pull request #895 from pi-hole/Feature/defensiveTweaks
...
Further tweaks to local repo handling
2016-11-02 13:42:24 +00:00
ece1667fb0
Refactor and move some bits.
2016-11-02 06:41:51 -07:00
50bd8b4a09
Further tweaks to local repo handling
2016-11-02 13:34:57 +00:00
93d91353a1
All tabs now spaced
2016-11-02 05:49:33 -07:00
8dc9143b34
Just delete, no need to cd there first.
2016-11-02 05:45:29 -07:00
a0d9a1133c
Factoring and combining functions
2016-11-02 05:34:39 -07:00
