Commit graph

  • 01a9534729 Merge branch 'development' into UpdateMethod Promofaux 2016-08-30 19:32:40 +0100
  • 921278c5ea Merge pull request #636 from pi-hole/QueryCommand Adam Warner 2016-08-30 19:17:50 +0100
  • d938f73207 Fix line endings Promofaux 2016-08-26 23:10:22 +0100
  • 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 Promofaux 2016-08-26 23:06:35 +0100
  • 681144b2a3 Change the switched for updateDashboard and updatePihole(was updateMain) Promofaux 2016-08-26 22:52:44 +0100
  • 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. Promofaux 2016-08-26 22:45:38 +0100
  • 77135ca3c7 Actually pass through the argument to the function Adam Warner 2016-08-26 10:09:39 +0100
  • 29b548f07c Add queryfunc Adam Warner 2016-08-26 09:39:27 +0100
  • 1af935f9e4 Merge f40614ba8f into cb33ef77f7 Squ1dw@rd 2016-08-25 23:30:24 +0000
  • cb33ef77f7 Merge pull request #635 from Fourdee/development Dan Schaper 2016-08-25 12:14:12 -0700
  • 49ded54306 Minor - Update descriptions Daniel (Fourdee) 2016-08-25 12:17:36 +0100
  • 6c0a8a4337 Minor - Corrected var names Daniel (Fourdee) 2016-08-25 12:11:54 +0100
  • e9a0ddf798 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Daniel (Fourdee) 2016-08-25 12:09:54 +0100
  • d217626318 If an existing install is detected, offer the user a choice of Updating or Installing with a radio list whiptail. Promofaux 2016-08-24 22:52:11 +0100
  • 4f5fcc2a37 Merge pull request #626 from victmo/development Dan Schaper 2016-08-22 16:43:49 -0700
  • ed94f4b1df Create directory before trying to create a blank file in it.... Promofaux 2016-08-22 22:06:33 +0100
  • a57b097afc Change echos at the end of install depending on install or update Promofaux 2016-08-21 18:00:41 +0100
  • eb42b894c4 Delete setupVars.conf if user cancels out of install process. Promofaux 2016-08-21 17:57:11 +0100
  • 43e627cb8c Merge 41aa13a2d7 into 6f0b659b38 Dan Schaper 2016-08-21 01:50:53 +0000
  • 41aa13a2d7 Remove Legacy Check Dan Schaper 2016-08-20 18:50:23 -0700
  • af666e2209 Escape space in updateMainFunc Dan Schaper 2016-08-20 18:37:35 -0700
  • 2f2e746e56 Add update function to pihole script Promofaux 2016-08-21 02:23:11 +0100
  • b3e7619048 curly brackets all the variables! Promofaux 2016-08-21 02:12:02 +0100
  • 0121136498 Added window.close() to index.html Victor Marquez 2016-08-19 20:45:17 -0400
  • 05a8195d7e Merge 76196bce86 into 6f0b659b38 Victor Marquez 2016-08-20 00:42:02 +0000
  • 7eb43a0b47 Expand update dialog text Promofaux 2016-08-19 23:21:07 +0100
  • c0430a2248 It wouldn't be me if there weren't loads of commits for simple mistakes. Promofaux 2016-08-19 23:10:56 +0100
  • 6796b8bdad pass argument from pihole command to gravity for -f check Promofaux 2016-08-19 23:06:56 +0100
  • 475d016029 hmmm Promofaux 2016-08-19 22:52:55 +0100
  • 201304e678 fix variables in gravity to stop it using -f wether it's set or not Promofaux 2016-08-19 22:51:09 +0100
  • fdb104348c Add updatePihole method Promofaux 2016-08-19 22:45:24 +0100
  • f54828352d remove spaces from update bool set Promofaux 2016-08-19 22:42:04 +0100
  • cc157def63 remove --defaultyes from update whiptail Promofaux 2016-08-19 22:40:27 +0100
  • 8fc83655ab correct filename spelling mistake Promofaux 2016-08-19 22:38:16 +0100
  • 9fb549293a APPEND Promofaux 2016-08-19 22:34:50 +0100
  • e4cc5b5b70 testing a new update method by detecting the existence of vars saved from install Promofaux 2016-08-19 22:31:11 +0100
  • 76196bce86 Addes window.close() to index.html Victor Marquez 2016-08-19 15:55:10 -0400
  • 6f0b659b38 Merge pull request #623 from pi-hole/AddForceClearToGravity Dan Schaper 2016-08-17 11:32:35 -0700
  • 652bdf1518 Merge branch 'development' into AddForceClearToGravity Dan Schaper 2016-08-17 11:32:26 -0700
  • f6ac0d73b4 Add force delete option Promofaux 2016-08-17 19:08:55 +0100
  • ae47be0ce9 Add HelpFunc Promofaux 2016-08-17 18:59:00 +0100
  • 491c37eafe Merge pull request #613 from goldbattle/development Mcat12 2016-08-14 17:20:25 -0400
  • 3ade7a8b0e Added - Readme Windows Tray App Patrick Geneva 2016-08-05 21:27:55 -0400
  • 3c7738b6d0 Merge pull request #619 from Fourdee/development Dan Schaper 2016-08-13 19:44:40 -0700
  • 037318e2ff Provide non-zero exit code, as per existing sourcecode. Daniel (Fourdee) 2016-08-12 13:20:30 +0100
  • a9a499939e Fourdee - See notes: Daniel (Fourdee) 2016-08-12 12:44:45 +0100
  • 7e5bcd2ec3 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Daniel (Fourdee) 2016-08-12 12:11:55 +0100
  • 2d39e472da Merge bf9d309449 into 02b0e96db8 Patrick Geneva 2016-08-06 01:17:39 +0000
  • bf9d309449 Added - New pi-hole project Patrick Geneva 2016-08-05 21:15:19 -0400
  • 3be04b5102 Merge c9e83c9419 into f49ca48a22 CDeeRON 2016-08-05 11:55:04 +0000
  • f49ca48a22 Merge pull request #607 from pi-hole/Debug_Options Adam Warner 2016-08-05 12:54:55 +0100
  • 9cb4e8bde8 Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options Promofaux 2016-08-05 12:53:08 +0100
  • 95edb49bb8 Add option for uploading debug log to termbin Adam Warner 2016-08-01 21:43:13 +0100
  • fb69bf551e Merge pull request #593 from bcambl/sysconfig_gateway Dan Schaper 2016-08-04 00:26:07 -0700
  • fe8d0f8ea8 Merge branch 'development' into sysconfig_gateway bcambl 2016-08-03 19:26:53 -0600
  • acc5fa2a95 Merge pull request #609 from pi-hole/CLI_VersionCheck Mcat12 2016-08-03 21:21:30 -0400
  • f2e33f8581 Merge branch 'development' into CLI_VersionCheck Mcat12 2016-08-03 21:21:23 -0400
  • c9e83c9419 Merge remote-tracking branch 'pi-hole/development' into development CDeeRON 2016-08-03 20:35:05 -0400
  • 4748cdc2c9 Merge pull request #599 from pi-hole/PullApprove Adam Warner 2016-08-04 00:14:00 +0100
  • 2bc364023a Remove erroneous space in chmod command Promofaux 2016-08-02 20:14:36 +0100
  • 3070f61e20 Merge branch 'development' into PullApprove Dan Schaper 2016-08-02 14:55:47 -0700
  • 57df56dc62 Add version.sh to the install script Promofaux 2016-08-02 20:08:21 +0100
  • e11ef5a7f0 Add version display script. Also checks current version on web and reports version. Promofaux 2016-08-02 20:07:09 +0100
  • 6a17a3eeec Add command to pihole script Promofaux 2016-08-02 19:44:11 +0100
  • f40614ba8f Update gravity.sh Squ1dw@rd 2016-08-02 09:20:51 -0400
  • 7da1f3c765 Update gravity.sh Squ1dw@rd 2016-08-02 09:20:19 -0400
  • 66ff9a24c6 Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing... Promofaux 2016-08-01 21:54:42 +0100
  • a3b3a7a34d Add option for uploading debug log to termbin Adam Warner 2016-08-01 21:43:13 +0100
  • 59fefec4d6 Merge 84b54065ff into c04b3559d0 Jacob Salmela 2016-08-01 05:42:53 +0000
  • c04b3559d0 Merge pull request #584 from diginc/development Mcat12 2016-07-31 14:39:05 -0400
  • 509afe1e1f Update basic-install.sh CDeeRON 2016-07-30 20:16:15 -0400
  • f4f0808d2d Merge 851ea3892d into 02b0e96db8 Dan Schaper 2016-07-30 11:47:02 +0000
  • 851ea3892d Remove defunct Optimal link Dan Schaper 2016-07-29 13:05:15 -0700
  • de0b2badcd Move BountySource to top position Conflicts: README.md Dan Schaper 2016-07-27 18:58:05 -0700
  • 4f62e79e72 Typo/Linter fix Dan Schaper 2016-07-26 20:46:43 -0700
  • 30fe95c984 Add files via upload Squ1dw@rd 2016-07-29 21:28:55 -0400
  • e642b41b5b Add PullApprove configuration Dan Schaper 2016-07-29 16:35:26 -0700
  • ee5a94b47c Merge b9420d10fe into 02b0e96db8 Dan Schaper 2016-07-29 21:36:06 +0000
  • b9420d10fe Remove defunct Optimal link Dan Schaper 2016-07-29 13:05:15 -0700
  • 407d1a0661 Move BountySource to top position Conflicts: README.md Dan Schaper 2016-07-27 18:58:05 -0700
  • d52e8a270a Typo/Linter fix Dan Schaper 2016-07-26 20:46:43 -0700
  • 1c23e1407a Merge 20d8c9053b into 02b0e96db8 Dan Schaper 2016-07-29 20:50:02 +0000
  • ba6881d685 Merge pull request #595 from pi-hole/fix/README_Update Dan Schaper 2016-07-29 13:13:24 -0700
  • 20d8c9053b Remove defunct Optimal link Dan Schaper 2016-07-29 13:05:15 -0700
  • 0749e4ed70 Move BountySource to top position Dan Schaper 2016-07-27 18:58:05 -0700
  • b0cc69ff80 Merge Conflict resolution Dan Schaper 2016-07-27 18:54:41 -0700
  • 3b317942dd Merge 02c4669e95 into 02b0e96db8 Dan Schaper 2016-07-27 03:47:18 +0000
  • 02c4669e95 Typo/Linter fix Dan Schaper 2016-07-26 20:46:43 -0700
  • 8550b76e23 add gateway to interface configuration bcambl 2016-07-24 22:42:06 -0600
  • fdf27e3d24 Merge pull request #573 from bcambl/centos-nc Adam Warner 2016-07-22 19:02:29 +0100
  • 069023fca2 Merge pull request #589 from pi-hole/PromoFaux-patch-1 Adam Warner 2016-07-22 14:14:07 +0100
  • 1fd6648db1 Merge pull request #591 from pi-hole/master Adam Warner 2016-07-22 12:04:15 +0100
  • 7a08c8b694 Merge pull request #590 from pi-hole/revert-588-master Adam Warner 2016-07-22 12:03:17 +0100
  • 60aad3f19b Revert "Development out of sync with master." Adam Warner 2016-07-22 11:59:19 +0100
  • 51dcc2bc0f Update README.md Adam Warner 2016-07-22 11:56:54 +0100
  • 941525d1e0 Development out of sync with master. (#588) Adam Warner 2016-07-22 11:54:17 +0100
  • 5fb6c5b012 Making the whitelist re-block echo consistent with other WL/BL echos diginc 2016-07-20 12:53:31 -0500
  • 3affa73257 Only re-block whitelist deletions if in adlists diginc 2016-07-20 12:43:30 -0500
  • c647e27e15 Merge branch 'development' into centos-nc Blayne Campbell 2016-07-19 08:48:54 -0600
  • f696ed48b3 Merge pull request #570 from pi-hole/bugfix/dhcpcd_comments Dan Schaper 2016-07-18 16:32:12 -0700