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,019 Commits 8 Branches 109 Tags 31 MiB
Commit Graph

1019 Commits

Author SHA1 Message Date
Adam Warner edf81a232d Merge pull request #671 from pi-hole/PromoFaux-patch-1 
Add cron to apt-get dependencies
 2016-09-09 20:23:34 +01:00
Adam Warner c2cb92a0b0 Add cron to apt-get dependencies 2016-09-08 23:42:05 +01:00
Dan Schaper 150e01be8b Merge pull request #667 from pi-hole/piholeBashCompletionUpdate 
Add the newer pihole command tags to the bash auto complete!
 2016-09-06 15:02:13 -07:00
Promofaux 95ee3216c4 Add the newer pihole command tags to the bash auto complete! 2016-09-06 21:57:17 +01:00
Adam Warner 3b5e409b38 Merge pull request #666 from pi-hole/PromoFaux-patch-1 
Change log flush time to 00:00
 2016-09-06 19:30:36 +01:00
Adam Warner eb201b614a Change log flush time to 00:00 2016-09-06 19:29:30 +01:00
Adam Warner 162a6b8b5c Merge pull request #665 from pi-hole/FleshOutPiholeQ 
Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner!
 2016-09-06 19:25:03 +01:00
Promofaux 4ec01769cb Appease Jacob. 2016-09-06 19:21:56 +01:00
Promofaux 19b656132d Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner! 2016-09-06 19:16:04 +01:00
Adam Warner 6305c7e2ab Merge pull request #663 from pi-hole/Bugfix660 
Switch fedora and debian install check order
 2016-09-05 18:32:55 +01:00
Promofaux 04c60e8a1c Switch fedora and debian install check order 2016-09-05 15:52:09 +01:00
Adam Warner b6ceb06a32 Merge pull request #655 from pi-hole/PromoFaux-patch-1 
Replace `truncate` command with `echo " " >`
 2016-09-02 19:34:50 +01:00
Adam Warner 8cb2f85a08 Replace `truncate` command with `echo " " >` 2016-09-02 16:39:34 +01:00
Adam Warner 7ccfb6ea88 Merge pull request #651 from pi-hole/PromoFaux-patch-1 
Remove defunct list from adlists.default
 2016-09-02 14:12:32 +01:00
Adam Warner 531398b532 Remove defunct list from adlists.default 
See issue #650
 2016-09-02 11:27:13 +01:00
Dan Schaper fdb0e31a78 Merge pull request #625 from pi-hole/UpdateMethod 
Forget all existing attempts at an update method... this is the one.
 2016-08-30 11:47:36 -07:00
Promofaux 01a9534729 Merge branch 'development' into UpdateMethod 
# Conflicts:
#	automated install/basic-install.sh
 2016-08-30 19:32:40 +01:00
Adam Warner 921278c5ea Merge pull request #636 from pi-hole/QueryCommand 
Query command
 2016-08-30 19:17:50 +01:00
Promofaux d938f73207 Fix line endings 2016-08-26 23:10:22 +01:00
Promofaux 344e63c2dc Add undocumented argument to install script ("pihole") which allows the pihole command to run the update script without prompting the user. Useful for update automation 2016-08-26 23:06:35 +01:00
Promofaux 681144b2a3 Change the switched for updateDashboard and updatePihole(was updateMain) 2016-08-26 22:52:44 +01:00
Promofaux e4295f5d3c Move exporting the setupConf files to a function to be run at the end of the script only. If script is cancelled, then they are not written. Simples. 
Also I'm surprised nobody noticed the duplicate installPihole() function :S
 2016-08-26 22:45:38 +01:00
Adam Warner 77135ca3c7 Actually pass through the argument to the function 2016-08-26 10:09:39 +01:00
Adam Warner 29b548f07c Add queryfunc 2016-08-26 09:39:27 +01:00
Dan Schaper cb33ef77f7 Merge pull request #635 from Fourdee/development 
Minor - Corrected var names
 2016-08-25 12:14:12 -07:00
Daniel (Fourdee) 49ded54306 Minor - Update descriptions 
Apply to whiptail descriptions also.
 2016-08-25 12:17:36 +01:00
Daniel (Fourdee) 6c0a8a4337 Minor - Corrected var names 
Kilobyte values are used, not Bytes.
 2016-08-25 12:11:54 +01:00
Daniel (Fourdee) e9a0ddf798 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development 2016-08-25 12:09:54 +01:00
Promofaux d217626318 If an existing install is detected, offer the user a choice of Updating or Installing with a radio list whiptail. 2016-08-24 22:52:11 +01:00
Dan Schaper 4f5fcc2a37 Merge pull request #626 from victmo/development 
Added window.close() to index.html
 2016-08-22 16:43:49 -07:00
Promofaux ed94f4b1df Create directory before trying to create a blank file in it.... 2016-08-22 22:06:33 +01:00
Promofaux a57b097afc Change echos at the end of install depending on install or update 2016-08-21 18:00:41 +01:00
Promofaux eb42b894c4 Delete setupVars.conf if user cancels out of install process. 2016-08-21 17:57:11 +01:00
Dan Schaper af666e2209 Escape space in updateMainFunc 
Legacy space in path strikes again!
 2016-08-20 18:37:35 -07:00
Promofaux 2f2e746e56 Add update function to pihole script 2016-08-21 02:23:11 +01:00
Promofaux b3e7619048 curly brackets all the variables! 2016-08-21 02:12:02 +01:00
Victor Marquez 0121136498 Added window.close() to index.html 
Adding window.close() will automatically close any pop-ups that might get loaded with a blocked ad.
 2016-08-19 20:45:17 -04:00
Promofaux 7eb43a0b47 Expand update dialog text 2016-08-19 23:25:04 +01:00
Promofaux c0430a2248 It wouldn't be me if there weren't loads of commits for simple mistakes. 2016-08-19 23:10:56 +01:00
Promofaux 6796b8bdad pass argument from pihole command to gravity for -f check 2016-08-19 23:06:56 +01:00
Promofaux 475d016029 hmmm 2016-08-19 22:52:55 +01:00
Promofaux 201304e678 fix variables in gravity to stop it using -f wether it's set or not 2016-08-19 22:51:09 +01:00
Promofaux fdb104348c Add updatePihole method 2016-08-19 22:45:24 +01:00
Promofaux f54828352d remove spaces from update bool set 2016-08-19 22:42:04 +01:00
Promofaux cc157def63 remove --defaultyes from update whiptail 2016-08-19 22:40:27 +01:00
Promofaux 8fc83655ab correct filename spelling mistake 2016-08-19 22:38:16 +01:00
Promofaux 9fb549293a APPEND 2016-08-19 22:34:50 +01:00
Promofaux e4cc5b5b70 testing a new update method by detecting the existence of vars saved from install 2016-08-19 22:31:11 +01:00
Dan Schaper 6f0b659b38 Merge pull request #623 from pi-hole/AddForceClearToGravity 
Add force clear to gravity
 2016-08-17 11:32:35 -07:00
Dan Schaper 652bdf1518 Merge branch 'development' into AddForceClearToGravity 2016-08-17 11:32:26 -07:00