Commit graph

  • be79281418 Added hosts-blocklists lists notracking 2016-04-10 16:12:40 +0800
  • f671eef3f0 ground work on secondary update script Promofaux 2016-04-08 23:43:31 +0100
  • 5ab54012d5 Call secondary update script after pull Promofaux 2016-04-08 23:43:22 +0100
  • a04b7c4e99 Fix typo. Add secondary update script Promofaux 2016-04-08 23:42:34 +0100
  • e4ce5e3601 add secondary update script. This is where the files will be distributed from once repo is up to date Promofaux 2016-04-08 23:31:15 +0100
  • 06f1aea319 disable cron job (for now) to stop auto updates Promofaux 2016-04-08 23:17:37 +0100
  • 2ab6746d53 remove updatepihole Promofaux 2016-04-08 23:16:38 +0100
  • 253dfdf084 add updatePihole.sh to install script Promofaux 2016-04-08 23:15:18 +0100
  • cec727be9d add pihole update script to 'pihole' command Promofaux 2016-04-08 23:13:13 +0100
  • 1d9531ef70 Merge branch 'development' into update-mechanism Promofaux 2016-04-08 23:10:21 +0100
  • fbc400c67e rename to updatePihole.sh Promofaux 2016-04-08 23:09:12 +0100
  • 01f53f6d6c Merge pull request #450 from pi-hole/SmallFixesToWhitelistBlacklist Adam Warner 2016-04-08 23:03:30 +0100
  • 107e0404de Move exit 1 outside of if block on verbose check to stop dnsmasq reloading Promofaux 2016-04-08 23:01:13 +0100
  • ab99e80333 indent Promofaux 2016-04-08 23:00:46 +0100
  • 3154a378a6 Remove clear in DisplayWlist and force verbose to false to tidy up output. Promofaux 2016-04-08 20:12:30 +0100
  • 8e04f1c03e Remove clear in DisplayBlist and forse verbose to false to tidy up output. Promofaux 2016-04-08 20:11:39 +0100
  • c0aadeab3d fix spelling in name of variable ($versbose -> $verbose) Promofaux 2016-04-08 20:10:27 +0100
  • 6c87698f1a fix spelling in name of variable ($versbose -> $verbose) Promofaux 2016-04-08 20:10:10 +0100
  • db2e9f8bf3 Merge pull request #447 from 7h3ju57/issue#442 Adam Warner 2016-04-08 20:07:24 +0100
  • 9a4c5cef86 fix indentations Justin Theberge 2016-04-08 10:14:17 -0400
  • bdfc86f850 fix formatting Justin Theberge 2016-04-07 21:58:57 -0400
  • 70dadfba28 add list options requested from issue#442 Justin Theberge 2016-04-07 21:52:47 -0400
  • b3376f1066 No longer adds hostname or pi.hole to gravity.list Promofaux 2016-04-06 22:33:03 +0100
  • c1169e5dc8 Clean out un-used variables Promofaux 2016-04-06 22:31:55 +0100
  • ec719b01b6 actually add 0.0.0.0 in Promofaux 2016-04-06 22:31:34 +0100
  • d5be101869 Hardcode: IPv4 = '0.0.0.0', IPv6='::' Promofaux 2016-04-06 22:03:35 +0100
  • 01e1e34874 Merge pull request #441 from pi-hole/development v2.6.1.2 Adam Warner 2016-04-06 09:44:04 +0100
  • 28a3cbfa87 Merge pull request #440 from pi-hole/Bugfix439 Adam Warner 2016-04-06 09:42:07 +0100
  • 0b480c2d3f remove redundant else, add ! to if logic. Adam Warner 2016-04-06 09:36:41 +0100
  • 391dea445a Move help output to function, add -h argument Adam Warner 2016-04-06 09:34:05 +0100
  • e074c72130 Move help output to function helpFunc, add -h argument. Adam Warner 2016-04-06 09:32:36 +0100
  • 96f3f863e5 Clean up output. Commented out un-needed root/sudo notification Adam Warner 2016-04-06 09:28:24 +0100
  • 3877f6fd94 Fix arguments not being passed through to chronometer.sh Adam Warner 2016-04-06 09:27:46 +0100
  • cbbc6df05a Merge pull request #425 from PiHoleController Adam Warner 2016-04-05 22:26:02 +0100
  • 32ff7fb321 Merge pull request #437 from pi-hole/development v2.6.1.1 Adam Warner 2016-04-05 14:32:32 +0100
  • 5537e57eec Merge pull request #436 from pi-hole/2611Hotfix Adam Warner 2016-04-05 14:30:16 +0100
  • 4b1e67fa06 Merge 9c94af04cc into 3f0b15902d Adam Warner 2016-04-05 13:29:15 +0000
  • 9c94af04cc Fixes #432. Thanks to @VDRrulez and @jradwan for pointing it out... Promofaux 2016-04-05 14:22:10 +0100
  • 3f0b15902d Merge pull request #432 from pi-hole/development v2.6.1 Adam Warner 2016-04-05 08:56:28 +0100
  • 4d3835dde2 Merge pull request #431 from pi-hole/261Hotfix Adam Warner 2016-04-05 08:55:34 +0100
  • 8514f42d0d Correct variable name (Missing capital letter! whoops!) Promofaux 2016-04-05 08:53:52 +0100
  • 6d9fbe8d41 Merge pull request #392 from pi-hole/development v2.6 Adam Warner 2016-04-05 00:30:20 +0100
  • 849185d3c9 Fix incorrect echo Promofaux 2016-04-05 00:03:49 +0100
  • 47cc757ed0 Fix incorrect echo Promofaux 2016-04-05 00:03:24 +0100
  • f6edd435af Merge pull request #429 from pi-hole/white-black-piholeconf Adam Warner 2016-04-04 23:52:11 +0100
  • 0c0dd914f7 Fix source lists not being skipped if they are already up to date Promofaux 2016-04-04 23:48:34 +0100
  • c6405bc93b Ensure addn-hosts value is updated in /etc/dnsmasq.d/01-pihole.conf if user has a custom value set in pihole.conf Promofaux 2016-04-04 23:38:46 +0100
  • cdffdfbded merge master > development Promofaux 2016-04-04 22:18:53 +0100
  • 0bbfb323b1 make whitelist honour pihole.conf file Promofaux 2016-04-04 21:08:56 +0100
  • 4f08359786 Make blacklist honour pihole.conf file Promofaux 2016-04-04 21:08:45 +0100
  • 7efb17537a Merge pull request #427 from pi-hole/SystemctlDebugLogging Adam Warner 2016-04-04 14:59:22 +0100
  • 7e06769d44 Double quoting nate 2016-04-04 01:03:05 -0500
  • 5347ee4896 Write verbose status of processes to debug log & Minor UI Fixes nate 2016-04-04 00:59:24 -0500
  • 834bf30a10 Merged branch development into PiHoleController nate 2016-04-03 18:05:19 -0500
  • 22ea384ac8 Fix whiptail spacing nate 2016-04-03 18:05:11 -0500
  • 3e6dd9ea9e Merge pull request #424 from pi-hole/PiHoleController Adam Warner 2016-04-03 23:28:03 +0100
  • 10f363e9e7 Merged branch development into PiHoleController nate 2016-04-03 17:26:37 -0500
  • 69e8c014c3 Indentation fix nate 2016-04-03 17:25:48 -0500
  • f304a80c2b Merge 3fd3ce6295 into dbb40e1dda Adam Warner 2016-04-03 22:17:19 +0000
  • 3fd3ce6295 Revert "Pi hole controller" Adam Warner 2016-04-03 23:17:14 +0100
  • dbb40e1dda Merge pull request #416 from pi-hole/PiHoleController Adam Warner 2016-04-03 23:15:00 +0100
  • d710b97276 Fix issue raised in #421 (Use variable instead of hardcoded path, do not delete user created pihole.conf!) Promofaux 2016-04-03 22:10:04 +0100
  • 0e6e8040ba Change spinstr to match install and uninstall scripts Promofaux 2016-04-03 21:54:16 +0100
  • c6fb0bad4b change spinstr to match spinstr in basic-install.sh Promofaux 2016-04-03 21:45:00 +0100
  • 2d08217173 Tidy up For loops, clean up whitespace Promofaux 2016-04-03 21:43:36 +0100
  • 36645d9335 Add check for existing files in /usr/local/bin left over from previous version, as those scripts are replaced with pihole <command> script. Promofaux 2016-04-03 18:39:22 +0100
  • 97d3aedba1 Add some output to the log flush Promofaux 2016-04-03 18:27:18 +0100
  • 5976b20aec Fix spelling mistake, remove unaccessed function. Promofaux 2016-04-03 18:25:39 +0100
  • ad8573c739 Pedantic change, stops my editor from treating all of the code as one long sting in ' ' (as the ' was escaped with \) Promofaux 2016-04-03 18:10:50 +0100
  • 01c3fe330b Update adlists.default notracking 2016-04-04 00:05:43 +0800
  • 7f9410fd34 Added uninstall option to bash-completion nate 2016-04-02 19:45:44 -0500
  • 71133f6b59 Spelling error fix... nate 2016-04-02 19:42:33 -0500
  • 5d5d6c2c70 handle case where parent directories do not exist nate 2016-04-02 19:31:26 -0500
  • 37fa462db5 Erraneous call to SUDO removed nate 2016-04-02 19:24:19 -0500
  • 1a2046a7eb Added uninstall option to pihole command. Minor fixes nate 2016-04-02 19:20:54 -0500
  • 3dff7e80fc Fixed path to /etc/bash_completion.d/ nate 2016-04-02 18:52:03 -0500
  • 6eea9239a7 Merged branch development into PiHoleController nate 2016-04-02 18:41:36 -0500
  • 75f1969bd2 Set executable permissions of pihole and changed installer to invoke sudo for gravity.sh. Note: We invoke gravity.sh with sudo in other places, so ignore the removed comment. nate 2016-04-02 18:39:09 -0500
  • e97755eb91 Fix missing cats Mcat12 2016-04-02 19:28:30 -0400
  • b938949cdb Merge pull request #419 from pi-hole/piholeDebugInstallFix Mcat12 2016-04-02 19:20:41 -0400
  • 447af208b3 Fixed missing cp of piholeDebug.sh to /opt/pihole nate 2016-04-02 17:59:59 -0500
  • d47fbbbe96 Mcat12 requests. Added bash-completion support nate 2016-04-02 17:58:10 -0500
  • 767b72fbfa Merged branch development into PiHoleController nate 2016-04-02 17:34:41 -0500
  • b94a8da9d6 Merge pull request #418 from gitter-badger/gitter-badge Adam Warner 2016-04-02 14:44:24 +0100
  • 12b5be239b Add Gitter badge The Gitter Badger 2016-04-02 13:31:49 +0000
  • 0fbf72bb09 Change dummy domain and show device's hostname in ping Mcat12 2016-04-01 20:19:47 -0400
  • 1238be32a4 Merge branch 'development' into local-domain Mcat12 2016-04-01 20:16:35 -0400
  • ae2117ff5a Merge pull request #411 from nate-ubiquisoft/development Adam Warner 2016-04-01 20:36:45 +0100
  • b80821c4b7 Merged branch development into PiHoleController nate 2016-04-01 12:17:41 -0500
  • cf01b5a002 Readded cat calls to fix permission issue nate 2016-04-01 12:17:05 -0500
  • bb66d559e7 Merge branch 'development' nate 2016-04-01 11:08:46 -0500
  • 7b8fa3b922 Permissions changed for /etc/pihole and cleaned up some output nate 2016-04-01 01:11:59 -0500
  • 777676b525 Made uninstall.sh and pihole.sh executable. nate 2016-03-31 20:33:15 -0500
  • 28f2a1309e Merge branch 'development' nate 2016-03-31 20:25:54 -0500
  • 4b0a7c2252 Added 01-pihole.conf to be removed on uninstall regardless of removing dnsmasq nate 2016-03-30 20:23:24 -0500
  • 2625d9f7fe Made piholeDebug.sh +x nate 2016-03-30 20:09:19 -0500
  • 45f24c8a85 Readded cats that were originally considered UUOC nate 2016-03-30 19:56:11 -0500
  • 5f7c11f495 Sudo added to ifconfig to ensure it runs if debug not run as root nate 2016-03-30 19:51:09 -0500
  • ec4d2d65a6 PromoFaux request: Detailed adlists.list output nate 2016-03-30 19:49:39 -0500
  • d23159ca16 Merge 4b76d74db6 into 7014b5a150 ryt51V 2016-03-30 20:00:37 +0000