Commit graph

1512 commits

Author SHA1 Message Date
Dan Schaper
53016c6d70 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development 2016-11-08 04:50:08 -08:00
Dan Schaper
e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup
Dependancy cleanup
2016-11-07 21:45:23 -08:00
Dan Schaper
d4270e02e9 Merge pull request #902 from elpatron68/master
Added Link to blink1_pi-hole.py
2016-11-07 21:44:28 -08:00
Mcat12
b9a263ecb2 Merge pull request #907 from pi-hole/bugfix/chronometer-interface
replace hardcoded interface with var
2016-11-07 21:35:09 -05:00
Dan Schaper
4929d415a6 Merge pull request #906 from pi-hole/Fix/send-frs-into-orbit
Direct users to Discourse for FRs
2016-11-07 17:32:28 -08:00
Dan Schaper
b9e1f518aa Merge pull request #909 from bcambl/fix_ifcfg_append
Fedora: write interface config instead of append
2016-11-07 17:23:50 -08:00
bcambl
0caa44e979 write ifcfg instead of appending 2016-11-07 12:54:31 -06:00
Jacob Salmela
ca56ca5bd8 promo-tweak
Better logic introduced by @PromoFaux
2016-11-06 11:16:48 -06:00
Jacob Salmela
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
Jacob Salmela
e5cc38a210 Direct users to Discourse for FRs
It's a better platform for it because users can vote and we can have
easier discussions for it.
2016-11-06 08:08:58 -06:00
Dan Schaper
941ba535ef Remove CC badge 2016-11-04 18:44:21 -07:00
Dan Schaper
fe959b15b4 Add git clone method to installers 2016-11-04 18:43:54 -07:00
Dan Schaper
1568c9ab3b Change path to remove space 2016-11-04 18:32:10 -07:00
Dan Schaper
0dc9d7fbd4 Remove swapfile that hasn't been used on about a year. 2016-11-04 18:31:38 -07:00
Dan Schaper
ea69af8853 Update Basic for path without space. 2016-11-04 18:30:50 -07:00
Adam Warner
6cb5bb7200 Merge pull request #903 from pi-hole/feature/PRGuide
PR against Development guide
2016-11-04 21:17:20 +00:00
Dan Schaper
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
Markus Busche
c755b3c49e Added Link to blink1_pi-hole.py 2016-11-04 21:56:14 +01:00
Dan Schaper
8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count
Bugfix/chronometer domain count
2016-11-03 13:55:29 -07:00
Adam Warner
4300759287 Fix logic. If both v6 and v4 divide by two, else dont. 2016-11-03 08:01:25 +00:00
Adam Warner
fc1854cadd Merge pull request #897 from pi-hole/feature/travisDevBadge
Update README.md
2016-11-03 07:49:30 +00:00
Adam Warner
933973b12c Merge pull request #898 from pi-hole/fix/removeCC
Remove CodeClimate yaml, Travis new ShellChecker
2016-11-03 07:48:36 +00:00
Dan Schaper
d958b3ff65 Remove CodeClimate yaml, Travis new ShellChecker 2016-11-02 20:14:04 -07:00
Dan Schaper
a4aeb9a1dd Update README.md 2016-11-02 20:07:51 -07:00
Eric Warnke
71005e1db3 Merge with change of spacing in development 2016-11-02 19:01:34 -04:00
Promofaux
d7d6d6f991 Update to use new Var name 2016-11-02 21:46:30 +00:00
Adam Warner
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
Promofaux
c452a4569e .js 2016-11-02 21:17:00 +00:00
Promofaux
a182a208dc Tidy up output 2016-11-02 21:06:12 +00:00
Promofaux
d273b4b48b Check for missing index.html, replace if missing. 2016-11-02 20:57:56 +00:00
Adam Warner
afed7d4af0 Merge pull request #890 from pi-hole/feature/defensiveTweaks
Feature/defensive tweaks
2016-11-02 20:23:04 +00:00
Promofaux
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
Promofaux
2f976504e8 switch out -eq for == 2016-11-02 20:06:21 +00:00
Dan Schaper
b5fc88227b Merge .gitignore 2016-11-02 12:36:00 -07:00
Dan Schaper
4b7b859db9 Gotta catch 'em all...' 2016-11-02 12:29:55 -07:00
Dan Schaper
f7d0de53bb Compare string to string. 2016-11-02 12:11:34 -07:00
Dan Schaper
603ec997ba Remove testing block. 2016-11-02 12:09:33 -07:00
Dan Schaper
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
Dan Schaper
3d43e1568c Use explicit calls for function to self-document 2016-11-02 11:39:22 -07:00
Dan Schaper
3cf6a65da9 Remove *.yml ignoring
Travis YAML might not be good to ignore.
2016-11-02 11:32:53 -07:00
Dan Schaper
c1a3f003e8 Rename the only utilty function left that didn't say repo 2016-11-02 11:18:13 -07:00
Dan Schaper
3f61aea7fc Utility functions fully quiet now. Calling functions have the echos. 2016-11-02 11:09:53 -07:00
Dan Schaper
bd68db51e0 ShellCheck split local declaration and assignment. 2016-11-02 11:01:50 -07:00
Dan Schaper
b8a5ed710e Take echos out of utility functions and move up a level. 2016-11-02 10:51:09 -07:00
Dan Schaper
34be601dd7 Test for lexicographically less than tag version. 2016-11-02 10:42:05 -07:00
Dan Schaper
1d64ad1ccd Stash all changed files, clean directory and pull updates. 2016-11-02 10:39:27 -07:00
Dan Schaper
dfb4ac0365 Keep .yml's from going to user local repos. 2016-11-02 09:52:15 -07:00
Dan Schaper
f2d7a3d26d Merge branch 'feature/defensiveTweaks' of https://github.com/pi-hole/pi-hole into feature/defensiveTweaks 2016-11-02 09:48:00 -07:00
Dan Schaper
6d415a7384 Merge pull request #894 from diginc/InstallFixes_UnitTests
Unit tests framework and some basic tests
2016-11-02 09:42:20 -07:00
Dan Schaper
0ef8832b04 whitespace 2016-11-02 09:36:30 -07:00