Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-24 23:23:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
6443 commits 8 branches 109 tags 27 MiB
Commit graph

6443 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Promofaux
f6ac0d73b4 Add force delete option 2016-08-17 19:08:55 +01:00
Promofaux
ae47be0ce9 Add HelpFunc 2016-08-17 18:59:00 +01:00
Mcat12
491c37eafe Merge pull request #613 from goldbattle/development 
Added - Readme Windows Tray App
 2016-08-14 17:20:25 -04:00
Patrick Geneva
3ade7a8b0e Added - Readme Windows Tray App 2016-08-14 17:18:24 -04:00
Dan Schaper
3c7738b6d0 Merge pull request #619 from Fourdee/development 
Free Disk Space check standardization
 2016-08-13 19:44:40 -07:00
Daniel (Fourdee)
037318e2ff Provide non-zero exit code, as per existing sourcecode. 2016-08-12 13:20:30 +01:00
Daniel (Fourdee)
a9a499939e Fourdee - See notes: 
https://github.com/pi-hole/pi-hole/issues/602
+ Improve available free disk space check.
+ Option to override if the free disk space check is not a valid
integer.
 2016-08-12 12:44:45 +01:00
Daniel (Fourdee)
7e5bcd2ec3 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development 2016-08-12 12:11:55 +01:00
Adam Warner
f49ca48a22 Merge pull request #607 from pi-hole/Debug_Options 
Debug options
 2016-08-05 12:54:55 +01:00
Promofaux
9cb4e8bde8 Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options 
# Conflicts:
#	automated install/basic-install.sh
 2016-08-05 12:53:08 +01:00
Adam Warner
95edb49bb8 Add option for uploading debug log to termbin 2016-08-05 12:47:57 +01:00
Dan Schaper
fb69bf551e Merge pull request #593 from bcambl/sysconfig_gateway 
add gateway to interface configuration
 2016-08-04 00:26:07 -07:00
bcambl
fe8d0f8ea8 Merge branch 'development' into sysconfig_gateway 2016-08-03 19:26:53 -06:00
Mcat12
acc5fa2a95 Merge pull request #609 from pi-hole/CLI_VersionCheck 
Cli version check
 2016-08-03 21:21:30 -04:00
Mcat12
f2e33f8581 Merge branch 'development' into CLI_VersionCheck 2016-08-03 21:21:23 -04:00
Adam Warner
4748cdc2c9 Merge pull request #599 from pi-hole/PullApprove 
Add PullApprove configuration
 2016-08-04 00:14:00 +01:00
Promofaux
2bc364023a Remove erroneous space in chmod command 
Fix spacing in help function
 2016-08-02 23:51:53 +01:00
Dan Schaper
3070f61e20 Merge branch 'development' into PullApprove 2016-08-02 14:55:47 -07:00
Promofaux
57df56dc62 Add version.sh to the install script 2016-08-02 20:08:21 +01:00
Promofaux
e11ef5a7f0 Add version display script. Also checks current version on web and reports version. 2016-08-02 20:07:09 +01:00
Promofaux
6a17a3eeec Add command to pihole script 2016-08-02 19:44:11 +01:00
Promofaux
66ff9a24c6 Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing... 2016-08-01 21:54:42 +01:00
Adam Warner
a3b3a7a34d Add option for uploading debug log to termbin 2016-08-01 21:43:13 +01:00
Mcat12
c04b3559d0 Merge pull request #584 from diginc/development 
Only re-block whitelist deletions if in adlists
 2016-07-31 14:39:05 -04:00
Dan Schaper
e642b41b5b Add PullApprove configuration 2016-07-29 16:35:26 -07:00
Dan Schaper
ba6881d685 Merge pull request #595 from pi-hole/fix/README_Update 
Typo/Linter fix
 2016-07-29 13:13:24 -07:00