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,415 Commits 11 Branches 110 Tags 32 MiB
Commit Graph

1415 Commits

Author SHA1 Message Date
Adam Warner fadb886d30 fix return on is_repo() function to stop it always returning 0 2016-11-02 09:28:36 +00:00
Adam Warner 45f04b8a11 set QUERY_LOGGING default to true 2016-11-01 16:46:54 +00:00
Adam Warner 61140348fe More tabs to spaces. 2016-11-01 10:16:08 +00:00
Adam Warner d64e86288c tabs to spaces 2016-11-01 10:12:47 +00:00
Adam Warner aefcd65065 tabs to spaces 2016-11-01 10:07:51 +00:00
Adam Warner a8ff316faf spaces 2016-11-01 10:04:27 +00:00
Adam Warner 032e7f2819 Fix Merge conflicts 2016-11-01 10:02:41 +00:00
Adam Warner 2c68a472ec Convention (2 spaces, not tabs) 2016-11-01 09:57:48 +00:00
Adam Warner ad3b6743a2 consistency 2016-11-01 09:48:21 +00:00
Adam Warner 60f13af1ce Update var names from setupVars.conf in gravity.sh 2016-11-01 09:47:31 +00:00
Adam Warner 06aad4ec88 consistency 2016-11-01 09:45:22 +00:00
Adam Warner 04650cbc72 Account for variable name changes 2016-11-01 09:36:59 +00:00
Adam Warner e8e2c1278e Convention : https://google.github.io/styleguide/shell.xml?showone=Constants_and_Environment_Variable_Names#Constants_and_Environment_Variable_Names 2016-11-01 09:33:39 +00:00
Adam Warner efd9a46bb9 Consistency 2016-11-01 09:32:57 +00:00
Dan Schaper e9f1259abe Prototype `whiptails` so they don't fall to shell. Need to do this to all functions. 2016-10-31 16:55:10 -07:00
Dan Schaper b22d03b586 Global variables CAP'ed 2016-10-31 16:49:40 -07:00
Dan Schaper 68f7ec0ddc `local` variables just to be safe and make sure they stay in this function. 2016-10-31 16:48:58 -07:00
Dan Schaper 652b607ce4 Swap variable names. 2016-10-31 16:48:02 -07: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
Promofaux 796119a377 enable or disable logging from pihole command 2016-10-31 22:02:20 +00:00
Promofaux 425659af5f Wording adjustment 2016-10-31 21:40:20 +00:00
Promofaux 229439c7b7 Add logging enable/disable toggle in setup 2016-10-31 21:38:48 +00:00
Promofaux 3da7bf5bed Unrelated change. Check for and install Dependencies AFTER whiptail dialogs. 2016-10-31 20:02:58 +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