Commit Graph

1400 Commits

Author SHA1 Message Date
Dan Schaper e99ef9c093 Cap the variables and echo out the proper environment. 2016-11-02 08:22:45 -07:00
Dan Schaper fef9ab674e Pi-hole CORE installer variables are being changed to standardize scripts. 2016-11-02 07:53:02 -07:00
diginc 7548d9a8fe point shellcheck at update.sh instead 2016-11-01 23:56:46 -05:00
diginc 26789f9b36 add travis and python requirements 2016-11-01 23:53:11 -05:00
diginc b4524839bb Merge branch 'development' of https://github.com/pi-hole/pi-hole into InstallFixes_UnitTests 2016-11-01 23:52:20 -05:00
Adam Warner d561600a31 Merge pull request #863 from brontide/wheezy_fix2
[Test] Wheezy install fix by selecting appropriate deps, made the php check …
2016-10-31 22:35:46 +00:00
Adam Warner 024e843998 Merge pull request #884 from pi-hole/PromoFaux-patch-2
Update pullapprove into master
2016-10-30 17:17:53 +00:00
Adam Warner 126f275e18 Update pullapprove into master
Requires approval of ALL members of the `admin` team.
2016-10-30 17:15:35 +00:00
Dan Schaper c65e5ff8e0 Merge pull request #882 from pi-hole/feature/DiscourseREADME
Feature/discourse readme
2016-10-30 08:05:48 -07:00
Dan Schaper ef13e67572 Update README.md 2016-10-30 07:11:34 -07:00
Dan Schaper 7920fcbb5e Add linux.die.net links
Add links for online manpages.
2016-10-30 07:09:03 -07:00
Dan Schaper fa36fdeb03 Update README
Add discourse links, remove last of Optimal, bring Other Devices up to the top, update alternate install instructions.
2016-10-30 07:06:27 -07:00
Adam Warner c143b5ccb4 Merge pull request #881 from pi-hole/feature/doc-update
Update last modified date for adlist
2016-10-30 14:04:30 +00:00
Dan Schaper 05c8406fca Update last modified date for adlist 2016-10-30 06:37:36 -07:00
Dan Schaper 69e3a45083 Merge pull request #874 from pi-hole/development
Next release 2.9.5
2016-10-29 17:01:51 -07:00
Dan Schaper 45259b6ec6 Merge branch 'master' into development 2016-10-29 16:59:02 -07:00
Adam Warner d6fe48112c Merge pull request #857 from pi-hole/feature/debugUpdate
Debug Updates
2016-10-29 23:15:07 +01:00
Dan Schaper dcf6e6b14d Clarify user action required to end the scripts. 2016-10-29 12:24:22 -07:00
Dan Schaper 908697a963 User token instructions, and small bugfix for missing separator. 2016-10-29 12:04:18 -07:00
Dan Schaper bdaf961196 Merge pull request #876 from brontide/list_fix
[bug] Grep was leaking a file not found if blacklist didn't exist
2016-10-29 07:15:22 -07:00
Dan Schaper 6bd5d9b1a4 Merge pull request #879 from pi-hole/PromoFaux-patch-2
Update README.md
2016-10-29 07:13:26 -07:00
Adam Warner beb0dae5a7 Update README.md
Add code climate badge
2016-10-29 14:46:09 +01:00
Dan Schaper fad2d6b1d1 Return values start showin up now. Logic operators too... 2016-10-28 15:53:18 -07:00
Dan Schaper 9cd830b6aa Start to refine tests and clean up code. 2016-10-28 15:37:45 -07:00
Dan Schaper d9a16b0ff4 Clear up bottom half of script with fewer redundenicies. 2016-10-28 15:25:06 -07:00
Dan Schaper cb5c94ef5e Sorry, left that gravity.list parser in. Big debug files. Cleared that up. 2016-10-28 15:13:04 -07:00
Dan Schaper 85fbd66871 Good commit point, number of changes 2016-10-28 14:52:08 -07:00
Eric Warnke 3da75d6125 Grep was leaking a file not found if blacklist didn't exist 2016-10-28 17:28:04 -04:00
Dan Schaper d4a3a5c180 Trying to implement The Brontide Idiom for design. 2016-10-28 10:42:30 -07:00
Eric Warnke 65e0fcbf10 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-28 13:14:00 -04:00
Dan Schaper e22aca49c8 Merge pull request #813 from das7pad/development
Create missing directory for lighttpd
2016-10-28 10:05:08 -07:00
Dan Schaper 71e3a473d6 Fix = underbar 2016-10-28 07:16:16 -07:00
Dan Schaper c2cfc09f63 Clean up more of the UX and log. Lots to go. 2016-10-28 07:06:05 -07:00
Dan Schaper cbfad28f7e Merge pull request #873 from pi-hole/PromoFaux-patch-2
Create .codeclimate.yml
2016-10-28 07:04:53 -07:00
Adam Warner 6a4a468022 Create .codeclimate.yml 2016-10-28 15:02:03 +01:00
Dan Schaper 01f10b56e8 Refactor out some more reudndant code. 2016-10-28 06:51:30 -07:00
Dan Schaper 90ec0a610e Tricorder is introduced. 2016-10-28 04:42:45 -07:00
Dan Schaper 42bff1ce1b Move parse utility to be near other parsing functions. 2016-10-28 03:53:53 -07:00
Dan Schaper e3c7a1f31f Top half user output updated. 2016-10-28 03:49:03 -07:00
Dan Schaper 0debbffa70 Add a couple of parsing utility functions. 2016-10-28 03:45:07 -07:00
Jacob Salmela 473b58d26d Merge pull request #704 from stonedbovines/development
lighttpd.conf templates change
2016-10-27 20:22:46 -05:00
Adam Warner 7e9498f04c Merge pull request #869 from pi-hole/feature/listen-address-1
Remove `listen-address` directive
2016-10-27 19:59:58 +01:00
Dan Schaper 300001e766 Remove `listen-address` directive
Since we declare an `interface` `dnsmasq` should ignore the `listen-address` directive thus making redundant. Removed.
2016-10-27 11:56:16 -07:00
Adam Warner 21fc6344bf Merge pull request #849 from pi-hole/aManHasNoNameResolution
[BugFix] A man has no name resolution
2016-10-27 19:41:07 +01:00
Adam Warner a38edd891f Merge pull request #867 from pi-hole/gravTweaks
No need to reference script that does not exist...
2016-10-27 18:09:28 +01:00
Promofaux 794fa21137 install uninstall.sh... 2016-10-27 12:44:21 +01:00
Eric Warnke 977d1d1998 Merge branch 'development' of https://github.com/pi-hole/pi-hole into wheezy_fix2 2016-10-27 07:37:40 -04:00
Promofaux cde003bc98 \ all the /s! 2016-10-27 11:13:00 +01:00
Promofaux 9e4e1d1cb2 improve comments 2016-10-27 11:09:24 +01:00
Promofaux 60142cd960 remove reference to whitelist.sh (no longer exists) replace with `pihole -w` 2016-10-27 11:06:11 +01:00