Commit Graph

  • d45695a088 Merge pull request #1643 from pi-hole/tweak/PiholeCheckout Adam Warner 2017-08-04 00:19:46 +01:00
  • 2ceeac41fe Merge pull request #1648 from pi-hole/branding/DOReadme.md Adam Warner 2017-08-02 11:29:31 +01:00
  • cc4ada99d8 Use SIGHUP instead of force-reload WaLLy3K 2017-08-01 20:48:43 +10:00
  • 16d67f55b3 Merge branch 'development' into fix/issue-template Adam Warner 2017-07-29 17:18:16 +01:00
  • 18b41adbf6 Merge branch 'development' into tweak/gravity Adam Warner 2017-07-29 17:14:39 +01:00
  • 898fdf7a60 Merge pull request #1602 from molikuner/development Mcat12 2017-07-29 11:49:24 -04:00
  • 78143c2ff4 Merge branch 'development' into blockpage2 Adam Warner 2017-07-29 16:44:28 +01:00
  • 7b1524ad01 Merge branch 'development' into new/https Adam Warner 2017-07-29 16:44:20 +01:00
  • 5799485b0f Merge branch 'development' into development Adam Warner 2017-07-29 16:29:57 +01:00
  • 9cddb6ca39 Merge branch 'release/3.2' into branding/DOReadme.md Mcat12 2017-07-29 11:04:10 -04:00
  • defc17ba46 Remove DO from README.md Dan Schaper 2017-07-28 20:24:27 -07:00
  • 106d5afba1 Merge pull request #1646 from pi-hole/bugfix/DoubleH Adam Warner 2017-07-28 23:09:00 +01:00
  • 0a9965292c Additional check to fix any existing cases of "24h" in setupVars.conf automatically. Adam Warner 2017-07-28 19:40:13 +01:00
  • 4fb66e632f The other h Adam Warner 2017-07-28 16:30:03 +01:00
  • 5787895794 stop an extra h being added to leasetime of DHCP server. We already storethe h in setupVars.conf Adam Warner 2017-07-28 16:10:13 +01:00
  • d90489b31d Include branch we're switching from Adam Warner 2017-07-27 22:21:25 +01:00
  • f38912a0c9 - Correctly overwrite ${INFO} boxes with ${CROSS} etc - Notify user that branch has been changed Adam Warner 2017-07-27 21:33:41 +01:00
  • f24ab8508e WIP cleanup WaLLy3K 2017-07-27 12:34:35 +10:00
  • 2d8fff099f Pass correct options to gravity.sh WaLLy3K 2017-07-27 12:34:26 +10:00
  • dce36d8ded Merge branch 'master' into release/3.2 Adam Warner 2017-07-26 19:49:57 +01:00
  • 18d0278279 Merge pull request #1638 from pi-hole/hotfix/CIDR Mcat12 2017-07-26 14:41:03 -04:00
  • 4e525040f3 Merge branch 'development' into hotfix/CIDR Adam Warner 2017-07-26 18:23:02 +01:00
  • fdf2649f2f Clean up known remaining colour output issues (#1613) WaLLy3K 2017-07-27 03:00:08 +10:00
  • b09c660833 Always process DNS and DHCP settings in installer (#1630) Mcat12 2017-07-26 12:15:23 -04:00
  • c02a24cf71 Fix/unbreak development (#1635) Adam Warner 2017-07-26 14:34:40 +01:00
  • a77136bd1d Merge pull request #1600 from pi-hole/tweak/OnlyDownloadFTLNew Mcat12 2017-07-25 22:11:31 -04:00
  • e0eb5eb2b1 Fix queryFunc if adlists URLs have been removed (#1618) WaLLy3K 2017-07-26 08:07:06 +10:00
  • 714fd93292 Provide correct FTL stats (#1619) WaLLy3K 2017-07-26 08:03:23 +10:00
  • a293b5a371 prevent ./automated install/basic-install.sh: line 1886: /usr/bin/pihole-FTL: No such file or directory on new install, or if pihole-FTL is missing for whatever reason. Adam Warner 2017-07-25 22:49:06 +01:00
  • 1c93868ae1 Adjust wording of echos Adam Warner 2017-07-24 23:22:04 +01:00
  • 61ff0452e1 Remove duplicate code WaLLy3K 2017-07-24 21:27:12 +10:00
  • 406098e55a Speed up refresh time WaLLy3K 2017-07-24 21:26:39 +10:00
  • a2825be819 Add dnsmasq "force-reload" option WaLLy3K 2017-07-24 21:25:04 +10:00
  • 6830b08723 Clean up and optimise Gravity WaLLy3K 2017-07-24 21:24:34 +10:00
  • eead2f059b Add review suggestions to Issue Template WaLLy3K 2017-07-23 11:06:43 +10:00
  • 291c111ce8 Update PR Template text WaLLy3K 2017-07-22 15:29:36 +10:00
  • 2ccf063dfe Update Issue Template text WaLLy3K 2017-07-22 15:15:39 +10:00
  • 49aee8b931 Fixed development branch check WaLLy3K 2017-07-19 12:26:00 +10:00
  • f2a3b557c8 Updated Block Page to work with queryFunc output WaLLy3K 2017-07-19 00:15:59 +10:00
  • b0eceddcec Merge pull request #1617 from pi-hole/hotfix/CIDR v3.1.4 Adam Warner 2017-07-18 09:39:20 +01:00
  • 0a062d26e6 Merge pull request #1611 from pi-hole/developmentNew Adam Warner 2017-07-17 14:49:55 +01:00
  • 20b2dd6b19 Merge pull request #1567 from pi-hole/tweak/checkout_FTL Adam Warner 2017-07-17 14:38:30 +01:00
  • 83592a5e70 Put '"'s in the right place Adam Warner 2017-07-17 11:14:02 +01:00
  • 70fb733fea col_table does not exist yet, will break the install if pushed as hotfix. Not sure why these additional "'s were put in, they break the update command, too. Adam Warner 2017-07-17 10:53:49 +01:00
  • eb8333c772 Merge branch 'development' into developmentNew Adam Warner 2017-07-16 16:45:33 +01:00
  • c9a98b68c8 Avoid reactivating a deactivated lighttpd service (#1485) WaLLy3K 2017-07-17 01:44:14 +10:00
  • 247d3ed729 list availible branches for FTL Adam Warner 2017-07-16 13:54:23 +01:00
  • 031c6428d5 Merge branch 'tweak/checkout_FTL' of https://github.com/pi-hole/pi-hole into tweak/checkout_FTL Adam Warner 2017-07-16 13:34:20 +01:00
  • f2e9d585f7 * Add helptext for pihole checkout ftl * Only attempt to install FTL if branch was found * ~~corebranches~~ webbranches (web branches now actually listed) Adam Warner 2017-07-16 13:22:59 +01:00
  • 8af9853b9a Fixed minor formatting issues WaLLy3K 2017-07-16 22:32:34 +10:00
  • 783f50657b Merge branch 'development' into tweak/checkout_FTL Adam Warner 2017-07-16 12:25:27 +01:00
  • 3a50b91722 User-friendly queryFunc() output (#1483) WaLLy3K 2017-07-15 20:56:40 +10:00
  • 3631d1349e Prevent Web Admin from printing restartdns colour codes (#1575) WaLLy3K 2017-07-15 20:11:06 +10:00
  • 05c8687041 Integrate DL's update.sh fixes. Dan Schaper 2017-06-25 14:21:41 -07:00
  • 66f32b7601 Remove testing for debug as this is getting a re-write by Jacob. Dan Schaper 2017-06-25 12:26:16 -07:00
  • 9101916719 Test exclusion for sourced files SC1090. Dan Schaper 2017-06-24 15:49:16 -07:00
  • edb594461d Remove CIDR from IPv6 address when detecting it in the install script Adam Warner 2017-06-28 22:54:02 +01:00
  • 9464b71a6e Remove /* from IPv6 as well as IPv4 Mcat12 2017-06-26 09:51:21 -04:00
  • 7d56e2a937 FTL has an L in it, innit? Adam Warner 2017-07-14 20:54:41 +01:00
  • 218aa03f05 Merge branch 'developmentNew' of https://github.com/pi-hole/pi-hole into developmentNew Adam Warner 2017-07-14 20:50:52 +01:00
  • 1db03a10d7 Merge branch 'master' into developmentNew Adam Warner 2017-07-14 20:47:49 +01:00
  • e1f818ffb7 Tweak/debug improvements (#1585) Jacob Salmela 2017-07-14 10:53:45 -05:00
  • 9934f505a5 Fix URL extension parsing Molikuner 2017-07-13 23:18:40 +02:00
  • 8c2b8f7241 Merge pull request #1599 from pi-hole/tweak/readme Dan Schaper 2017-07-12 17:40:56 -07:00
  • bf70c2c660 initial changes to tests to take into account changes to strings Adam Warner 2017-07-12 22:52:03 +01:00
  • 74b912a0b7 Check if FTL is already installed, do not download if it is detected, and the sha1sum matches the remote This will probably break some tests. I'll work that out in a bit Signed-off-by: Adam Warner <adamw@rner.email> Adam Warner 2017-07-12 22:02:07 +01:00
  • 93d40b083e Fix extentions of the JPG images Dan Schaper 2017-07-12 11:40:18 -07:00
  • 162ee28d0c Merge pull request #1597 from pi-hole/tweak/readme-trademarks-and-more Jacob Salmela 2017-07-12 08:25:49 -05:00
  • d328d17d03 Merge pull request #1586 from pi-hole/enhance/comments-in-installer Jacob Salmela 2017-07-12 07:49:35 -05:00
  • 2778d88e8a Fix missing then clause Dan Schaper 2017-07-12 00:12:54 -07:00
  • b5c6178644 Merge remote-tracking branch 'origin/development' into enhance/comments-in-installer Jacob Salmela 2017-07-12 01:38:49 -05:00
  • ea8927e1da add facebook page to contact info Jacob Salmela 2017-07-12 01:21:47 -05:00
  • bc1065a7fc reorganize sections. install instructions first. also added more wordsmithing and links to interesting pi-hole.net articles Jacob Salmela 2017-07-12 01:18:50 -05:00
  • f4c7d389e5 more wordsmithing and updating links Jacob Salmela 2017-07-12 01:03:09 -05:00
  • 03387391de wordsmith DHCP server section, API section, and chronometer2 section. Also add more images Jacob Salmela 2017-07-12 00:53:14 -05:00
  • 24df5f5208 describe settings page in the order they appear on the dashboard--also add screenshots Jacob Salmela 2017-07-12 00:36:12 -05:00
  • 9348a8ab15 move technical details to the bottom of the page in light of showing off Pi-holes features first. Jacob Salmela 2017-07-11 23:36:40 -05:00
  • fbd55dd740 tweaks to donation verbiage Jacob Salmela 2017-07-11 23:33:49 -05:00
  • e5e26413e9 new executive summary above the fold Jacob Salmela 2017-07-11 23:28:47 -05:00
  • 527fe2f5e1 wordsmithing using Pi-hole as your DNS server, gravity, and additional blocklists. Jacob Salmela 2017-07-11 23:06:42 -05:00
  • 38d213ee6c add section about additional ways to support us Jacob Salmela 2017-07-11 22:55:50 -05:00
  • 613f2d3b86 Pi-hole is now a registered trademark: replace ™ with ® Jacob Salmela 2017-07-11 22:51:20 -05:00
  • e7ad972783 fix thre spelling errors Jacob Salmela 2017-07-10 14:12:30 -05:00
  • 2f939d8c56 fix two spelling errors Jacob Salmela 2017-07-07 09:05:19 -05:00
  • 7ef751f96d Merge pull request #1587 from pi-hole/fix/1430 Jacob Salmela 2017-07-06 20:59:41 -05:00
  • fb66fb12c5 put "no password will be set" on a newline. Jacob Salmela 2017-07-06 20:54:09 -05:00
  • 042dcf795c fixes #1430 Jacob Salmela 2017-07-06 20:44:40 -05:00
  • aad39c5ffc add comments for nearly every line of code. Jacob Salmela 2017-07-06 19:25:56 -05:00
  • c3ed710e31 Merge pull request #1565 from pi-hole/revamp/debug Dan Schaper 2017-07-05 15:12:36 -07:00
  • cb65907e60 Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug Jacob Salmela 2017-07-05 16:55:34 -05:00
  • bb8a263d70 ShellCheck DL6ER 2017-07-05 19:34:20 +02:00
  • 70fd94edb3 Edit message when requested branch of FTL is not available DL6ER 2017-07-05 19:30:05 +02:00
  • d0492898eb Add "php5-sqlite" to uninstall dependencies WaLLy3K 2017-07-05 17:21:17 +10:00
  • c6ba03802f Add "php5-sqlite" to dependencies WaLLy3K 2017-07-05 17:18:21 +10:00
  • 1bebcef265 Make Chronometer usable on smaller screens (#1518) WaLLy3K 2017-07-04 13:52:51 +10:00
  • 209fbf82c4 Colourise tailFunc (#1550) WaLLy3K 2017-07-02 23:21:00 +10:00
  • 6ce79ae1d0 Fix git commands (#1577) DL6ER 2017-07-01 23:52:10 +02:00
  • b3eb5c4f0e Colour Tweaks (#1549) Adam Warner 2017-07-01 13:08:17 +01:00
  • ec4e9780ed Accept underscores when validating domain names (#1571) DL6ER 2017-06-30 14:52:33 +02:00
  • 22abbffbb7 Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development Adam Warner 2017-06-29 19:47:32 +01:00