Merge branch 'master' of https://github.com/dashpay/dash-website

README.md

@@ -106,3 +106,10 @@ image: /assets/images/2016/05/Node40-banner.jpg
 title: New website for Node40
 description: Check out the new website for Node40
 ```
+
+###Blog Post Images
+Image paths for blogs are currently relative to /{language}/assets/img/blog by default. If we replaced the image path from the front matter above with:
+```
+	image: MyImage.jpg
+```
+... will look for `"MyImage.jpg"` in the `/assets/img/blog` folder. 

_i18n/en.yml

@@ -126,9 +126,11 @@ pages:
     video-text: The first area of progress is Dash Core. In addition to running the network at present, Dash Core also serves as the backbone of the Evolution engine.
     video-btn: Overview Video
 
-    merchants-heading: WooCommerce Integration
-    merchants-text: Download Plugin for WooCommerce Wordpress and start using Digital Cash!
-    merchants-btn: Get Plugin
+    merchants-heading: Please check for your mandatory update details
+    merchants-text: All Miners, Pools, Wallets, Exchnanes , Merchants ... are required to update
+    merchants-btn: Pools
+    masternodes-btn: Masternodes
+    exchanges-btn: Exchanges
 
     integrate-heading: Dash Evolution Progress
     integrate-text: Sentinel can also be re-geared and deployed to operate digital companies that have a built-in workforce, infrastructure to deploy again, and as an engine for storage and retrieval of information.
@@ -136,15 +138,14 @@ pages:
     slack-btn: Slack Chanel
     forum-btn: Dash Forums
 
-    execution-heading: STRATEGIC EXECUTION
+    execution-heading: What is Evolution
     execution-text:
-      Ryan Taylor, Dash’s CFO, has coordinated a deal with Arizona State University’s SkySong incubator, allowing us access to their top tier facility in Tempe, Arizona.
+      Dash Evolution creates a new type of cryptographic currency with various advanced features that assist in the creation of decentralized technology. Dash introduces a tiered network design, which allows users to do various jobs for the network, along with decentralized API access and a decentralized file system.
 
 
-      There are 29 fast-growing, innovative startups sharing this location, and we look forward to talking with many of them. We also look forward to hiring exceptional talent from the University.
 
     execution-btn: Learn More
-    execution-link: https://www.dash.org/forum/threads/january-2017-budget-report.12601/
+    execution-link: https://dashpay.atlassian.net/wiki/display/DOC/Evolution
 
     update-heading: Sentinel
     update-text:

_i18n/pt/_posts/2017-02-01-copaypt.md

@@ -1,7 +1,7 @@
 ---
 author: tungfa
 layout: post
-image: 
+image: #CoPayWalletcopy.jpg #not currently working with language posts. Needs resolution.
 title: "Copay-Dash Wallet (Testnet só / RC 0.1)"
 ---
 Estou feliz em anunciar uma versão “Release Candidate” da Copay-Dash, uma carteira Copay que foi desenvolvida pela Bitpay.

_includes/hero/wallets.html

@@ -15,9 +15,9 @@
 		<h1 class="hero__title">{% t pages.wallets.hero-heading %}</h1>
 
 		<div class="hero__buttons">
-			<a href="#" class="btn-white-solid">{% t pages.wallets.hero-wallets-btn %}</a>
-			<a href="#" class="btn-white-solid">{% t pages.wallets.hero-guide-btn %}</a>
-			<a href="#" class="btn-white-solid">{% t pages.wallets.hero-security-btn %}</a>
+			<a href="#wallets" class="btn-white-solid">{% t pages.wallets.hero-wallets-btn %}</a>
+			<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146941" target="_blank" class="btn-white-solid">{% t pages.wallets.hero-guide-btn %}</a>
+			<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=31326247" target="_blank" class="btn-white-solid">{% t pages.wallets.hero-security-btn %}</a>
 		</div>
 	</div>
 

_posts/README.md

@@ -5,4 +5,29 @@ Where YEAR is a four-digit number, MONTH and DAY are both two-digit numbers, and
 
 2011-12-31-new-years-eve-is-awesome.md
 2011-12-31-new-years-eve-is-awesome.html
-2012-09-12-how-to-write-a-blog.textile
+2012-09-12-how-to-write-a-blog.textile
+
+## Writing a Blog Post
+Blog posts can be written in MarkDown (*.md) or HTML (*.html).
+
+Posts need to be saved in the `_posts` directory and the filename must always start with YYYY-MM-DD-
+
+For example: `2016-05-12-new-website.md`
+
+###Front matter
+The top page of every post should contain the following (Example):
+```
+author: perry
+layout: post
+image: Node40-banner.jpg
+title: New website for Node40
+description: Check out the new website for Node40
+```
+
+###Blog Post Images
+Image paths for blogs are currently relative to {language}/assets/img/blog by default. If we replaced the image path from the front matter above with:
+```
+	image: MyImage.jpg
+```
+... will look for `"MyImage.jpg"` in the `/{language}/assets/img/blog` folder. 
+

assets/img/update/.BridgeSort

@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>
+<dirinfo>
+<files>
+<item key='Amanda.png20170131210651' />
+<item key='backend.png20170131210651' />
+<item key='bg1.png20170131210651' />
+<item key='bg2.png20170131210651' />
+<item key='bg3.png20170131210651' />
+<item key='bravenewbooks_logo.png20170131210651' />
+<item key='budget.png20170131210651' />
+<item key='coaex_logo.png20170131210651' />
+<item key='code.png20170131210651' />
+<item key='evo.png20170131210651' />
+<item key='execution.png20170131210651' />
+<item key='frontend.png20170131210651' />
+<item key='giftoff_logo.png20170131210651' />
+<item key='interview.jpg20170131210651' />
+<item key='isg3d_logo.png20170131210651' />
+<item key='lan_date.png20170131210651' />
+<item key='network.png20170131210651' />
+<item key='newsimage.png20170131210651' />
+<item key='overview.jpg20170131210651' />
+<item key='qhoster.png20170131210651' />
+<item key='research.png20170202145519' />
+<item key='strategic.jpg20170131210651' />
+<item key='strategic.png20170131210651' />
+<item key='strategy.png20170131210651' />
+<item key='update.png20170131210651' />
+<item key='updateevo.png20170131210651' />
+<item key='woocommerce.png20170131210651' />
+</files>
+</dirinfo>

wallets/index.html

@@ -24,7 +24,7 @@ description: pages.wallets.description
 <div class="page page--wallets">
   <section class="section">
     <div class="section__content">
-      <h3>{% t pages.wallets.wallets-desktop-header %}</h3>
+      <h3 id="wallets">{% t pages.wallets.wallets-desktop-header %}</h3>
       <p>{% t pages.wallets.wallets-desktop-subtitle %}</p>
       <ul id="wallet-os-tabs" class="nav2 nav-tabs">
         {% for os-sequence in desktop-os-order-list %}