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 20:13:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
1534 commits 8 branches 109 tags 27 MiB
Commit graph

1534 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Dan Schaper
7ad96ef1d5 Add click instructions 2016-11-08 00:52:15 -08:00
Dan Schaper
ac77498aa6 Swap Global Image 
Global image, no berry, no overlay
 2016-11-08 00:38:48 -08:00
Dan Schaper
e25af6ade8 Add DO Slug and Copy to README 2016-11-08 00:18:26 -08:00
Dan Schaper
e9475a9739 Merge pull request #887 from brontide/dependancy_cleanup 
Dependancy cleanup
 2016-11-07 21:45:23 -08:00
Dan Schaper
d4270e02e9 Merge pull request #902 from elpatron68/master 
Added Link to blink1_pi-hole.py
 2016-11-07 21:44:28 -08:00
Mcat12
b9a263ecb2 Merge pull request #907 from pi-hole/bugfix/chronometer-interface 
replace hardcoded interface with var
 2016-11-07 21:35:09 -05:00
Dan Schaper
4929d415a6 Merge pull request #906 from pi-hole/Fix/send-frs-into-orbit 
Direct users to Discourse for FRs
 2016-11-07 17:32:28 -08:00
Dan Schaper
b9e1f518aa Merge pull request #909 from bcambl/fix_ifcfg_append 
Fedora: write interface config instead of append
 2016-11-07 17:23:50 -08:00
bcambl
0caa44e979 write ifcfg instead of appending 2016-11-07 12:54:31 -06:00
Jacob Salmela
ca56ca5bd8 promo-tweak 
Better logic introduced by @PromoFaux
 2016-11-06 11:16:48 -06:00
Jacob Salmela
a0f0dff88e replace hardcoded interface with var 
setupVars.conf is already sourced, so we just need to replace the
hardcoded value with the variable name.
 2016-11-06 08:18:57 -06:00
Jacob Salmela
e5cc38a210 Direct users to Discourse for FRs 
It's a better platform for it because users can vote and we can have
easier discussions for it.
 2016-11-06 08:08:58 -06:00
diginc
92d91f2c76 Update pathing in dockerfile 2016-11-05 12:39:20 -05:00
Dan Schaper
941ba535ef Remove CC badge 2016-11-04 18:44:21 -07:00
Dan Schaper
fe959b15b4 Add git clone method to installers 2016-11-04 18:43:54 -07:00
Dan Schaper
1568c9ab3b Change path to remove space 2016-11-04 18:32:10 -07:00
Dan Schaper
0dc9d7fbd4 Remove swapfile that hasn't been used on about a year. 2016-11-04 18:31:38 -07:00
Dan Schaper
ea69af8853 Update Basic for path without space. 2016-11-04 18:30:50 -07:00
Adam Warner
6cb5bb7200 Merge pull request #903 from pi-hole/feature/PRGuide 
PR against Development guide
 2016-11-04 21:17:20 +00:00
Dan Schaper
563696e291 PR against Development guide 
PA will tag PR to Master with -1 approval in the next release. That will deny any PR's against Master from users and changing branches after the PR is started does not appear to modify the PA actions.
 2016-11-04 14:01:01 -07:00
Markus Busche
c755b3c49e Added Link to blink1_pi-hole.py 2016-11-04 21:56:14 +01:00
Dan Schaper
8c08e9e473 Merge pull request #891 from pi-hole/bugfix/chronometer-domain-count 
Bugfix/chronometer domain count
 2016-11-03 13:55:29 -07:00
Adam Warner
4300759287 Fix logic. If both v6 and v4 divide by two, else dont. 2016-11-03 08:01:25 +00:00
Adam Warner
fc1854cadd Merge pull request #897 from pi-hole/feature/travisDevBadge 
Update README.md
 2016-11-03 07:49:30 +00:00
Adam Warner
933973b12c Merge pull request #898 from pi-hole/fix/removeCC 
Remove CodeClimate yaml, Travis new ShellChecker
 2016-11-03 07:48:36 +00:00
Dan Schaper
d958b3ff65 Remove CodeClimate yaml, Travis new ShellChecker 2016-11-02 20:14:04 -07:00
Dan Schaper
a4aeb9a1dd Update README.md 2016-11-02 20:07:51 -07:00
Eric Warnke
71005e1db3 Merge with change of spacing in development 2016-11-02 19:01:34 -04:00
Promofaux
d7d6d6f991 Update to use new Var name 2016-11-02 21:46:30 +00:00
Adam Warner
5986121cfc Merge pull request #896 from pi-hole/bugfix/649 
Check for missing index.html, replace if missing.
 2016-11-02 21:27:45 +00:00
Promofaux
c452a4569e .js 2016-11-02 21:17:00 +00:00