Commit Graph

  • 8c5c1316dd add php version and processor check functions Jacob Salmela 2017-05-22 08:48:56 -05:00
  • daff5d8b5a add critical dependencies version check functions Jacob Salmela 2017-05-22 03:05:51 -05:00
  • 6c4a7b626e add pihole version check functions Jacob Salmela 2017-05-22 02:39:00 -05:00
  • 1aa5943e67 add if directory exists function Jacob Salmela 2017-05-22 01:06:15 -05:00
  • 69fe889f92 comments for all lines and small formatting changes Jacob Salmela 2017-05-21 23:25:53 -05:00
  • 2ef87ad110 Retrieve local repos on repair (#1481) WaLLy3K 2017-05-22 06:47:26 +10:00
  • c655e6ea73 Install loopback firewall rules for FTL (#1419) DL6ER 2017-05-20 15:47:51 +02:00
  • 5d7ef9281f get just the OS pretty name for Dan Jacob Salmela 2017-05-20 02:01:56 -05:00
  • 6fa00e7cc8 first functions with pretty colors. check OS, setupVars, and contents of .d dirs Jacob Salmela 2017-05-20 01:34:13 -05:00
  • 2f2825f15e Tricorder: Insecure Opt-out WaLLy3K 2017-05-20 10:45:26 +10:00
  • e377fe5503 Merge pull request #1486 from pi-hole/readme/win-dns-swapper Mcat12 2017-05-19 11:26:51 -04:00
  • 69b41dd72e Add link to Windows DNS Swapper Mcat12 2017-05-19 11:16:34 -04:00
  • 69fa9874dd Use HTTP_HOST instead of SERVER_NAME WaLLy3K 2017-05-18 18:54:26 +10:00
  • a620a5c430 Formatting consistency WaLLy3K 2017-05-18 12:53:32 +10:00
  • 1f3db8b602 Confirm Tricorder is online WaLLy3K 2017-05-18 12:43:17 +10:00
  • f6732a484e Merge pull request #1317 from r0ckarong/development WaLLy3K 2017-05-18 11:16:25 +10:00
  • 4015122d33 Merge pull request #1476 from pi-hole/fix/midnightflushing DL6ER 2017-05-18 01:23:32 +02:00
  • 42eb811910 Add "quiet" mode + update comments in the cron file DL6ER 2017-05-17 12:54:43 +02:00
  • c9042ffedd Print echos only when manual flushing is requested DL6ER 2017-05-17 12:51:04 +02:00
  • 4e2c6a7b8e Fix logrotation: manual flushing should be done twice, but automated rotation at midnight should only be done *once*! DL6ER 2017-05-17 12:44:35 +02:00
  • 7453bf2ee6 Fix wildcard help text WaLLy3K 2017-05-16 10:23:53 +10:00
  • 7d17c652f3 Merge branch 'development' into development WaLLy3K 2017-05-16 10:18:32 +10:00
  • 075f00cecd Merge branch 'development' into tc-insecure-optout WaLLy3K 2017-05-16 09:49:42 +10:00
  • b9f2ba0717 Wording changes and bug fix WaLLy3K 2017-05-16 09:48:46 +10:00
  • ed04be5faa Merge pull request #1468 from pi-hole/tweak/help-output Adam Warner 2017-05-14 16:46:58 +01:00
  • 90119c75d5 more merge conflicts! Adam Warner 2017-05-14 16:43:20 +01:00
  • d30056026b Merge pull request #1466 from pi-hole/doclist_remove_sed Dan Schaper 2017-05-14 08:28:10 -07:00
  • bc8a5916d8 fix merge conflicts Adam Warner 2017-05-14 16:17:04 +01:00
  • f202602f99 Merge pull request #1470 from pi-hole/tweak/taco Dan Schaper 2017-05-14 07:41:07 -07:00
  • 69f361a3a1 🌮 is the new :shipit: squirrel DL6ER 2017-05-14 16:28:35 +02:00
  • da9ff0cc66 Tricorder: Insecure Opt-out WaLLy3K 2017-05-14 19:27:14 +10:00
  • 703ff09a91 Merge pull request #1464 from pi-hole/new/tricorder_option WaLLy3K 2017-05-14 15:37:25 +10:00
  • 30035ce1c2 Merge branch 'development' into tweak/help-output WaLLy3K 2017-05-14 13:03:33 +10:00
  • 39b74ebfd4 Show help for "pihole checkout --help" WaLLy3K 2017-05-14 12:22:19 +10:00
  • 3bd677c102 Show help for "pihole -v -h" WaLLy3K 2017-05-14 11:57:46 +10:00
  • 4eb7d2868c Fix "pihole disable --help" and "pihole -l --help" WaLLy3K 2017-05-14 11:53:40 +10:00
  • 0e4473685b Show help for "pihole -a -i --help" WaLLy3K 2017-05-14 11:47:56 +10:00
  • b721ed49ab Update Help Output (#1467) WaLLy3K 2017-05-14 11:11:44 +10:00
  • 25601b9fcc Document sed substitution for user readability Dan Schaper 2017-05-13 17:49:58 -07:00
  • db10c8ab46 Merge pull request #1465 from pi-hole/busybox_sed_support Dan Schaper 2017-05-13 17:40:27 -07:00
  • 55f78e3b64 Update list.sh Adam Hill 2017-05-13 18:44:41 -05:00
  • 7abf349730 Use echo "ABC" | pihole tricorder to upload to Pi-hole's medical tricorder. Uses SSL if available. DL6ER 2017-05-13 21:08:21 +02:00
  • f9d41caeb6 Merge branch 'development' into blockpage2 WaLLy3K 2017-05-13 23:29:44 +10:00
  • b166410cbf Solve piholeLogFlush.sh having to be issued 2 x to clear logs (#1460) Hans Geiblinger 2017-05-12 16:39:55 -04:00
  • 31d5a7ae9e whitelist on website blocked doesnt work (#1452) 0412465564 2017-05-12 22:29:07 +02:00
  • 5bb91759b4 Merge pull request #1459 from WaLLy3K/patch-2 Dan Schaper 2017-05-12 12:38:13 -07:00
  • 80c4b7c9bb Merge pull request #1455 from pi-hole/tweak/logecho_gateway Dan Schaper 2017-05-12 12:02:21 -07:00
  • ea0a9ceb37 Provide remote hashes for version.sh WaLLy3K 2017-05-12 15:25:01 +10:00
  • 68dd2a6b91 Merge pull request #1447 from WaLLy3K/patch-1 Dan Schaper 2017-05-11 14:23:59 -07:00
  • f875976268 Replacing superseded file with dummy content WaLLy3K 2017-05-11 21:02:04 +10:00
  • e23c6899e0 Merge pull request #1456 from WaLLy3K/patch-3 Dan Schaper 2017-05-11 03:45:40 -07:00
  • c35c7b2cea Wrap in double brackets WaLLy3K 2017-05-11 20:21:23 +10:00
  • 1c2aa44d46 Provide notice message for whitelisted sites WaLLy3K 2017-05-11 20:10:40 +10:00
  • 3b44a0da32 Provide error message if not found in any list WaLLy3K 2017-05-11 20:09:00 +10:00
  • 58353e2839 Update queryFunc() to search Whitelist WaLLy3K 2017-05-11 19:58:35 +10:00
  • 5e0572637e Merge pull request #1417 from WaLLy3K/tweak/queryFunc Adam Warner 2017-05-11 09:07:00 +01:00
  • 501b26decd Log and echo gateway responses Dan Schaper 2017-05-10 22:08:06 -07:00
  • c6596f2c54 Modified syntax to be valid for Shellcheck WaLLy3K 2017-05-11 14:19:13 +10:00
  • 2863308090 Minimise string duplication & other minor changes WaLLy3K 2017-05-11 13:34:58 +10:00
  • 7fef1fdc83 Fixed indentation WaLLy3K 2017-05-11 10:11:04 +10:00
  • 3081c151bd Perform EXACT searches on HOSTS lists correctly WaLLy3K 2017-05-11 09:13:32 +10:00
  • c793295be0 Merge pull request #1446 from pi-hole/tweak/install_lockcheck Dan Schaper 2017-05-10 15:40:13 -07:00
  • fe0a35cc7a Update -h to work as --hash WaLLy3K 2017-05-11 08:30:49 +10:00
  • 0b67eebaec Merge pull request #1440 from pi-hole/revert-1437-blockPage Dan Schaper 2017-05-10 15:26:29 -07:00
  • 03201e2f20 Display FTL version & version.sh rewrite WaLLy3K 2017-05-10 13:07:56 +10:00
  • dfc32b26a6 We test for dpkg lock on line 830 directly, no need for the check also in the template section. Dan Schaper 2017-05-09 13:11:28 -07:00
  • 173ad339bb Update CSS location WaLLy3K 2017-05-08 19:33:45 +10:00
  • 89fd962615 Revert "Ensure any changes to blocking page are updated." Adam Warner 2017-05-06 11:45:31 +01:00
  • a928cd3fa1 Merge pull request #1437 from pi-hole/blockPage Adam Warner 2017-05-06 01:06:22 +01:00
  • f190a6ebc5 Merge pull request #1436 from pi-hole/fix/dhcpcd-localhostNS Dan Schaper 2017-05-05 15:25:12 -07:00
  • 9beb9fd941 Merge pull request #1384 from pi-hole/checkoutImprovements Adam Warner 2017-05-05 23:22:54 +01:00
  • 525a1228c3 clarify Adam Warner 2017-05-05 22:43:37 +01:00
  • 19fd25c7cd revert line, looks tidyer Adam Warner 2017-05-05 22:40:10 +01:00
  • 5b0927ca4b tidy up output Adam Warner 2017-05-05 22:32:27 +01:00
  • 324d4433c3 even further simplify Adam Warner 2017-05-05 22:31:31 +01:00
  • 615ca56ea3 fix inteliJ IDEA complaints Adam Warner 2017-05-05 22:27:58 +01:00
  • 41dd163453 further simplify Adam Warner 2017-05-05 22:27:33 +01:00
  • 5cd2c77d98 simplify Adam Warner 2017-05-05 22:24:40 +01:00
  • f270f7430c Update block page. Allow for setupVars setting of CUSTOMBLOCKPAGE (bool) to prevent it being overwritten Adam Warner 2017-05-05 22:10:24 +01:00
  • 99b23627d0 Update basic-install.sh Dan Schaper 2017-05-05 12:03:51 -07:00
  • 26fcb1b2a0 Merge pull request #1429 from pi-hole/development v3.0.1 Adam Warner 2017-05-04 15:12:26 +01:00
  • e9c4e8123c Merge branch 'master' into development DL6ER 2017-05-04 12:12:44 +02:00
  • a290e01bdf Merge pull request #1421 from pi-hole/fix/accidental-password-reset Dan Schaper 2017-05-04 03:11:54 -07:00
  • 9cc392fa02 Update Marks PR after the Promo code has been merged DL6ER 2017-05-04 11:43:48 +02:00
  • 7c2046cce7 Merge pull request #1423 from pi-hole/promoLearnsToCode Dan Schaper 2017-05-03 12:07:38 -07:00
  • 4d731ca30b Updated landing page location WaLLy3K 2017-05-03 15:33:50 +10:00
  • f2016f26d7 Updated splash page CSS href WaLLy3K 2017-05-03 15:29:43 +10:00
  • b13171cc45 $1 is not $pw. Seriously, who let me onto this project Adam Warner 2017-05-02 22:37:38 +01:00
  • 9c645e2010 Seriously. Adam Warner 2017-05-02 22:30:02 +01:00
  • bb6f409e89 dropped a " Adam Warner 2017-05-02 22:28:32 +01:00
  • 61ec7723f6 use function in install script Adam Warner 2017-05-02 22:25:47 +01:00
  • 9c136a5579 functionise Hashing Adam Warner 2017-05-02 22:24:37 +01:00
  • a5733508ae Double hash the password directly in the install script Adam Warner 2017-05-02 21:36:08 +01:00
  • a8818c16d8 Fixed unnecessary usage of !important WaLLy3K 2017-05-02 19:51:13 +10:00
  • c8e1e6dc8a Merge pull request #1418 from pi-hole/tweak/debug/FTL_log DL6ER 2017-05-02 09:41:35 +02:00
  • 7bcea98d0c Do not activate letsencrypt.conf if found WaLLy3K 2017-05-02 17:28:51 +10:00
  • 74b15d10d9 Update lighttpd.conf.fedora WaLLy3K 2017-05-02 17:24:55 +10:00
  • 356c70cdae Update lighttpd.conf.debian WaLLy3K 2017-05-02 17:24:07 +10:00
  • dfb5c37d98 Delete index.js WaLLy3K 2017-05-02 17:21:40 +10:00
  • 30dcf6ff47 Include pihole-FTL.log in debug report DL6ER 2017-05-02 09:18:58 +02:00