Commit Graph

  • 11d48554e3 Merge pull request #1708 from pi-hole/fix/gravityErrors WaLLy3K 2017-09-25 15:39:26 +10:00
  • b9bcfe36ff Place errors on newline WaLLy3K 2017-09-24 11:57:15 +10:00
  • 05faa7bdf2 Merge pull request #1707 from pi-hole/fix/tailFunc WaLLy3K 2017-09-24 10:28:36 +10:00
  • 88b1f0ca7f Merge pull request #1702 from pi-hole/fix/activeDomains WaLLy3K 2017-09-24 08:02:47 +10:00
  • f0f7bda2f3 Merge pull request #1704 from celly/lighttpd-hide-files WaLLy3K 2017-09-23 11:36:03 +10:00
  • 664d0ea023 Correctly retrieve IPv4/6 addresses for tailFunc() WaLLy3K 2017-09-23 11:27:40 +10:00
  • cd7c00ef8e Fix Ctrl-C inadvertently deleting domains files WaLLy3K 2017-09-23 10:32:56 +10:00
  • 3f20981aab Update access rules to block all root '.' files Celly 2017-09-22 09:29:00 -04:00
  • f54a812ad5 Update access rules to block all root '.' files Celly 2017-09-22 09:27:43 -04:00
  • aa1d67a4de Merge pull request #1703 from pi-hole/fix/lighttpdEnabled WaLLy3K 2017-09-22 19:21:50 +10:00
  • feb2150d9b Fix LIGHTTPD_ENABLED dupes in setupVars.conf WaLLy3K 2017-09-22 19:14:11 +10:00
  • 3aa525b0c0 Ensure domains files are not deleted upon w/blist WaLLy3K 2017-09-22 14:17:56 +10:00
  • 6323d5afed Use PHP short echo tag to avoid Codacy expecting an escaping function andofrjando 2017-09-22 07:15:03 +08:00
  • e3e3b4da58 Add in some exclusions form some leaky files in the admin Celly 2017-09-21 17:47:37 -04:00
  • a0bd517380 Merge pull request #1694 from pi-hole/fix/qf-opt Adam Warner 2017-09-21 20:05:42 +01:00
  • 4316b15ae2 Merge pull request #1700 from pi-hole/fix/start-ftl Adam Warner 2017-09-21 20:00:08 +01:00
  • ef1ce7d4d6 Merge pull request #1631 from pi-hole/tweak/gravity Adam Warner 2017-09-21 19:58:38 +01:00
  • a643f40cce Merge pull request #1663 from pi-hole/new/UninstallCleanup Adam Warner 2017-09-21 19:56:12 +01:00
  • 47099e2855 Ensure resolver test occurs each second WaLLy3K 2017-09-22 03:56:53 +10:00
  • 2deb2bf03f Fix broken whitelist functionality WaLLy3K 2017-09-22 02:23:43 +10:00
  • 3bb05edb52 Merge pull request #1701 from pi-hole/fix/local-ttl WaLLy3K 2017-09-22 01:29:50 +10:00
  • ee2169dd13 Merge branch 'development' into tweak/gravity DL6ER 2017-09-21 17:05:30 +02:00
  • 11282aaca3 Decrease local-ttl to 2 WaLLy3K 2017-09-21 23:11:44 +10:00
  • 909bc92c01 Tweak wording to fit on 80 character screen WaLLy3K 2017-09-21 00:22:47 +10:00
  • a6f9272d4b Fix gravity from only parsing one adlist URL WaLLy3K 2017-09-20 22:25:33 +10:00
  • 911596daf8 Start and enable FTL prior to running Gravity WaLLy3K 2017-09-20 17:29:11 +10:00
  • 8d8482d60b <<<$() back to < <() Adam Warner 2017-09-19 19:02:50 +01:00
  • f3cc8c71c4 Merge pull request #1691 from pi-hole/new/adminemail WaLLy3K 2017-09-19 18:39:37 +10:00
  • f6b3c62b06 Merge pull request #1696 from pi-hole/tweak/removeindexjs WaLLy3K 2017-09-19 18:00:48 +10:00
  • 26afe04926 Remove index.js test WaLLy3K 2017-09-19 01:04:04 +10:00
  • 500a755250 Delete superseded file WaLLy3K 2017-09-19 01:03:24 +10:00
  • d02bf258af Improve non-standard list parsing WaLLy3K 2017-09-18 17:36:03 +10:00
  • 56990618e9 Prevent Block Page issue WaLLy3K 2017-09-18 01:12:19 +10:00
  • 54a85d3a63 Fix invalid option case WaLLy3K 2017-09-18 00:58:56 +10:00
  • d56beedd7a Add idn2 dependency WaLLy3K 2017-09-18 00:41:53 +10:00
  • c2d3e99ddd Slow query fix & queryFunc optimisation WaLLy3K 2017-09-18 00:41:26 +10:00
  • 5e48b3f7f7 Fix one mistake where $proto would not be created if $_SERVER['HTTPS'] exists but is not set to on andofrjando 2017-09-16 11:24:38 +08:00
  • 00d62b3423 This fixes the following bug: If Pi-Hole is behind a reverse proxy that uses SSL, then the block page will not load resources such as blockingpage.css and jquery.min.js as the insecure http:// is hard coded. Browsers will block attempts to load insecure resources if the page is loaded of SSL. The fix is acheived by checking $_SERVER['HTTPS'] and setting the variable $proto to either http or https. The harcoded http is replaced by the contents of this variable. andofrjando 2017-09-16 10:24:37 +08:00
  • c957124fad Optimised parsing of domains on IPv6 servers WaLLy3K 2017-09-15 22:39:17 +10:00
  • 28063aa7f7 Add administrative contact address functionality WaLLy3K 2017-09-15 00:24:29 +10:00
  • c458e4a93b Merge pull request #1420 from WaLLy3K/new/https WaLLy3K 2017-09-14 20:40:20 +10:00
  • e7ae62ba76 Merge pull request #1416 from WaLLy3K/blockpage2 WaLLy3K 2017-09-14 20:39:45 +10:00
  • ff5411a93a Add 'Connection Refused' for 000 status WaLLy3K 2017-09-14 20:23:49 +10:00
  • d3073e5e23 Fix array of unique $sourceDomains WaLLy3K 2017-09-14 17:09:52 +10:00
  • 34ae4844fa Merge branch 'development' into tweak/gravity WaLLy3K 2017-09-14 16:44:14 +10:00
  • 8191ec01e5 Gravity Bugfixes WaLLy3K 2017-09-14 16:39:30 +10:00
  • 4d39ab9753 Allow force-reload to be used when restarting DNS WaLLy3K 2017-09-14 16:39:25 +10:00
  • 7a1df15724 Merge pull request #1688 from pi-hole/tweak/customBlockPage Adam Warner 2017-09-13 18:22:38 +01:00
  • 42b5574f9b remove no longer needed tests Adam Warner 2017-09-09 19:41:05 +01:00
  • 5f4be0de35 adjust lighttpd config depending on whether or not custom.php exists Adam Warner 2017-09-09 19:30:53 +01:00
  • 6c605f55f9 always overwrite default blockpage, so that changes can be rolled out Adam Warner 2017-09-09 19:07:48 +01:00
  • 774c6e8ac0 Merge branch 'development' into new/UninstallCleanup Adam Warner 2017-09-09 18:56:17 +01:00
  • 17be6b860e Merge pull request #1682 from pi-hole/tweak/VPN_hostnames DL6ER 2017-09-08 22:42:58 +02:00
  • 474ac4a15d Merge pull request #1581 from pi-hole/sqlite-dependency Adam Warner 2017-09-08 21:28:16 +01:00
  • b8fedf76cd Merge pull request #1572 from pi-hole/gedetil-development DL6ER 2017-09-08 20:21:20 +02:00
  • ca88c59d4e Merge pull request #1687 from spacedingo/patch-2 DL6ER 2017-09-08 20:17:38 +02:00
  • d69e62589a Merge branch 'development' into sqlite-dependency Mcat12 2017-09-08 13:43:26 -04:00
  • c9d4995900 Update to comply with current development code DL6ER 2017-09-08 19:35:05 +02:00
  • 279e809aaf Use poweroff instead of halt DL6ER 2017-09-08 19:33:06 +02:00
  • d61857efae Merge branch 'development' into patch-2 Mcat12 2017-09-08 13:32:51 -04:00
  • 0d037e96fb Merge branch 'development' into gedetil-development DL6ER 2017-09-08 19:32:38 +02:00
  • 6376f9aef4 Merge pull request #1680 from pi-hole/colour-consistency Mcat12 2017-09-08 13:29:55 -04:00
  • f5a1fa21f7 Add ignore-case switch to sort (domains) spacedingo 2017-09-08 20:36:14 +04:00
  • 4a90dac68e Simplify awk code as the format of ipp.txt is actually fixed (only one entry per line is allowed) DL6ER 2017-09-07 19:42:00 +02:00
  • 2624e56de5 Parse /etc/openvpn/ipp.txt (if existing) and add entries to local.list. DL6ER 2017-09-06 16:54:41 +02:00
  • aef54d6694 Merge branch 'development' into new/UninstallCleanup Adam Warner 2017-09-05 20:41:13 +01:00
  • e839a7784c Merge branch 'development' into sqlite-dependency Adam Warner 2017-09-05 20:39:45 +01:00
  • bea99abd8d Ensure colour consistency between terminal themes WaLLy3K 2017-09-05 23:28:33 +10:00
  • a5c4ae955a Merge branch 'development' into tweak/gravity WaLLy3K 2017-09-03 15:28:41 +10:00
  • d7d53849a3 Merge pull request #1628 from pi-hole/fix/issue-template Dan Schaper 2017-09-02 04:55:56 -07:00
  • b354f722be Add link for EUPL WaLLy3K 2017-09-02 21:52:54 +10:00
  • ea1aad9774 Add review suggestions to template WaLLy3K 2017-09-01 10:17:08 +10:00
  • 817d644795 Merge branch 'development' into fix/issue-template WaLLy3K 2017-09-01 10:16:03 +10:00
  • 56b8c4bfdb Merge branch 'development' into tweak/gravity WaLLy3K 2017-09-01 10:01:41 +10:00
  • c65c26b463 Merge branch 'development' into new/UninstallCleanup Adam Warner 2017-08-31 15:36:47 +01:00
  • bf059e5ee8 Merge pull request #1676 from pi-hole/remove-netstat WaLLy3K 2017-08-31 21:16:11 +10:00
  • 15a5f425bf Replace nc with psuedo-device WaLLy3K 2017-08-31 20:32:02 +10:00
  • 3125d24ded Replace superseded netstat command WaLLy3K 2017-08-31 17:39:41 +10:00
  • 6b6d105c2f Merge branch 'development' into sqlite-dependency Adam Warner 2017-08-28 10:17:33 +01:00
  • bab44c52ae Merge branch 'development' into blockpage2 WaLLy3K 2017-08-28 13:30:57 +10:00
  • 2f19605750 Merge branch 'development' into fix/issue-template WaLLy3K 2017-08-28 13:29:18 +10:00
  • 7311db3a63 Change wording to support feature PR's WaLLy3K 2017-08-28 13:28:23 +10:00
  • 0a00936e99 Update resolver test & added more comments WaLLy3K 2017-08-28 11:36:02 +10:00
  • 7cac207c00 Merge branch 'development' into tweak/gravity WaLLy3K 2017-08-28 03:11:38 +10:00
  • feb412b02a Merge pull request #1671 from pi-hole/release/3.2 WaLLy3K 2017-08-28 03:04:46 +10:00
  • 199de9ebc0 Merge branch 'development' into new/https Adam Warner 2017-08-27 11:38:30 +01:00
  • 504ae0193f Merge branch 'development' into blockpage2 Adam Warner 2017-08-27 11:23:21 +01:00
  • 1ae403b742 Merge pull request #1667 from pi-hole/install-space WaLLy3K 2017-08-24 14:00:20 +10:00
  • 939c99cdbf accidentally an entire group of letters. Adam Warner 2017-08-23 11:48:11 +01:00
  • 2f36acae49 Remove errornous space WaLLy3K 2017-08-23 11:51:16 +10:00
  • e938132c53 accidentally a space Adam Warner 2017-08-17 21:02:10 +01:00
  • 1b34286264 verbiage Adam Warner 2017-08-17 20:33:53 +01:00
  • 54f4f6d2d7 Add "${INSTALLER_DEPS[@]}" to package array add -f to rm commands so that set -e is not kicked Adam Warner 2017-08-17 20:17:49 +01:00
  • 07e5e8e67a need to include PH_TEST="true" so that the install script isn't run when sourcing it.. doh Adam Warner 2017-08-17 20:03:19 +01:00
  • 3c25094495 No need to declare PKG_MANAGER, as it's already declared in basic-install Adam Warner 2017-08-17 19:56:36 +01:00
  • 95e3a5944d Initial overhaul of uninstall script sourcing distro_check() from basic-install.sh Totally untested as yet... Adam Warner 2017-08-17 19:53:43 +01:00
  • 64f29120c8 indent nested function in basic-install.sh fix dependency in uninstall.sh Adam Warner 2017-08-17 19:43:07 +01:00
  • d92434b1e9 Merge branch 'development' into sqlite-dependency Adam Warner 2017-08-16 16:31:47 +01:00
  • 01cd056bcc Work out correct SQLITE version for php-sqlite Adam Warner 2017-08-16 16:27:50 +01:00
  • 56f2ea3ec2 Add Fedora/Centos dependency Adam Warner 2017-08-16 15:56:39 +01:00