1
0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-18 14:18:15 +00:00
Commit Graph

2847 Commits

Author SHA1 Message Date
Dan Schaper
93d40b083e Fix extentions of the JPG images
Some images are jpg and not png.
2017-07-12 11:40:18 -07:00
Jacob Salmela
162ee28d0c Merge pull request #1597 from pi-hole/tweak/readme-trademarks-and-more
Update README with ® and several other improvements to better describe v3.2
2017-07-12 08:25:49 -05:00
Jacob Salmela
d328d17d03 Merge pull request #1586 from pi-hole/enhance/comments-in-installer
Install Script: Add comments for nearly every line of code
2017-07-12 07:49:35 -05:00
Dan Schaper
2778d88e8a Fix missing then clause 2017-07-12 00:12:54 -07:00
Jacob Salmela
b5c6178644 Merge remote-tracking branch 'origin/development' into enhance/comments-in-installer
merge in development
2017-07-12 01:38:49 -05:00
Jacob Salmela
ea8927e1da
add facebook page to contact info
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-12 01:21:47 -05:00
Jacob Salmela
bc1065a7fc
reorganize sections. install instructions first. also added more wordsmithing and links to interesting pi-hole.net articles
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-12 01:18:50 -05:00
Jacob Salmela
f4c7d389e5
more wordsmithing and updating links
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-12 01:03:09 -05:00
Jacob Salmela
03387391de
wordsmith DHCP server section, API section, and chronometer2 section. Also add more images
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-12 00:53:14 -05:00
Jacob Salmela
24df5f5208
describe settings page in the order they appear on the dashboard--also add screenshots
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-12 00:36:12 -05:00
Jacob Salmela
9348a8ab15
move technical details to the bottom of the page in light of showing off Pi-holes features first.
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-11 23:36:40 -05:00
Jacob Salmela
fbd55dd740
tweaks to donation verbiage
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-11 23:33:49 -05:00
Jacob Salmela
e5e26413e9
new executive summary above the fold
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-11 23:28:47 -05:00
Jacob Salmela
527fe2f5e1
wordsmithing using Pi-hole as your DNS server, gravity, and additional blocklists.
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-11 23:06:42 -05:00
Jacob Salmela
38d213ee6c
add section about additional ways to support us
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-11 22:55:50 -05:00
Jacob Salmela
613f2d3b86
Pi-hole is now a registered trademark: replace ™ with ®
Signed-off-by: Jacob Salmela <github@decoy.email>
2017-07-11 22:51:20 -05:00
Jacob Salmela
e7ad972783
fix thre spelling errors 2017-07-10 14:12:30 -05:00
Jacob Salmela
2f939d8c56
fix two spelling errors 2017-07-07 09:05:19 -05:00
Jacob Salmela
7ef751f96d Merge pull request #1587 from pi-hole/fix/1430
Show text typed when pressing Ctrl+C after using pihole -a -p
2017-07-06 20:59:41 -05:00
Jacob Salmela
fb66fb12c5
put "no password will be set" on a newline. 2017-07-06 20:54:09 -05:00
Jacob Salmela
042dcf795c
fixes #1430 2017-07-06 20:44:40 -05:00
Jacob Salmela
aad39c5ffc
add comments for nearly every line of code. 2017-07-06 19:25:56 -05:00
Dan Schaper
c3ed710e31 Merge pull request #1565 from pi-hole/revamp/debug
Revamp of debug script with logic and colours
2017-07-05 15:12:36 -07:00
Jacob Salmela
cb65907e60 Merge branch 'development' of https://github.com/pi-hole/pi-hole into revamp/debug
merge in development to avoid shellcheck from travis
2017-07-05 16:55:34 -05:00
DL6ER
bb8a263d70
ShellCheck 2017-07-05 19:34:20 +02:00
DL6ER
70fd94edb3
Edit message when requested branch of FTL is not available 2017-07-05 19:30:05 +02:00
WaLLy3K
d0492898eb Add "php5-sqlite" to uninstall dependencies 2017-07-05 17:21:17 +10:00
WaLLy3K
c6ba03802f Add "php5-sqlite" to dependencies 2017-07-05 17:18:21 +10:00
WaLLy3K
1bebcef265 Make Chronometer usable on smaller screens (#1518) 2017-07-04 13:52:51 +10:00
WaLLy3K
209fbf82c4 Colourise tailFunc (#1550)
* Colourise tailFunc

* Strip month, day number and dnsmasq[PID]
* Blocked domains show as light red
* Queries show as standard colour
* Everything else as dark gray

* Change tailFunc highlighted lines

* Highlight Blocked/Blacklist/Wildcard lines as red
* Make DHCP lines default colour

* Make sure tailFunc doesn't match on domain names
2017-07-02 15:21:00 +02:00
DL6ER
6ce79ae1d0 Fix git commands (#1577) 2017-07-01 23:52:10 +02:00
Adam Warner
b3eb5c4f0e Colour Tweaks (#1549) 2017-07-01 22:08:17 +10:00
DL6ER
ec4e9780ed Accept underscores when validating domain names (#1571) 2017-06-30 22:52:33 +10:00
Adam Warner
22abbffbb7
Merge branch 'development' of https://github.com/gedetil/pi-hole into gedetil-development
Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/webpage.sh
2017-06-29 19:47:32 +01:00
Jacob Salmela
05a724afae
codacy appeasement: remove useless cats 2017-06-29 11:49:28 -05:00
Jacob Salmela
1957b002bc
add comments about X-Headers and further explain the file descriptor cod. 2017-06-29 11:37:58 -05:00
Jacob Salmela
04cef25add
remove color character codes before uploading so the log is more readable on our plaintext tricorder server 2017-06-29 11:17:19 -05:00
Adam Warner
ab1a6d8829 Fix install script using IPv6 CIDR notation (#1570) 2017-06-29 11:18:52 +10:00
DL6ER
98afb0e998
pihole checkout ftl 2017-06-27 14:28:05 +02:00
DL6ER
e9d81fc883 Backend additions for aufit log feature (#1399) 2017-06-27 10:53:24 +02:00
Jacob Salmela
22fac5e1e0
additional shellcheck fixes 2017-06-26 22:03:45 -05:00
Jacob Salmela
b6a2a4ad5a
more shellcheck fixes 2017-06-26 21:51:41 -05:00
Jacob Salmela
5f00347019
appease shellcheck by removing two unneccesary functions and making some if/else blocks 2017-06-26 21:34:39 -05:00
Mcat12
89a22ded54 Merge pull request #1564 from pi-hole/fix/ipv6-cidr
Fix gravity generation when IPv6 CIDR is present
2017-06-26 10:04:06 -04:00
Mcat12
1e31fa89aa Remove /* from IPv6 as well as IPv4
Fixes Discourse issue: https://discourse.pi-hole.net/t/ipv6-aaaa-dns-issue/3830
2017-06-26 09:51:21 -04:00
Dan Schaper
b477b7f777 Merge pull request #1539 from mterron/patch-1
Add support for PowerPC architecture
2017-06-25 19:37:23 -07:00
Mcat12
0de15f7a97 Merge branch 'development' into patch-1 2017-06-25 18:15:33 -04:00
Mcat12
35ecf40259 Merge pull request #1545 from pi-hole/dschaper-patch-1
Update PULL_REQUEST_TEMPLATE.md
2017-06-25 18:13:30 -04:00
Mcat12
009363a7bb Merge pull request #1560 from pi-hole/fix/ad-domain-hostname
Move local.list after the ad blocking lists
2017-06-25 18:11:48 -04:00
Mcat12
a3758612ec Merge pull request #1556 from pi-hole/fix/invalid-ipv6-wildcard
Fix wildcarding with IPv6
2017-06-25 18:09:26 -04:00