Dan Schaper
b0cc69ff80
Merge Conflict resolution
2016-07-27 18:54:41 -07:00
Dan Schaper
02c4669e95
Typo/Linter fix
...
Fix a few typo's, run through linter for format corrections.
2016-07-26 20:46:43 -07:00
Adam Warner
51dcc2bc0f
Update README.md
...
Add badge for bountysource to show avtive bounties.
2016-07-22 11:56:54 +01:00
Adam Warner
941525d1e0
Development out of sync with master. ( #588 )
...
* adding links to optimal.com
Also added image of Pi-hole's stats from Optimal.com and a bitcoin donation address per some user requests.
* simplified and new additions
I tried to simplify the readme page a bit. I also added some new links to some helper videos and added some screenshots of the whitelist editor.
* updated dashboard pic
* Update README.md
* simplified donation section
* forgot to remove the old donation stuff
* Hosts-file.net moved to https
* removed pihole berry from images
also added adafruit livestream video
* Update README.md
update "How does it work" video
2016-07-22 11:54:17 +01:00
Adam Warner
412c0a172d
Update README.md
...
update "How does it work" video
2016-07-08 22:58:27 +01:00
Jacob Salmela
c1d8496b93
removed pihole berry from images
...
also added adafruit livestream video
2016-07-06 08:37:30 -05:00
Jacob Salmela
2ce47f49b1
forgot to remove the old donation stuff
2016-06-20 15:55:23 -05:00
Jacob Salmela
0250e03b86
simplified donation section
2016-06-20 15:47:05 -05:00
Adam Warner
3c4a305976
Update README.md
2016-06-17 16:05:17 +01:00
Jacob Salmela
9ccf9d57a8
updated dashboard pic
2016-06-13 06:49:03 -05:00
Jacob Salmela
366fcf76f6
simplified and new additions
...
I tried to simplify the readme page a bit. I also added some new links to some helper videos and added some screenshots of the whitelist editor.
2016-06-11 15:05:11 -05:00
Mcat12
c03268707a
Merge pull request #489 from pi-hole/development
...
Next Release
2016-05-22 20:46:40 -04:00
Jacob Salmela
2209beff8a
adding links to optimal.com
...
Also added image of Pi-hole's stats from Optimal.com and a bitcoin donation address per some user requests.
2016-04-29 21:09:41 -05:00
Jacob Salmela
d7de5b2afa
link to pihole menubar
2016-04-23 15:56:14 -05:00
Promofaux
cdffdfbded
merge master > development
2016-04-04 22:18:53 +01:00
The Gitter Badger
12b5be239b
Add Gitter badge
2016-04-02 13:31:49 +00:00
nate
f8427ab789
Merge remote-tracking branch 'refs/remotes/pi-hole/development'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-29 12:57:22 -05:00
nate
f2150ee7e1
Merge conflict resolution
2016-03-28 13:07:51 -05:00
nate
2311b42bca
Merge branch 'ScriptCleanup-Dev'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/piholeDebug.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:58:44 -05:00
nate
a0cf93a7ca
Merge branch 'PiholeDebug'
...
Conflicts:
README.md
2016-03-28 12:22:42 -05:00
nate
8ef4c12f97
Merge branch 'ScriptCleanup'
...
Conflicts:
README.md
advanced/Scripts/blacklist.sh
advanced/Scripts/whitelist.sh
automated install/basic-install.sh
gravity.sh
2016-03-28 12:21:18 -05:00
Promofaux
1e6ac33ef1
Fix merge conflicts
2016-03-24 23:18:14 +00:00
nate
00f46dc149
Added Pi 3B to README.md
2016-03-23 14:56:27 -05:00
Jacob Salmela
396c7ab9ee
link to tekthing mention
...
tekthing mentioned us again as one of 5 easy projects for the Raspberry Pi.
2016-03-22 21:21:08 -05:00
Jacob Salmela
fa2cef6395
link to get LED alerts article
...
added a link to a cool project that makes an LED blink for each ad that gets blocked.
2016-03-21 08:29:19 -05:00
Dan Schaper
eb462955fe
Secure Pulls now with HTTPS
...
Closes #310
2016-03-16 05:06:03 -07:00
Mcat12
f09745b4ad
Update README.md
2016-03-08 16:28:45 -05:00
Carter Maxwell
e92cceecc1
remove trailing whitespace README.md
2016-03-05 21:12:58 -08:00
Jacob Salmela
3283f3ed7d
Show off our pretty dashboard
2016-03-04 12:07:29 -06:00
Jacob Salmela
0ed30b802d
adafruit blog mention
2016-03-04 11:52:19 -06:00
Dan Schaper
b1554d6a89
Add links
2016-03-04 04:38:31 -08:00
Mcat12
4230b03884
Update README.md
2016-03-04 07:34:17 -05:00
Dan Schaper
2182b8339e
Add social addresses
2016-03-04 04:22:54 -08:00
Mcat12
b07b77c58f
Update README.md
2016-02-29 20:09:49 -05:00
Chad Howell
c3b5b97a41
Update README.md
...
Changed wording per @PromoFaux recommendations.
2016-02-25 19:42:43 -05:00
Mcat12
6c58ea18dc
Update README.md
2016-02-24 12:02:18 -05:00
Chad Howell
830b287e5d
Update README.md
...
Add NTC CHIP and Debian based distros
2016-02-23 00:08:50 -05:00
Jacob Salmela
99863bb799
pihole on ubuntu 14.04
...
Also moved a link from "coverage" into "projects" as it was more appropriate
2016-02-20 10:33:04 -06:00
Jacob Salmela
68a9b88b58
docker container for Pi-hole
2016-02-14 10:20:02 -06:00
Dan Schaper
c18a1c3eca
Add A+ to Raspberry Pi Platforms
...
A+ Supported
2016-02-04 01:17:00 -08:00
Dan Schaper
3bf61cce95
Add alternative installation method
...
Add installation method for non-pipe installs
2016-02-03 10:53:23 -08:00
Jacob Salmela
a1204cf246
splunk app
2016-01-30 12:36:56 -05:00
PromoFaux
5fa0d798e2
Update README.md
...
Add link to segment on MSDN/Channel 9's Defrag Show
2016-01-28 10:13:55 +00:00
Jacob Salmela
f2e471707e
Pi-hole chrome extension
2016-01-23 12:39:09 -06:00
PromoFaux
5b62f91bb4
Update README.md
...
Whoops, forgot the readme.. *embarrassed face*
2016-01-23 01:31:33 +00:00
Adam Warner
ac35417ab0
Update README.md
...
Updated Whitelist/Blacklist section - added link to wiki
Added information about `chronometer.sh -j`
2016-01-19 17:13:48 +00:00
Jacob Salmela
0a57b43f09
C.H.I.P. ad blocking project
2016-01-17 20:55:02 -06:00
Jacob Salmela
48f8d7ed0f
pi-hole mentioned in a podcast
...
Worth a good laugh when they say "shut your pie hole!"
2016-01-17 20:34:48 -06:00
Jacob Salmela
9ff1129510
Minibian Pi-hole
2016-01-14 17:11:16 -06:00
Jacob Salmela
0ef0b0b661
LCD real-time stats
2016-01-10 14:09:40 -06:00
