Skip to content

Commit

Permalink
Merge pull request #1 from gridcoin-community/master
Browse files Browse the repository at this point in the history
Merging Upstream
  • Loading branch information
barton2526 committed Sep 22, 2017
2 parents 8070bbf + bc83931 commit 29f8ec6
Show file tree
Hide file tree
Showing 224 changed files with 479 additions and 419 deletions.
12 changes: 12 additions & 0 deletions data/blog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
posts:
- title: "Multiple ongoing polls!"
link_primary_url: "https://gridcoinstats.eu/poll"
link_primary_text: "List of ongoing polls"
link_secondary_url: ""
link_secondary_text: ""
content: "Four new polls created, 3 project whitelist polls and one technical poll; please vote!"
- title: "Leisure Gridcoin client update v3.6.1.0!"
link_primary_url: "https://github.com/gridcoin/Gridcoin-Research/releases/tag/3.6.1.0"
link_primary_text: "v3.6.1.0 release notes"
link_secondary_url: ""
link_secondary_text: ""
content: "A leisure upgrade has been released to fix superblock issues."
- title: "Mandatory Gridcoin client update v3.6.0.2!"
link_primary_url: "https://github.com/gridcoin/Gridcoin-Research/releases/tag/3.6.0.2"
link_primary_text: "v3.6.0.2 release notes"
Expand Down
Binary file added source.zip
Binary file not shown.
10 changes: 5 additions & 5 deletions source/Guides/gridcoin-install.htm.erb
Original file line number Diff line number Diff line change
Expand Up @@ -74,19 +74,19 @@ description: "Step 2 of the solo crunching guide; Instructing the user how to se
</h5>
<ul style="text-align: justify; list-style-type: none; padding-left: 0;">
<li style="margin-bottom: 10px;">
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;" href="http://download.gridcoin.us/download/downloadstake/GridcoinResearch.msi">Download Windows Client</a>
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;" href="https://download.gridcoin.us/download/downloadstake/GridcoinResearch.msi">Download Windows Client</a>
</li>
</ul>
</div>
<div class="col-xs-12 col-sm-12 col-md-12">
<h5>
Mac OS
macOS
</h5>
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;font-weight:bold;" href="https://github.com/Git-Jiro/homebrew-jiro/releases">
DMG packages
</a>
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;" href="http://wiki.gridcoin.us/OS_X_Guide">Gridcoin wiki: Mac OS guide</a>
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;" href="https://cryptocointalk.com/topic/13139-os-x-builds-feedback-bug-reporting/">Mac OS Build Support thread</a>
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;" href="http://wiki.gridcoin.us/OS_X_Guide">Gridcoin wiki: macOS guide</a>
<a class="btn btn-round" style="background-color:#4e0097;margin:5px;" href="https://cryptocurrencytalk.com/topic/13139-os-x-builds-feedback-bug-reporting/">macOS Build Support thread</a>
</div>
<div class="col-xs-12 col-sm-12 col-md-12">
<h5>
Expand Down Expand Up @@ -238,4 +238,4 @@ description: "Step 2 of the solo crunching guide; Instructing the user how to se
</div>
</div>
</div>
</section>
</section>
63 changes: 52 additions & 11 deletions source/Guides/whitelist.htm.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Gridcoin - Project Whitelist"
description: "The Gridcoin whitelist is a list of community-approved BOINC projects which are applicable for earning Gridcoin."
---
<section data-background-color="black" style="padding-bottom: 5px; padding-top:90px; margin-top: 0px;">
<section data-background-color="black" style="padding-bottom: 5px; padding-top:150px; margin-top: 0px;">
<!--Start of GRC Feature section-->
<!--First row of features-->
<div class="container" style="overflow:hidden;">
Expand All @@ -16,17 +16,13 @@ description: "The Gridcoin whitelist is a list of community-approved BOINC proje
<p><a href="https://cryptocurrencytalk.com/forum/2436-projects/">Projects subforum</a></p>
</div>

<div class="col-xs-12 col-sm-4">
<h5>Status Tracking</h5>
<p><a href="https://gridcoinstats.eu/project">Gridcoinstats</a></p>
<p>Whitelist verifiable within Windows client neural network (coming to linux soon).</p>
</div>

<div class="col-xs-12 col-sm-4">
<div class="col-xs-12 col-sm-8">
<h5>Please note:</h5>
<p>You will only be rewarded Gridcoin for whitelisted BOINC projects.</p>
<p>Any BOINC work done outside of the whitelisted BOINC projects will not be rewarded Gridcoin.</p>
<p>Want a project whitelisted? <a href="https://cryptocurrencytalk.com/forum/2436-projects/">Create a thread about it</a>!
<p>You can check whitelisted project details on <a href="https://gridcoinstats.eu/project">Gridcoinstats</a>.</p>
<p>The whitelist is verifiable within the Windows client (coming to linux soon).</p>
</div>
</div>
</div>
Expand All @@ -38,9 +34,8 @@ description: "The Gridcoin whitelist is a list of community-approved BOINC proje
<!-- BOINC Content -->
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<!--<table class="table table-hover table-condensed tablesorter" id="myTable" >-->
<table class="table table-hover table-condensed">
<div class="hidden-sm-down col-md-12 col-lg-12">
<table class="table table-hover table-condensed table-responsive">
<thead>
<tr>
<th>
Expand Down Expand Up @@ -102,7 +97,53 @@ description: "The Gridcoin whitelist is a list of community-approved BOINC proje
<% end %>
</tbody>
</table>
</div>

<div class="col-xs-12 col-sm-12 hidden-md-up">
<table class="table table-hover table-condensed table-responsive">
<thead>
<tr>
<th>
Project
</th>
<th>
Sponsor
</th>
<th>
CPU
</th>
<th>
GPU
</th>
</tr>
</thead>
<tbody>
<% data.whitelist.projects.each do |project| %>
<tr>
<td>
<a href=<%= project.link %> style="font-weight:bold;"><%= project.name %></a>
</td>
<td>
<%= project.sponsor %>
</td>
<td>
<% if project.cpu == "yes" %>
<i class="fa fa-check" aria-hidden="true"></i>
<% else %>
<i class="fa fa-times" aria-hidden="true"></i>
<% end %>
</td>
<td>
<% if project.gpu == "yes" %>
<i class="fa fa-check" aria-hidden="true"></i>
<% else %>
<i class="fa fa-times" aria-hidden="true"></i>
<% end %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>
</div>
Expand Down
Binary file removed source/Images/2px.png
Binary file not shown.
Binary file removed source/Images/2pxd.png
Binary file not shown.
Binary file removed source/Images/3rdparty.jpg
Binary file not shown.
Binary file removed source/Images/CryptoBlox50.png
Binary file not shown.
Binary file removed source/Images/DAC.png
Binary file not shown.
Binary file removed source/Images/Development/linux.jpg
Binary file not shown.
Binary file added source/Images/Exchanges/bitshares.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/Images/Exchanges/flypme.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed source/Images/FrontPage/GridcoinLayout_New2.jpg
Binary file not shown.
Binary file removed source/Images/FrontPage/arrow.png
Binary file not shown.
Binary file removed source/Images/FrontPage/arrow2.png
Binary file not shown.
Binary file removed source/Images/FrontPage/boinc.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon01.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon02.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon03.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon04.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon05.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon06.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon07.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon08.png
Binary file not shown.
Binary file removed source/Images/FrontPage/icon09.png
Binary file not shown.
Binary file removed source/Images/FrontPage/old/icon1.png
Binary file not shown.
Binary file removed source/Images/FrontPage/old/icon2.png
Binary file not shown.
Binary file removed source/Images/FrontPage/old/icon3.png
Binary file not shown.
Binary file removed source/Images/FrontPage/old/icon4.png
Binary file not shown.
Binary file removed source/Images/FrontPage/old/icon5.png
Diff not rendered.
Binary file removed source/Images/FrontPage/old/icon6.png
Diff not rendered.
Binary file removed source/Images/FrontPage/visual.png
Diff not rendered.
Binary file removed source/Images/GRC-Install/1.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/2.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/3.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/4.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/5.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/6.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/7.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/Client.png
Diff not rendered.
Binary file removed source/Images/GRC-Install/boincemail.png
Diff not rendered.
Binary file removed source/Images/GRC-Install/boincpool.png
Diff not rendered.
Binary file removed source/Images/GRC-Install/grc-small.png
Diff not rendered.
Binary file removed source/Images/GRC-Install/properties.jpg
Diff not rendered.
Binary file removed source/Images/GRC-Install/skipped.png
Diff not rendered.
Binary file removed source/Images/GRC-Install/splash.png
Diff not rendered.
Binary file removed source/Images/Icon/menu.png
Diff not rendered.
Binary file removed source/Images/LECCY.PNG
Diff not rendered.
Binary file removed source/Images/Picture3.png
Diff not rendered.
Binary file removed source/Images/Platforms/android.png
Diff not rendered.
Binary file removed source/Images/Platforms/freebsd.png
Diff not rendered.
Binary file removed source/Images/Platforms/linux.png
Diff not rendered.
Binary file removed source/Images/Platforms/macOS.png
Diff not rendered.
Binary file removed source/Images/Platforms/raspberry.png
Diff not rendered.
Binary file removed source/Images/Platforms/virtualbox.png
Diff not rendered.
Binary file removed source/Images/Platforms/windows.png
Diff not rendered.
Binary file removed source/Images/Press/bmz_logo.png
Diff not rendered.
Binary file removed source/Images/Press/bmz_logo2.png
Diff not rendered.
Binary file removed source/Images/Press/btcfeed.png
Diff not rendered.
Binary file removed source/Images/Press/btcst_logo.jpg
Diff not rendered.
Binary file removed source/Images/Press/btcst_logo2.jpg
Diff not rendered.
Binary file removed source/Images/Press/coindesk.png
Diff not rendered.
Binary file removed source/Images/Press/coindesk2.png
Diff not rendered.
Binary file removed source/Images/Press/logo.png
Diff not rendered.
Binary file removed source/Images/Press/telegraph.png
Diff not rendered.
Binary file removed source/Images/Press/themerkle-logo-new4.png
Diff not rendered.
Binary file removed source/Images/Projects/cancer.png
Diff not rendered.
Binary file removed source/Images/Projects/mosquito.png
Diff not rendered.
Diff not rendered.
Binary file removed source/Images/Social/128-cctalk.png
Diff not rendered.
Binary file removed source/Images/Social/128-deviantart.png
Diff not rendered.
Binary file removed source/Images/Social/128-discord.png
Diff not rendered.
Binary file removed source/Images/Social/128-dribbble.png
Diff not rendered.
Binary file removed source/Images/Social/128-dropbox.png
Diff not rendered.
Binary file removed source/Images/Social/128-facebook.png
Diff not rendered.
Binary file removed source/Images/Social/128-flickr.png
Diff not rendered.
Binary file removed source/Images/Social/128-forum.png
Diff not rendered.
Binary file removed source/Images/Social/128-github.png
Diff not rendered.
Binary file removed source/Images/Social/128-googleplus.png
Diff not rendered.
Binary file removed source/Images/Social/128-instagram.png
Diff not rendered.
Binary file removed source/Images/Social/128-kiwiirc.png
Diff not rendered.
Binary file removed source/Images/Social/128-linkedin.png
Diff not rendered.
Binary file removed source/Images/Social/128-mirc.png
Diff not rendered.
Binary file removed source/Images/Social/128-mixcloud.png
Diff not rendered.
Binary file removed source/Images/Social/128-myspace.png
Diff not rendered.
Binary file removed source/Images/Social/128-pinterest.png
Diff not rendered.
Binary file removed source/Images/Social/128-reddit.png
Diff not rendered.
Binary file removed source/Images/Social/128-rss.png
Diff not rendered.
Binary file removed source/Images/Social/128-soundcloud.png
Diff not rendered.
Binary file removed source/Images/Social/128-steemit.png
Diff not rendered.
Binary file removed source/Images/Social/128-stumbleupon.png
Diff not rendered.
Binary file removed source/Images/Social/128-telegram.png
Diff not rendered.
Binary file removed source/Images/Social/128-tumblr.png
Diff not rendered.
Binary file removed source/Images/Social/128-twitter.png
Diff not rendered.
Binary file removed source/Images/Social/128-vimeo.png
Diff not rendered.
Binary file removed source/Images/Social/128-wordpress.png
Diff not rendered.
Binary file removed source/Images/Social/128-yahoo.png
Diff not rendered.
Binary file removed source/Images/Social/128-youtube-2.png
Diff not rendered.
Binary file removed source/Images/Social/128-youtube.png
Diff not rendered.
Binary file removed source/Images/Terminology.jpg
Diff not rendered.
Binary file removed source/Images/Tutorials/gcalctool.png
Diff not rendered.
Diff not rendered.
Binary file removed source/Images/Tutorials/putty-configuration-x11.png
Diff not rendered.
Binary file removed source/Images/Tutorials/putty-gcalctool.png
Diff not rendered.
Binary file removed source/Images/Tutorials/putty-launch.png
Diff not rendered.
Binary file removed source/Images/Tutorials/xlaunch-clipboard.png
Diff not rendered.
Binary file removed source/Images/Tutorials/xlaunch-finish.png
Diff not rendered.
Binary file removed source/Images/Tutorials/xlaunch-multiple-windows.png
Diff not rendered.
Binary file removed source/Images/Tutorials/xlaunch-start-no-client.png
Diff not rendered.
Binary file removed source/Images/background.png
Diff not rendered.
Binary file removed source/Images/bam-icon.png
Diff not rendered.
Binary file removed source/Images/bitcointalk.jpg
Diff not rendered.
Binary file removed source/Images/bkg.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed source/Images/boinc-install.png
Diff not rendered.
Binary file removed source/Images/boincdac.png
Diff not rendered.
Binary file removed source/Images/boincdac2.png
Diff not rendered.
Binary file removed source/Images/boincprojects.jpg
Diff not rendered.
Binary file removed source/Images/boinctest.jpg
Diff not rendered.
Binary file removed source/Images/cmd.png
Diff not rendered.
Binary file removed source/Images/cpu.png
Diff not rendered.
Binary file removed source/Images/dev.jpg
Diff not rendered.
Binary file removed source/Images/events.jpg
Diff not rendered.
Binary file removed source/Images/exchange.jpg
Diff not rendered.
Binary file removed source/Images/facebook.jpg
Diff not rendered.
Binary file removed source/Images/faq.jpg
Diff not rendered.
Binary file removed source/Images/forum.png
Diff not rendered.
Binary file removed source/Images/gamma.jpg
Diff not rendered.
Binary file removed source/Images/gclatin.png
Diff not rendered.
Binary file removed source/Images/generator.jpg
Diff not rendered.
Binary file removed source/Images/github.png
Diff not rendered.
Binary file removed source/Images/grafics.zip
Binary file not shown.
Binary file removed source/Images/grc-install.png
Diff not rendered.
Binary file removed source/Images/grc-logo.png
Diff not rendered.
Binary file removed source/Images/grc-new.png
Diff not rendered.
Binary file removed source/Images/grc-small.png
Diff not rendered.
Binary file removed source/Images/grc-title.png
Diff not rendered.
Binary file removed source/Images/grc-title3.png
Diff not rendered.
Binary file removed source/Images/grc.png
Diff not rendered.
Binary file removed source/Images/grclogo.png
Diff not rendered.
Binary file removed source/Images/grcsimple.png
Diff not rendered.
Binary file removed source/Images/grcsm.png
Diff not rendered.
Empty file removed source/Images/grid.jpg
Diff not rendered.
Binary file removed source/Images/gridcoin-installation.png
Diff not rendered.
Binary file removed source/Images/gridcoin-logo-new.png
Diff not rendered.
10 changes: 0 additions & 10 deletions source/Images/gridcoinh.jpg
Diff not rendered.
Binary file removed source/Images/logo.png
Diff not rendered.
Binary file removed source/Images/logo2.png
Diff not rendered.
Binary file removed source/Images/middleman.png
Diff not rendered.
Binary file removed source/Images/mining.jpg
Diff not rendered.
Binary file removed source/Images/mumble_logo.png
Diff not rendered.
Binary file removed source/Images/ni.jpg
Diff not rendered.
Binary file removed source/Images/nodes.jpg
Diff not rendered.
Binary file removed source/Images/pool.jpg
Diff not rendered.
Binary file removed source/Images/projectpub.jpg
Diff not rendered.
Binary file removed source/Images/px.png
Diff not rendered.
Binary file removed source/Images/reddit.png
Diff not rendered.
Binary file removed source/Images/scrypt.jpg
Diff not rendered.
Binary file removed source/Images/security.jpg
Diff not rendered.
Binary file removed source/Images/seiva/arrow_green.png
Diff not rendered.
9 changes: 0 additions & 9 deletions source/Images/seiva/arrow_green.svg
Diff not rendered.
Binary file removed source/Images/seiva/arrow_grey.png
Diff not rendered.
9 changes: 0 additions & 9 deletions source/Images/seiva/arrow_grey.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic1.png
Diff not rendered.
15 changes: 0 additions & 15 deletions source/Images/seiva/graphic1.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic2.png
Diff not rendered.
13 changes: 0 additions & 13 deletions source/Images/seiva/graphic2.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic3.png
Diff not rendered.
10 changes: 0 additions & 10 deletions source/Images/seiva/graphic3.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic4.png
Diff not rendered.
7 changes: 0 additions & 7 deletions source/Images/seiva/graphic4.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic5.png
Diff not rendered.
7 changes: 0 additions & 7 deletions source/Images/seiva/graphic5.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic6.png
Diff not rendered.
58 changes: 0 additions & 58 deletions source/Images/seiva/graphic6.svg
Diff not rendered.
Binary file removed source/Images/seiva/graphic7.png
Diff not rendered.
Binary file removed source/Images/seiva/gridcoin_explaination.png
Diff not rendered.
Binary file removed source/Images/setibzh.png
Diff not rendered.
Binary file removed source/Images/space.jpg
Diff not rendered.
Binary file removed source/Images/space2.jpg
Diff not rendered.
Binary file removed source/Images/stats.jpg
Diff not rendered.
Binary file removed source/Images/stats2.jpg
Diff not rendered.
Binary file removed source/Images/test.jpg
Diff not rendered.
Binary file removed source/Images/tester.png
Diff not rendered.
Binary file removed source/Images/thinlogo.png
Diff not rendered.
Binary file removed source/Images/twitter.png
Diff not rendered.
Binary file removed source/Images/wallet.png
Diff not rendered.
Binary file removed source/Images/who.jpg
Diff not rendered.
4 changes: 2 additions & 2 deletions source/assets/css/table.css
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ tbody {
}

td a:link, td a:visited, td a:active {
color: #7d00f4 !important;
color: #FFFFFF !important;
}

td a:hover {
color: #93aa4f !important;
}

th {
color: #7d00f4;
color: #FFFFFF;
border-bottom-color: #434343 !important;
}

0 comments on commit 29f8ec6

Please sign in to comment.