Commit graph

6222 commits

Author SHA1 Message Date
Adam Warner
3ee10f5983 Merge pull request #938 from DL6ER/another_done
Another done
2016-11-20 19:21:58 +00:00
Dan Schaper
0fc8ac8d4d Codacy Badge for Master 2016-11-20 09:44:39 -08:00
Dan Schaper
41bb53a29f Remove CC Badge, Link Vortex to Discourse 2016-11-20 09:42:45 -08:00
DL6ER
cdee6d55d3 Minor change 2016-11-20 17:40:22 +01:00
DL6ER
e5a1afaa26 Added another missing "done" 2016-11-20 17:31:27 +01:00
DL6ER
f50cbe74cb Changed -web (webpage) to -a (admin) 2016-11-20 15:15:27 +01:00
Dan Schaper
5dbbf91917 Link to AdminLTE 2016-11-19 15:08:35 -08:00
Mcat12
7424a29960 Update wiki link 2016-11-19 15:03:32 -08:00
Dan Schaper
eb22ca2467 Reset Code Stylings to group defalut 2016-11-19 15:03:12 -08:00
Dan Schaper
ddbcbe5458 Merge in git method instructions from other branch.
Move some bits around.

Start adding in logos to media links

More logos

Add BC logo

Change static images to use Asset server

Add and center control panel image
2016-11-19 15:01:56 -08:00
Dan Schaper
6e54cfd2ac Further refinements.
Trying to find a good flow for information and layout.
2016-11-19 14:57:49 -08:00
Mcat12
fc3d4b3def Update README.md 2016-11-19 14:57:38 -08:00
Jacob Salmela
df55b2c516 relocate and wordsmith donations 2016-11-19 14:57:29 -08:00
Jacob Salmela
4d9fb57e22 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-19 14:57:02 -08:00
Dan Schaper
3ed08b5c39 Add New Logo and other changes
Remove extra break

Center Badges and move DO Slug

Bump Vortex up a bit.

Last change for now.

Move things around a bit.

Pull overlay off black hole image
2016-11-19 14:55:52 -08:00
Dan Schaper
d715471426 Center Global 2016-11-19 14:47:46 -08:00
Dan Schaper
486a4929da Add click instructions 2016-11-19 14:46:30 -08:00
Dan Schaper
aacddb745b Swap Global Image
Global image, no berry, no overlay
2016-11-19 14:46:30 -08:00
Dan Schaper
924f499303 Add DO Slug and Copy to README 2016-11-19 14:46:30 -08:00
Dan Schaper
e863a200e8 Remove CC badge 2016-11-19 14:44:43 -08:00
Dan Schaper
bb7f8ae69d Add git clone method to installers 2016-11-19 14:44:13 -08:00
DL6ER
33b6fe72da Extended help text 2016-11-19 21:57:42 +01:00
DL6ER
733919be4a Implement possibility to remove password using "pihole -web -p" 2016-11-19 21:50:15 +01: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
DL6ER
291ca0874a Fixed two more typos 2016-11-18 12:16:26 +01:00
DL6ER
96f2aa1803 fixed typo 2016-11-17 23:36:53 +01:00
DL6ER
c6857501aa Removed check for availability of nohup 2016-11-17 23:31:11 +01:00
DL6ER
3aba1607b2 Removed debug echos 2016-11-17 23:04:46 +01:00
DL6ER
f667298b64 Added possiblity for delayed reactivation of blocking 2016-11-17 22:58:00 +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
Dan Schaper
808503d526 Add piholeDebug to tests 2016-11-17 10:28: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
DL6ER
88c161769d Capitalized variable names. 2016-11-16 22:33:28 +01:00
DL6ER
01bf1ae92d Compute double hashes to avoid rainbow table vulnerability 2016-11-16 22:13:47 +01:00
DL6ER
9193c71cff Minor change 2016-11-16 21:36:19 +01:00