Commit Graph

  • a0603ad3b7 Update queryFunc() WaLLy3K 2017-05-02 17:13:55 +10:00
  • 551add5f44 Update index.php WaLLy3K 2017-05-02 17:06:31 +10:00
  • 88944a31ec Update blockingpage.css WaLLy3K 2017-05-02 17:05:24 +10:00
  • 3473ebc0fe Merge pull request #1408 from pi-hole/tweak/localise-queries DL6ER 2017-05-02 08:56:47 +02:00
  • 8c657910ae Merge pull request #1280 from technicalpyro/development Dan Schaper 2017-05-01 16:07:32 -07:00
  • 1886c44579 Merge pull request #1406 from pi-hole/update/UA Dan Schaper 2017-05-01 14:35:55 -07:00
  • 1dcc1871fb Merge pull request #1404 from pi-hole/development v3.0 Adam Warner 2017-05-01 22:03:54 +01:00
  • 19e688effb Add localise-queries flag to 01-pihole.conf DL6ER 2017-04-30 13:47:07 +02:00
  • 6a2b885988 Update default User Agent to modern browser. Dan Schaper 2017-04-27 11:41:08 -07:00
  • bfc4775b34 Merge pull request #1297 from raincoats/development Dan Schaper 2017-04-26 12:35:19 -07:00
  • 981004606b Merge branch 'master' into development Adam Warner 2017-04-26 20:12:34 +01:00
  • 9d40fd1eda Merge branch 'development' Resolved conflicts Adam Warner 2017-04-26 20:12:16 +01:00
  • db1e5f10ea Make changes according to comment in #1384 DL6ER 2017-04-21 17:08:15 +02:00
  • fbb6b56d99 Merge pull request #1397 from pi-hole/fix/ipv4ipv6error DL6ER 2017-04-20 16:18:50 +02:00
  • f1f70133dc Populate $ipv4 and $ipv6 + fix small error that prevented blocking page from coming up at all. Fixes #1396 DL6ER 2017-04-20 13:52:54 +02:00
  • d0f55e5125 Merge pull request #1394 from pi-hole/fix/remove-temp-gravity-files DL6ER 2017-04-19 08:46:01 +02:00
  • 5e308dbd51 Delete the temp files created by gravity Mcat12 2017-04-18 20:35:06 -04:00
  • c3c554f4d6 Merge pull request #1391 from pi-hole/tweak/flush Mcat12 2017-04-17 20:10:03 -04:00
  • 320c06e0a4 Flush twice to move data out-of-sight of FTL DL6ER 2017-04-17 21:25:15 +02:00
  • 2e398c5da4 stash changes on branch switch, else it fails if any changes have been made. Adam Warner 2017-04-14 17:20:13 +01:00
  • b1484104bd Merge pull request #1379 from pi-hole/tweak/FTLinit.d DL6ER 2017-04-13 12:53:37 +02:00
  • c738a9a044 Merge pull request #1381 from technicalpyro/development Mcat12 2017-04-12 21:29:39 -04:00
  • 519cb71022 Grammar Fix ] Technicalpyro 2017-04-12 16:05:21 -04:00
  • fcd92d27f7 Don't use PID file but rather "pidof pihole-FTL" for detecting if another process is already running DL6ER 2017-04-12 19:34:13 +02:00
  • 3eacfa9831 Improve FTL's service script DL6ER 2017-04-12 23:13:18 +02:00
  • ff6df76e36 Update webpage.sh gedetil 2017-04-11 12:04:44 -05:00
  • 1d64b614c7 Merge pull request #1349 from pi-hole/internal/editorconfig Mcat12 2017-04-06 18:05:56 -04:00
  • a832dd7f67 Update .editorconfig Dan Schaper 2017-04-06 14:55:21 -07:00
  • a96b4d28e1 Merge pull request #1365 from pi-hole/adlistImprovements Mcat12 2017-04-06 16:15:50 -04:00
  • 57e8b7f924 Merge pull request #1355 from pmo3/development Mcat12 2017-04-03 20:23:19 -04:00
  • 263eb856d5 remove vagrant from gitignore Patrick O'Brien 2017-04-03 15:15:44 -04:00
  • 5a4f088b24 Merge pull request #1341 from pi-hole/tweak/readme-tm DL6ER 2017-04-03 17:35:58 +02:00
  • c1913bfa7d Merge pull request #1366 from pi-hole/fix/adaway-list-agent DL6ER 2017-04-03 17:32:44 +02:00
  • 474881e4c7 Merge pull request #1346 from pi-hole/varChanges DL6ER 2017-04-03 17:32:02 +02:00
  • 7e0aa822b6 Match the Pi-hole brand (#1358) Flo 2017-04-03 17:29:57 +02:00
  • 940d780a4c Merge pull request #1361 from pi-hole/new/error404page DL6ER 2017-04-03 17:25:46 +02:00
  • ad9575ce18 Recognize more host names DL6ER 2017-04-03 16:28:18 +02:00
  • ce86205df0 Use correct agent when downloading adaway.org list Mcat12 2017-04-02 12:44:00 -04:00
  • 3cf9942465 spacing fixed Adam Warner 2017-03-31 23:00:56 +01:00
  • 153031482f Add delete mode to adlist command. Might be abetter way to do this Adam Warner 2017-03-31 22:51:10 +01:00
  • 1f74b1e2fd newline Adam Warner 2017-03-31 21:12:17 +01:00
  • 42393123a0 add newline to adlists.default Adam Warner 2017-03-31 20:15:13 +01:00
  • af2cff5177 remove call to user list Adam Warner 2017-03-31 20:13:04 +01:00
  • 5435b93df2 remove spaces Adam Warner 2017-03-31 20:05:45 +01:00
  • 3a3dde6298 add adlist argument redirector Adam Warner 2017-03-31 20:03:56 +01:00
  • b4bc90fb85 add in CustomizeAdlists function Adam Warner 2017-03-31 19:35:52 +01:00
  • 02040cd25d We no longer need to do this, either Adam Warner 2017-03-31 19:23:26 +01:00
  • bdc6bd4135 Don't need this comment anymore Adam Warner 2017-03-31 19:18:28 +01:00
  • e720de401d One file to rule them all, same functionality (made changes and want to go back to default? Delete your adlists.list) Adam Warner 2017-03-31 19:16:09 +01:00
  • ce97896ffd account for new adlists.custom file Adam Warner 2017-03-31 19:00:04 +01:00
  • 86fa4e9ee8 trim down default adlist Adam Warner 2017-03-31 18:55:07 +01:00
  • f09c166350 Improve Error 404 page behavior DL6ER 2017-03-28 23:02:00 +01:00
  • 24868fdb2b Merge remote-tracking branch 'upstream/development' into development Patrick O'Brien 2017-03-27 13:38:19 -04:00
  • a463250ecf don't hash an empty password Patrick O'Brien 2017-03-27 13:37:19 -04:00
  • d38e034e92 Merge pull request #1354 from flokX/patch-4 Mcat12 2017-03-26 13:12:42 -04:00
  • 6eb9192cd1 Complete site Flo 2017-03-25 16:11:37 +01:00
  • 94f15f1b3c Merge remote-tracking branch 'upstream/development' into development Patrick O'Brien 2017-03-23 18:47:50 -04:00
  • ee296f36c1 mask password input on command line Patrick O'Brien 2017-03-23 18:47:30 -04:00
  • 598a7b3cc0 Add .editorconfig Dan Schaper 2017-03-22 13:44:04 -07:00
  • 52baf26d7d Merge pull request #1348 from pi-hole/fix/update-without-web Mcat12 2017-03-21 18:18:03 -04:00
  • fb3e6ee35c Source setupVars before attempting to use it Mcat12 2017-03-21 18:01:51 -04:00
  • af1d1bd9c2 One more change Dan Schaper 2017-03-21 05:04:58 -07:00
  • f32ad7699d Merge pull request #1320 from georou/development Dan Schaper 2017-03-21 04:49:59 -07:00
  • 79294bb6ca Merge pull request #1332 from pi-hole/varChanges Dan Schaper 2017-03-21 04:49:10 -07:00
  • 1cd4710718 replace logo with TM logo Jacob Salmela 2017-03-19 15:41:16 -05:00
  • 48c19ade8e add trademarks to Pi-hole name in signifigant places Jacob Salmela 2017-03-19 15:36:22 -05:00
  • 0acf70f836 Merge pull request #1340 from AnthonyGiorgio/development Adam Warner 2017-03-19 18:40:50 +00:00
  • fd584dd03b Formatting cleanup. Convert backticks to quotes to fix error message. Make Pi-hole capitalization consistent. Make Pi-hole capitalization consistent. Anthony Giorgio 2017-03-18 20:47:13 -04:00
  • 2740c68a63 Merge pull request #1335 from pi-hole/tweak/debug_templog Dan Schaper 2017-03-16 23:35:15 -07:00
  • 62a242a894 Merge pull request #1334 from pi-hole/tweak/interface_detect Mcat12 2017-03-16 21:36:13 -04:00
  • 8b060e9699 Merge pull request #1333 from Wandmalfarbe/development DL6ER 2017-03-16 18:02:40 +01:00
  • b1f769b671 Output cleaning, IP stack check headers. Dan Schaper 2017-03-15 23:50:29 -07:00
  • 77378da70a Cat out temp files to final log. Dan Schaper 2017-03-15 23:43:41 -07:00
  • 160030b75f Quiet systemctl output to just the current daemon status. Dan Schaper 2017-03-15 23:27:18 -07:00
  • 0a0c3a2fb7 Copy working temp to final location. Dan Schaper 2017-03-15 23:20:12 -07:00
  • e9f1ca338f Create temp files for working storage, log to working storage temps. Dan Schaper 2017-03-15 22:49:47 -07:00
  • 073c7e54df Merge pull request #1331 from pi-hole/RemovePasswordFromDebugLogBecauseSomePeopleFeelItUnderminesSecurity-TheyProbablyHaveAPoint Dan Schaper 2017-03-15 22:08:48 -07:00
  • 2834f2ccc2 Let ip determine which links are candidates. Dan Schaper 2017-03-15 22:05:48 -07:00
  • 6c56665403 updated travis for new firewalld add service georou 2017-03-16 10:26:51 +11:00
  • 0d794226ab Removed unsupported POSIX brace expansion georou 2017-03-16 09:29:33 +11:00
  • ab2af11775 Fixed minor spelling mistakes in README.md Wandmalfarbe 2017-03-15 20:58:41 +01:00
  • 83662c9e50 additional requested changes Adam Warner 2017-03-15 19:50:22 +00:00
  • 6c1d52199f Merge branch 'master' of https://github.com/jftuga/pi-hole into jftuga-master Adam Warner 2017-03-15 19:47:31 +00:00
  • cfaf1ac67c add check on file_parse to not include WEBPASSWORD= in the debug log Adam Warner 2017-03-15 18:59:41 +00:00
  • a6caa0e680 Merge pull request #1327 from pi-hole/fix/pihole-help-text Mcat12 2017-03-14 15:00:25 -04:00
  • c4b43f92ce Fix help text bug Mcat12 2017-03-14 13:19:43 -04:00
  • 3d1ccd9625 Merge pull request #1312 from pi-hole/pihole-backports v2.13.2 DL6ER 2017-03-14 11:32:34 +01:00
  • 76bd53ef1f replace instances of "/etc/.pihole" with ${PI_HOLE_LOCAL_REPO} John Taylor 2017-03-13 20:24:04 -04:00
  • 8fa209f0df Merge pull request #1322 from pi-hole/FixWildCardBlacklisting Mcat12 2017-03-13 17:50:18 -04:00
  • 88835512dd Merge pull request #1322 from pi-hole/FixWildCardBlacklisting Mcat12 2017-03-13 17:50:18 -04:00
  • 6b862dd9e9 Only remove from wildcard list if domain is being added to whitelist or blacklist Adam Warner 2017-03-13 20:32:23 +00:00
  • be0b76c954 Merge pull request #1319 from pi-hole/fix/gravitypath DL6ER 2017-03-13 21:16:31 +01:00
  • e45559da20 Use Firewalld services instead of ports georou 2017-03-14 01:13:23 +11:00
  • d7b5870ba6 Use absolute path for pihole command in gravity.sh. Fixes #1318 DL6ER 2017-03-12 23:15:23 +01:00
  • bb7a7d94ef Replace misleading letter variable Markus Napp 2017-03-12 16:16:45 +01:00
  • 9a475cc010 Rewrite help text for better handling of params Markus Napp 2017-03-12 15:50:48 +01:00
  • ae30c285a2 Fix handling of wildcard help text Markus Napp 2017-03-12 15:45:11 +01:00
  • df18c7cd59 Merge pull request #1313 from pi-hole/new/piholecheckout Dan Schaper 2017-03-11 13:01:11 -08:00
  • 2e74219ff9 Merge pull request #1313 from pi-hole/new/piholecheckout Dan Schaper 2017-03-11 13:01:11 -08:00
  • b0ae954f1e Only update when update flag is set to "true" Dan Schaper 2017-03-11 12:37:36 -08:00