Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-04 12:03:18 +00:00
Code Issues Projects Releases Packages Wiki Activity
1574 commits 8 branches 109 tags 27 MiB
Commit graph

1574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mcat12
dcd83334d6 Update wiki link 2016-11-19 16:53:11 -05:00
Dan Schaper
b8f1c1c69a Merge branches 'development' and 'feature/DOReadme' of github.com:pi-hole/pi-hole into feature/DOReadme 
# Conflicts:
#	test/centos.Dockerfile
#	test/debian.Dockerfile
 2016-11-19 13:38:42 -08:00
Dan Schaper
4333e5487b Merge pull request #932 from pi-hole/feature/debug_timeout 
feature/debug_timeout
 2016-11-19 12:25:38 -08:00
Dan Schaper
22ead933b6 Merge pull request #936 from pi-hole/Mcat12-patch-1 
Fix typo
 2016-11-19 11:08:20 -08:00
Dan Schaper
d53a3af191 Merge pull request #899 from diginc/configureFirewall_unittest 
Configure firewall unittest
 2016-11-19 11:07:38 -08:00
Mcat12
08e7b7e0ad Fix typo 2016-11-19 14:00:56 -05:00
Dan Schaper
68cb0782c0 Add countdown timer 2016-11-18 13:27:06 -08:00
Adam Warner
0e5a8e0033 Merge pull request #934 from DL6ER/gravity.sh-done 
Added missing "done." output to gravity.sh
 2016-11-18 20:10:50 +00:00
DL6ER
4945f33254 Added "-n" to first echo call 2016-11-18 17:39:34 +01:00
DL6ER
3fa05293fc Fixed file permissions 2016-11-18 17:37:13 +01:00
DL6ER
27e5f2798d Added missing "done." output 2016-11-18 17:33:46 +01:00
Dan Schaper
0f4c8d4923 Set default timeout to 60 seconds 2016-11-17 11:00:11 -08:00
Dan Schaper
6d2c5b2312 Add debug timeoute 2016-11-17 10:58:58 -08:00
Dan Schaper
a95ce11ca6 Add debug timeoute 2016-11-17 10:39:51 -08:00
Adam Warner
d4b6fb9214 Merge pull request #929 from pi-hole/cleanup/PR_template 
Small change in template
 2016-11-17 12:43:54 +00:00
Dan Schaper
9bce5a09f3 Small change in template 
Just a space, and italicize
 2016-11-16 21:42:54 -08:00
Mcat12
bd61f38169 Merge pull request #926 from zbholman/patch-2 
Added removal of pihole user to the uninstall.sh
 2016-11-16 17:31:56 -05:00
zbholman
cac9c63325 Added removal of pihole user to the uninstall.sh 
Not sure if I should have created a variable for the username or if the echo is necessary. And this is my first time doing a pull request, hopefully it works out lol.
 2016-11-16 17:06:30 -05:00
Adam Warner
e6d555ac31 Merge pull request #925 from pi-hole/feature/style_guide 
Add GSG/Shell link
 2016-11-16 22:03:18 +00:00
Dan Schaper
fd0dd9f54c Add GSG/Shell link 2016-11-16 13:55:29 -08:00
Dan Schaper
bdad454a0d Merge pull request #920 from pi-hole/PromoFaux-patch-1 
Update piholeDebug.sh
 2016-11-16 11:22:04 -08:00
Adam Warner
ac8064c754 Merge pull request #918 from nlamirault/patch-2 
Add Pi-Hole exporter for Prometheus
 2016-11-16 18:53:00 +00:00
Dan Schaper
736e963cef Merge pull request #919 from haydenknowles/development 
moved newline to correct place
 2016-11-15 18:40:00 -08:00
Adam Warner
b191cd73a7 Update piholeDebug.sh 
wording
 2016-11-15 13:28:18 +00:00
Hayden Knowles
86d3ca48ae moved newline to correct place 2016-11-15 22:40:57 +13:00
Nicolas Lamirault
fd7e4f2268 Add Pi-Hole Prometheus exporter project 2016-11-15 09:27:16 +01:00
Dan Schaper
82a012990d Reset Code Stylings to group defalut 2016-11-11 11:55:28 -08:00
Adam Warner
0df731e69b reflect path name change 2016-11-11 13:56:18 +00:00
Dan Schaper
8509b1afa1 Add and center control panel image 2016-11-10 14:03:17 -08:00
Dan Schaper
aff03bfedb Add and center dashboard image 2016-11-10 13:56:54 -08:00
Dan Schaper
6fbafb185b Change static images to use Asset server 2016-11-10 13:48:18 -08:00
Dan Schaper
be49e73c49 Add BC logo 2016-11-09 14:32:20 -08:00
Dan Schaper
c178a84f0b More logos 2016-11-09 14:06:04 -08:00
Dan Schaper
7a7e1a8bb4 Start adding in logos to media links 2016-11-09 13:52:57 -08:00
Dan Schaper
eacaa7cdb8 Merge in git method instructions from other branch. 
Move some bits around.
 2016-11-09 12:49:18 -08:00
Dan Schaper
2d5a26759a Merge remote-tracking branch 'origin/feature/path_change' into feature/DOReadme 
# Conflicts:
#	README.md
 2016-11-09 12:31:31 -08:00
Dan Schaper
f838ee8d20 Further refinements. 
Trying to find a good flow for information and layout.
 2016-11-08 15:29:30 -08:00
Mcat12
eda327360a Update README.md 2016-11-08 15:03:19 -05:00
Dan Schaper
c80f259167 Merge branch 'development' into feature/path_change 2016-11-08 05:03:10 -08:00
Jacob Salmela
8ccc8c396c relocate and wordsmith donations 2016-11-08 06:56:20 -06:00
Dan Schaper
53016c6d70 Merge branch 'development' of https://github.com/pi-hole/pi-hole into development 2016-11-08 04:50:08 -08:00
Jacob Salmela
6a49e19130 above the fold verbage 
Try to let the user know in two sentences what Pi-hole can do for them.

Also, linked to Discourse hw/sw requirements.

fixed DO referral code.
 2016-11-08 06:49:50 -06:00
Dan Schaper
0b3b63911c Pull overlay off black hole image 2016-11-08 04:42:54 -08:00
Dan Schaper
ca135e6ea8 Move things around a bit. 2016-11-08 04:26:26 -08:00
Dan Schaper
f92b728ca8 Last change for now. 2016-11-08 01:39:34 -08:00
Dan Schaper
c50f5113e7 Bump Vortex up a bit. 2016-11-08 01:34:49 -08:00
Dan Schaper
394f254072 Center Badges and move DO Slug 2016-11-08 01:33:40 -08:00
Dan Schaper
ac1e6c8ec8 Remove extra break 2016-11-08 01:28:58 -08:00
Dan Schaper
97ffe91499 Add New Logo 2016-11-08 01:28:02 -08:00
Dan Schaper
147b11a179 Center Global 2016-11-08 01:17:40 -08:00