Commit Graph

  • 4ec01769cb Appease Jacob. Promofaux 2016-09-06 19:21:56 +01:00
  • 19b656132d Make the output of pihole -q a bit clearer. Bye Bye nifty one-liner! Promofaux 2016-09-06 19:16:04 +01:00
  • 6305c7e2ab Merge pull request #663 from pi-hole/Bugfix660 Adam Warner 2016-09-05 18:32:55 +01:00
  • 04c60e8a1c Switch fedora and debian install check order Promofaux 2016-09-05 15:52:09 +01:00
  • b6ceb06a32 Merge pull request #655 from pi-hole/PromoFaux-patch-1 Adam Warner 2016-09-02 19:34:50 +01:00
  • 8cb2f85a08 Replace truncate command with echo " " > Adam Warner 2016-09-02 16:39:34 +01:00
  • 7ccfb6ea88 Merge pull request #651 from pi-hole/PromoFaux-patch-1 Adam Warner 2016-09-02 14:12:32 +01:00
  • 531398b532 Remove defunct list from adlists.default Adam Warner 2016-09-02 11:27:13 +01:00
  • ec6ecf0d60 Merge pull request #639 from pi-hole/development v2.9 Adam Warner 2016-08-30 21:46:04 +01:00
  • fdb0e31a78 Merge pull request #625 from pi-hole/UpdateMethod Dan Schaper 2016-08-30 11:47:36 -07:00
  • 01a9534729 Merge branch 'development' into UpdateMethod Promofaux 2016-08-30 19:32:40 +01:00
  • 921278c5ea Merge pull request #636 from pi-hole/QueryCommand Adam Warner 2016-08-30 19:17:50 +01:00
  • d938f73207 Fix line endings Promofaux 2016-08-26 23:10:22 +01:00
  • 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 +01:00
  • 681144b2a3 Change the switched for updateDashboard and updatePihole(was updateMain) Promofaux 2016-08-26 22:52:44 +01:00
  • 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 +01:00
  • 77135ca3c7 Actually pass through the argument to the function Adam Warner 2016-08-26 10:09:39 +01:00
  • 29b548f07c Add queryfunc Adam Warner 2016-08-26 09:39:27 +01:00
  • cb33ef77f7 Merge pull request #635 from Fourdee/development Dan Schaper 2016-08-25 12:14:12 -07:00
  • 49ded54306 Minor - Update descriptions Daniel (Fourdee) 2016-08-25 12:17:36 +01:00
  • 6c0a8a4337 Minor - Corrected var names Daniel (Fourdee) 2016-08-25 12:11:54 +01:00
  • e9a0ddf798 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Daniel (Fourdee) 2016-08-25 12:09:54 +01:00
  • 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 +01:00
  • 4f5fcc2a37 Merge pull request #626 from victmo/development Dan Schaper 2016-08-22 16:43:49 -07:00
  • ed94f4b1df Create directory before trying to create a blank file in it.... Promofaux 2016-08-22 22:06:33 +01:00
  • a57b097afc Change echos at the end of install depending on install or update Promofaux 2016-08-21 18:00:41 +01:00
  • eb42b894c4 Delete setupVars.conf if user cancels out of install process. Promofaux 2016-08-21 17:57:11 +01:00
  • af666e2209 Escape space in updateMainFunc Dan Schaper 2016-08-20 18:37:35 -07:00
  • 2f2e746e56 Add update function to pihole script Promofaux 2016-08-21 02:23:11 +01:00
  • b3e7619048 curly brackets all the variables! Promofaux 2016-08-21 02:12:02 +01:00
  • 0121136498 Added window.close() to index.html Victor Marquez 2016-08-19 20:45:17 -04:00
  • 7eb43a0b47 Expand update dialog text Promofaux 2016-08-19 23:21:07 +01:00
  • c0430a2248 It wouldn't be me if there weren't loads of commits for simple mistakes. Promofaux 2016-08-19 23:10:56 +01:00
  • 6796b8bdad pass argument from pihole command to gravity for -f check Promofaux 2016-08-19 23:06:56 +01:00
  • 475d016029 hmmm Promofaux 2016-08-19 22:52:55 +01:00
  • 201304e678 fix variables in gravity to stop it using -f wether it's set or not Promofaux 2016-08-19 22:51:09 +01:00
  • fdb104348c Add updatePihole method Promofaux 2016-08-19 22:45:24 +01:00
  • f54828352d remove spaces from update bool set Promofaux 2016-08-19 22:42:04 +01:00
  • cc157def63 remove --defaultyes from update whiptail Promofaux 2016-08-19 22:40:27 +01:00
  • 8fc83655ab correct filename spelling mistake Promofaux 2016-08-19 22:38:16 +01:00
  • 9fb549293a APPEND Promofaux 2016-08-19 22:34:50 +01:00
  • e4cc5b5b70 testing a new update method by detecting the existence of vars saved from install Promofaux 2016-08-19 22:31:11 +01:00
  • 6f0b659b38 Merge pull request #623 from pi-hole/AddForceClearToGravity Dan Schaper 2016-08-17 11:32:35 -07:00
  • 652bdf1518 Merge branch 'development' into AddForceClearToGravity Dan Schaper 2016-08-17 11:32:26 -07:00
  • f6ac0d73b4 Add force delete option Promofaux 2016-08-17 19:08:55 +01:00
  • ae47be0ce9 Add HelpFunc Promofaux 2016-08-17 18:59:00 +01:00
  • 491c37eafe Merge pull request #613 from goldbattle/development Mcat12 2016-08-14 17:20:25 -04:00
  • 3ade7a8b0e Added - Readme Windows Tray App Patrick Geneva 2016-08-05 21:27:55 -04:00
  • 3c7738b6d0 Merge pull request #619 from Fourdee/development Dan Schaper 2016-08-13 19:44:40 -07:00
  • 037318e2ff Provide non-zero exit code, as per existing sourcecode. Daniel (Fourdee) 2016-08-12 13:20:30 +01:00
  • a9a499939e Fourdee - See notes: Daniel (Fourdee) 2016-08-12 12:44:45 +01:00
  • 7e5bcd2ec3 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Daniel (Fourdee) 2016-08-12 12:11:55 +01:00
  • f49ca48a22 Merge pull request #607 from pi-hole/Debug_Options Adam Warner 2016-08-05 12:54:55 +01:00
  • 9cb4e8bde8 Merge remote-tracking branch 'origin/Debug_Options' into Debug_Options Promofaux 2016-08-05 12:53:08 +01:00
  • 95edb49bb8 Add option for uploading debug log to termbin Adam Warner 2016-08-01 21:43:13 +01:00
  • fb69bf551e Merge pull request #593 from bcambl/sysconfig_gateway Dan Schaper 2016-08-04 00:26:07 -07:00
  • fe8d0f8ea8 Merge branch 'development' into sysconfig_gateway bcambl 2016-08-03 19:26:53 -06:00
  • acc5fa2a95 Merge pull request #609 from pi-hole/CLI_VersionCheck Mcat12 2016-08-03 21:21:30 -04:00
  • f2e33f8581 Merge branch 'development' into CLI_VersionCheck Mcat12 2016-08-03 21:21:23 -04:00
  • 4748cdc2c9 Merge pull request #599 from pi-hole/PullApprove Adam Warner 2016-08-04 00:14:00 +01:00
  • 2bc364023a Remove erroneous space in chmod command Promofaux 2016-08-02 20:14:36 +01:00
  • 3070f61e20 Merge branch 'development' into PullApprove Dan Schaper 2016-08-02 14:55:47 -07:00
  • 57df56dc62 Add version.sh to the install script Promofaux 2016-08-02 20:08:21 +01:00
  • e11ef5a7f0 Add version display script. Also checks current version on web and reports version. Promofaux 2016-08-02 20:07:09 +01:00
  • 6a17a3eeec Add command to pihole script Promofaux 2016-08-02 19:44:11 +01:00
  • 66ff9a24c6 Add piholeDebug to the chmod 755 command in install script. Not sure how that went missing... Promofaux 2016-08-01 21:54:42 +01:00
  • a3b3a7a34d Add option for uploading debug log to termbin Adam Warner 2016-08-01 21:43:13 +01:00
  • c04b3559d0 Merge pull request #584 from diginc/development Mcat12 2016-07-31 14:39:05 -04:00
  • e642b41b5b Add PullApprove configuration Dan Schaper 2016-07-29 16:35:26 -07:00
  • ba6881d685 Merge pull request #595 from pi-hole/fix/README_Update Dan Schaper 2016-07-29 13:13:24 -07:00
  • 20d8c9053b Remove defunct Optimal link Dan Schaper 2016-07-29 13:05:15 -07:00
  • 0749e4ed70 Move BountySource to top position Dan Schaper 2016-07-27 18:58:05 -07:00
  • b0cc69ff80 Merge Conflict resolution Dan Schaper 2016-07-27 18:54:41 -07:00
  • 02c4669e95 Typo/Linter fix Dan Schaper 2016-07-26 20:46:43 -07:00
  • 8550b76e23 add gateway to interface configuration bcambl 2016-07-24 22:42:06 -06:00
  • fdf27e3d24 Merge pull request #573 from bcambl/centos-nc Adam Warner 2016-07-22 19:02:29 +01:00
  • 069023fca2 Merge pull request #589 from pi-hole/PromoFaux-patch-1 Adam Warner 2016-07-22 14:14:07 +01:00
  • 1fd6648db1 Merge pull request #591 from pi-hole/master Adam Warner 2016-07-22 12:04:15 +01:00
  • 7a08c8b694 Merge pull request #590 from pi-hole/revert-588-master Adam Warner 2016-07-22 12:03:17 +01:00
  • 60aad3f19b Revert "Development out of sync with master." Adam Warner 2016-07-22 11:59:19 +01:00
  • 51dcc2bc0f Update README.md Adam Warner 2016-07-22 11:56:54 +01:00
  • 941525d1e0 Development out of sync with master. (#588) Adam Warner 2016-07-22 11:54:17 +01:00
  • 5fb6c5b012 Making the whitelist re-block echo consistent with other WL/BL echos diginc 2016-07-20 12:53:31 -05:00
  • 3affa73257 Only re-block whitelist deletions if in adlists diginc 2016-07-20 12:43:30 -05:00
  • c647e27e15 Merge branch 'development' into centos-nc Blayne Campbell 2016-07-19 08:48:54 -06:00
  • f696ed48b3 Merge pull request #570 from pi-hole/bugfix/dhcpcd_comments Dan Schaper 2016-07-18 16:32:12 -07:00
  • 73645f299a Merge branch 'development' into bugfix/dhcpcd_comments Adam Warner 2016-07-18 14:37:38 +01:00
  • 6aeb5f1172 Merge pull request #575 from pi-hole/bugfix/distrib_vers_check Mcat12 2016-07-17 07:37:55 -04:00
  • ce8f07750f Remove trailing slash on os-release check Dan Schaper 2016-07-15 22:46:21 -07:00
  • a32ad0dbf2 fix centos nc dependency bcambl 2016-07-15 21:43:23 -06:00
  • 61ff12e8d4 Change header to match the rest of the scripts. Promofaux 2016-07-15 21:17:16 +01:00
  • 02b0e96db8 Merge pull request #572 from pi-hole/development v2.8.1 Adam Warner 2016-07-15 21:13:10 +01:00
  • e942440bb7 Dan forgot this : } Promofaux 2016-07-15 21:11:10 +01:00
  • a27f1f17de Merge pull request #563 from pi-hole/development 2.8 Dan Schaper 2016-07-15 12:05:20 -07:00
  • e106ff0fef Add netcat to dependencies for termbin.com. Should be installed by default, but JUST IN CASE. Promofaux 2016-07-15 19:58:26 +01:00
  • 6f068e0b9c Replace sprunge.us with termbin, which appears to be more reliable. Promofaux 2016-07-15 19:32:49 +01:00
  • ada531c88a Merge pull request #568 from pi-hole/feature/Distro-Check Dan Schaper 2016-07-15 11:05:54 -07:00
  • f0a2248c81 Change comment to hash Dan Schaper 2016-07-15 10:27:40 -07:00
  • 11f2524b9b Instead of an or, cat *release Sander 2016-07-14 20:47:27 +02:00
  • b011e5f838 Add os-release check Dan Schaper 2016-07-14 11:35:52 -07:00