Commit Graph

  • 4839953328 Merge pull request #844 from pi-hole/EnforceTemplate Adam Warner 2016-10-25 17:57:06 +06:00
  • aba0d93fda Merge pull request #814 from pi-hole/promoTweaksTheSecond Adam Warner 2016-10-25 17:43:40 +06:00
  • 0de74c0448 Merge pull request #848 from pi-hole/PromoFaux-patch-1 v2.9.4a Adam Warner 2016-10-25 17:38:04 +06:00
  • ee927346b7 Update .pullapprove.yml Adam Warner 2016-10-25 12:36:05 +01:00
  • 2f8015cbca Update PULL_REQUEST_TEMPLATE.md Dan Schaper 2016-10-24 14:50:47 -07:00
  • f3bf7c4b38 Update ISSUE_TEMPLATE.md Dan Schaper 2016-10-24 14:48:38 -07:00
  • e37c4d57da Merge pull request #842 from pi-hole/Fix/template-spacing Adam Warner 2016-10-25 02:32:34 +06:00
  • acff90c000 fix check box spacing Jacob Salmela 2016-10-24 14:58:13 -05:00
  • 5f9e72dd71 Merge pull request #835 from pi-hole/debugFixes Adam Warner 2016-10-24 19:40:27 +06:00
  • be0bcb8f7d Merge pull request #838 from airencracken/hotfix-missing-newline Adam Warner 2016-10-24 15:48:53 +06:00
  • 44c3d56439 Merge pull request #836 from pi-hole/UdemyAttribution Adam Warner 2016-10-24 13:54:14 +06:00
  • 519d731ddd Fix missing newline Marcus Hildum 2016-10-23 16:45:51 -07:00
  • 119c00c22a Merge pull request #837 from pi-hole/UdemyAttribution-1 Dan Schaper 2016-10-23 15:53:27 -07:00
  • 12596dd697 Update PULL_REQUEST_TEMPLATE.md Dan Schaper 2016-10-23 15:50:59 -07:00
  • cb38f5f0d7 Move attribution to bottom since our bots quote from top Dan Schaper 2016-10-23 15:50:03 -07:00
  • b49384ffe4 intent Promofaux 2016-10-23 22:44:21 +01:00
  • 7fb622638b flip reload logic. Do not reload if there are not changes made to blacklist.txt Promofaux 2016-10-23 22:44:06 +01:00
  • bd0cc134bf MERGE FAIL :ashamed_face: Promofaux 2016-10-23 22:43:11 +01:00
  • 476fd1f695 indentation Promofaux 2016-10-23 22:38:18 +01:00
  • 96053d13be Flip reload logic. Do not reload lists if no changes made to whitelist.txt Promofaux 2016-10-23 22:36:50 +01:00
  • c958bed418 Consistency changes. Replace MOST uses of echo >> ${DebugLog} with usage of log_write function Promofaux 2016-10-23 22:31:20 +01:00
  • 2b2c240d39 Fix shebang line broken in #831 Promofaux 2016-10-23 22:15:10 +01:00
  • 1f0ae16216 Merge pull request #831 from airencracken/development Adam Warner 2016-10-23 20:03:30 +01:00
  • b79392ba2c exit after displaying white/blacklist Promofaux 2016-10-23 19:49:51 +01:00
  • 8ee98f0a4a remove a space Promofaux 2016-10-23 19:47:31 +01:00
  • 82e78fb651 Add output to pihole disable and pihole enable Promofaux 2016-10-23 19:44:40 +01:00
  • d0826b2c33 Merge branch 'development' of https://github.com/airencracken/pi-hole into airencracken-dev Promofaux 2016-10-23 19:33:28 +01:00
  • ff588200c0 Merge branch 'promoTweaksTheSecond' of https://github.com/pi-hole/pi-hole into promoTweaksTheSecond Promofaux 2016-10-23 19:11:36 +01:00
  • 5d6072524c Consistency Marcus Hildum 2016-10-22 10:26:00 -07:00
  • 07a66a70fc Consistency Marcus Hildum 2016-10-22 10:12:05 -07:00
  • 69ba8a3c2f Consistency Marcus Hildum 2016-10-22 10:01:15 -07:00
  • a30c75ef71 Consistency Marcus Hildum 2016-10-22 00:35:44 -07:00
  • d0b3727c5d Consistency Marcus Hildum 2016-10-22 00:32:36 -07:00
  • 6e94bf5b6d Consistency Marcus Hildum 2016-10-22 00:14:38 -07:00
  • 0f04e270a7 consistency Marcus Hildum 2016-10-22 00:10:25 -07:00
  • ec4f5007e7 remove bad { Marcus Hildum 2016-10-21 23:59:31 -07:00
  • 21b906e0e0 Consistency Marcus Hildum 2016-10-21 23:57:47 -07:00
  • 7ebaf8e843 Consistency Marcus Hildum 2016-10-21 23:23:31 -07:00
  • 640398ced4 Consistency Marcus Hildum 2016-10-21 23:17:14 -07:00
  • ebbe1fc236 More consistency Marcus Hildum 2016-10-21 23:11:17 -07:00
  • aac8e45397 Imbue gravity.sh with some consistency Marcus Hildum 2016-10-21 23:02:45 -07:00
  • 5ebfa5ecf7 heredoc for helpfunc in pihole Marcus Hildum 2016-10-21 22:53:04 -07:00
  • 12e041c9ef Merge remote-tracking branch 'upstream/development' into development Marcus Hildum 2016-10-21 22:49:21 -07:00
  • 54913f06a3 Merge remote-tracking branch 'upstream/master' into development Marcus Hildum 2016-10-21 22:49:13 -07:00
  • 44a36368a2 Merge pull request #822 from pi-hole/ChangeWarning Adam Warner 2016-10-21 11:24:12 +01:00
  • 8f9ff930b3 Merge pull request #823 from tuplink/EnableOrDisable Adam Warner 2016-10-21 11:02:10 +01:00
  • e199f6db87 spelling updates tuplink 2016-10-20 21:15:11 -04:00
  • c83dd3ccd7 change spacing tuplink 2016-10-20 18:45:27 -04:00
  • 78fbafa1cd test out new status logic tuplink 2016-10-20 18:40:03 -04:00
  • c0012540ed Re-add shebang Promofaux 2016-10-20 21:08:07 +01:00
  • 9ab6df0e54 Merge branch 'development' into promoTweaksTheSecond Promofaux 2016-10-20 21:06:28 +01:00
  • 685b775b68 rework status if statments Tommy Huff 2016-10-20 11:24:34 -04:00
  • 9056a5a7b6 fix spelling / replace tabs with spaces in help Tommy Huff 2016-10-20 11:05:49 -04:00
  • e1c56bcbfe remove a commit in whitelist Tommy Huff 2016-10-20 10:19:03 -04:00
  • 15d68467a1 attempt to fix Tommy Huff 2016-10-20 10:12:02 -04:00
  • 3b6ecc573e fix conflict Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable Tommy Huff 2016-10-20 10:09:23 -04:00
  • 9427b1e594 Merge branch 'promoTweaksTheSecond' into EnableOrDisable Tommy Huff 2016-10-20 09:55:22 -04:00
  • 3ca3eaa62c change restartdnsmasq to restartdns Tommy Huff 2016-10-20 09:40:45 -04:00
  • dda448e050 use finction in pihole to restart dnsmasq Tommy Huff 2016-10-20 09:15:03 -04:00
  • 60873144ea make last line of script return a new line been bugging me for awhile Tommy Huff 2016-10-20 09:09:35 -04:00
  • a9d17c96be include status at end of gravity so if it is disabled you will see it when running Tommy Huff 2016-10-20 09:03:20 -04:00
  • aaee895b2b add pihole status web option to return 1 or 0 for easy use with php Tommy Huff 2016-10-20 08:58:36 -04:00
  • 7d7e17b351 add toggle to enable or disable pi-hole Tommy Huff 2016-10-20 08:45:20 -04:00
  • c71a976e76 kill off an old ugly hack Adam Warner 2016-10-20 13:37:07 +01:00
  • 3623183072 Remove reference to non-existent script Adam Warner 2016-10-20 13:29:12 +01:00
  • e6bd979aeb Can't spell Dan Schaper 2016-10-20 04:27:12 -07:00
  • 266c160108 Merge pull request #818 from airencracken/development Adam Warner 2016-10-20 12:01:41 +01:00
  • b5b6350cc7 Add file change warning to header Dan Schaper 2016-10-20 03:42:25 -07:00
  • bbcf4800de use pihole instead of direct path tuplink 2016-10-20 06:30:48 -04:00
  • 41056ace02 use pihole instead of direct path tuplink 2016-10-20 06:29:53 -04:00
  • 60a80dd678 Merge pull request #819 from pi-hole/adlistremoval Dan Schaper 2016-10-20 02:41:22 -07:00
  • 0efda04920 Use heredocs instead of multiple calls to echo Marcus Hildum 2016-10-19 20:46:37 -07:00
  • 8819e58882 Remove problem list, sends in Unicode - Not adware Dan Schaper 2016-10-19 20:15:36 -07:00
  • 28eeaf201b Standardize function declaration Marcus Hildum 2016-10-19 19:47:45 -07:00
  • 74bfcea6a8 add blacklistScript var tuplink 2016-10-19 22:00:03 -04:00
  • 16f1d7fad9 Blacklist unwhitelisted tuplink 2016-10-19 21:50:34 -04:00
  • 9aa38cf0ae mv patternbuffer instead of cp, then no need to clean up Promofaux 2016-10-19 23:57:43 +01:00
  • a7fa7466fb remove no longer needed code Promofaux 2016-10-19 23:54:43 +01:00
  • 3f73c61cee cache event horizon before white/blacklists are applied for quicker processing on white/blacklist calls of gravity Promofaux 2016-10-19 23:52:54 +01:00
  • a64f4cd871 whitelist script now only directly edits whitelist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument Promofaux 2016-10-19 23:17:20 +01:00
  • a41eff1276 Blacklist script now only directly edits blacklist.txt. DOES NOT TOUCH HOST FILE, instead calls gravity with a no download argument Promofaux 2016-10-19 23:16:52 +01:00
  • b88fe572fe Whitelist/Blacklist domains directly in the Event Horizon. Promofaux 2016-10-19 23:15:05 +01:00
  • 59ba6f8aec add flag to skip download of lists Promofaux 2016-10-19 22:06:19 +01:00
  • 25343da6b7 wrong variable name Promofaux 2016-10-19 20:03:29 +01:00
  • 60d17b97f5 spacing Promofaux 2016-10-19 19:51:32 +01:00
  • 8cb72d87e4 make IPv4/IPv6 checking more robust in gravity Promofaux 2016-10-19 19:50:21 +01:00
  • 8872594ab9 create upload dir for lighttpd Jakob Ackermann 2016-10-19 14:27:17 +02:00
  • b50584119b Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Jakob Ackermann 2016-10-19 14:24:02 +02:00
  • 975f4f2a17 Merge remote-tracking branch 'refs/remotes/pi-hole/development' into development Jakob Ackermann 2016-10-19 14:15:06 +02:00
  • 16e4f79f09 Merge pull request #809 from pi-hole/PromoTweaks Dan Schaper 2016-10-18 17:37:52 -07:00
  • 76cae20c33 Merge pull request #803 from pi-hole/attributes Adam Warner 2016-10-18 19:51:44 +01:00
  • b66f23cfd0 account for new update script Adam Warner 2016-10-18 14:19:44 +01:00
  • 27d6e5d8cf Complete overhaul of update logic. Moved to seperate script Adam Warner 2016-10-18 14:19:25 +01:00
  • ff5d5b97c3 stash any changes in local repo Adam Warner 2016-10-18 13:54:09 +01:00
  • ce46c4dec4 remove prematurely added code Adam Warner 2016-10-18 12:11:02 +01:00
  • 77e8be09a1 handle passing arguments to version script Adam Warner 2016-10-18 12:07:42 +01:00
  • 013d77488a complete overhaul of version script. Now with optional arguments! Adam Warner 2016-10-18 12:07:11 +01:00
  • 29ad2496b6 don't output "elevating with sudo" in pihole script, just do it. Adam Warner 2016-10-18 12:05:48 +01:00
  • 97a013b2b7 Add direction to change upstream servers in setupVars.conf Adam Warner 2016-10-18 10:34:05 +01:00
  • 77808223dc remove stock comments from 01-pihole.conf and add warning to the top Adam Warner 2016-10-18 10:05:10 +01:00