Merge remote-tracking branch 'upstream/master'

final merge before PR
This commit is contained in:
Madeleine Shang 2017-02-06 01:42:30 +00:00
commit ace9a7702d
9 changed files with 170 additions and 173 deletions

View file

@ -21,7 +21,7 @@ description: Digital Cash
url: https://www.dash.org url: https://www.dash.org
api: http://www-test.dash.org/api/v1 api: /api/v1
languages: ["en", "es", "cn", "pt", "ru", "it"] languages: ["en", "es", "cn", "pt", "ru", "it"]
exclude_from_localizations: ["assets","dist","style-guide"] exclude_from_localizations: ["assets","dist","style-guide"]

View file

@ -16,13 +16,13 @@
links: links:
- -
label: Download Installer label: Download Installer
url: "/binaries/dash-0.12.1.0-win64-setup.exe" url: "/binaries/dashcore-0.12.1.0-win64-setup.exe"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-win64-setup.exe.asc" url: "/binaries/dashcore-0.12.1.0-win64-setup.exe.asc"
- name: Dash Core Win/64 ZIP - name: Dash Core Win/64 ZIP
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -42,13 +42,13 @@
links: links:
- -
label: Download ZIP label: Download ZIP
url: "/binaries/dash-0.12.1.0-win64.zip" url: "/binaries/dashcore-0.12.1.0-win64.zip"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-win64.zip.asc" url: "/binaries/dashcore-0.12.1.0-win64.zip.asc"
- name: "Dash Core Win/32 Installer" - name: "Dash Core Win/32 Installer"
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -68,13 +68,13 @@
links: links:
- -
label: Download Installer label: Download Installer
url: "/binaries/dash-0.12.1.0-win32-setup.exe" url: "/binaries/dashcore-0.12.1.0-win32-setup.exe"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-win32-setup.exe.asc" url: "/binaries/dashcore-0.12.1.0-win32-setup.exe.asc"
- name: "Dash Core Win/32 ZIP" - name: "Dash Core Win/32 ZIP"
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -94,13 +94,13 @@
links: links:
- -
label: Download ZIP label: Download ZIP
url: "/binaries/dash-0.12.1.0-win32.zip" url: "/binaries/dashcore-0.12.1.0-win32.zip"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-win32.zip.asc" url: "/binaries/dashcore-0.12.1.0-win32.zip.asc"
- name: Dash Core Linux 32 Bit - name: Dash Core Linux 32 Bit
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -122,13 +122,13 @@
links: links:
- -
label: Download TGZ label: Download TGZ
url: "/binaries/dash-0.12.1.0-linux32.tar.gz" url: "/binaries/dashcore-0.12.1.0-linux32.tar.gz"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-linux32.tar.gz.asc" url: "/binaries/dashcore-0.12.1.0-linux32.tar.gz.asc"
- name: Dash Core Linux 64 Bit - name: Dash Core Linux 64 Bit
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -148,13 +148,13 @@
links: links:
- -
label: Download TGZ label: Download TGZ
url: "/binaries/dash-0.12.1.0-linux64.tar.gz" url: "/binaries/dashcore-0.12.1.0-linux64.tar.gz"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-linux64.tar.gz.asc" url: "/binaries/dashcore-0.12.1.0-linux64.tar.gz.asc"
- name: Dash Core Raspberry Pi 2 - name: Dash Core Raspberry Pi 2
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -174,13 +174,13 @@
links: links:
- -
label: Download TGZ label: Download TGZ
url: "/binaries/dash-0.12.1.0-RPi2.tar.gz" url: "/binaries/dashcore-0.12.1.0-RPi2.tar.gz"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-RPi2.tar.gz.asc" url: "/binaries/dashcore-0.12.1.0-RPi2.tar.gz.asc"
- name: Dash Electrum 32/64bit - name: Dash Electrum 32/64bit
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
@ -333,13 +333,13 @@
links: links:
- -
label: Download DMG label: Download DMG
url: "/binaries/dash-0.12.1.0-osx.dmg" url: "/binaries/dashcore-0.12.1.0-osx.dmg"
- -
label: Hash File label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc" url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
- -
label: PGP label: PGP
url: "/binaries/dash-0.12.1.0-osx.dmg.asc" url: "/binaries/dashcore-0.12.1.0-osx.dmg.asc"
- name: Dash Electrum - name: Dash Electrum
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems. description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.

View file

@ -29,11 +29,7 @@ pages:
video-btn: Woocommerce Overview Video video-btn: Woocommerce Overview Video
install-heading: WordPress DashSetupvideo install-heading: WordPress DashSetupvideo
install-text: > install-text:
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.
install-btn: Learn More install-btn: Learn More
how-heading: How to how-heading: How to
@ -94,21 +90,22 @@ pages:
hero-image: hero-image:
hero-heading: DASH EVOLUTION hero-heading: DASH EVOLUTION
hero-text: Dash Evolution, the first cryptocurrency you can use on web and mobile without an intermediary. hero-text: A glimpse at the future of payments
hero-btn: More about Evolution hero-btn: More about Evolution
subscribe-btn: Subscribe subscribe-btn: Subscribe
video-heading: DEVELOPMENT video-heading: MISSION
video-text: 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. video-text: Evolution's mission is to make digital cash easy to use and easy to access for all users, including your grandma. Every user can setup an Account on the blockchain, add contacts and pay them by name and purchase from websites and mobile apps with a single click.
video-btn: Overview Video video-btn: Prototype Video
video-btn2: Wallet Preview
sentinel-btn: Sentinel sentinel-btn: Sentinel
slack-btn: Slack Chanel slack-btn: Slack Chanel
forum-btn: Dash Forums forum-btn: Dash Forums
evo-prototype-heading: Dash Evolution Prototype evo-prototype-heading: LITE WALLETS
evo-prototype-text: We will be writing the software for this project in stages, the first stage will take about 2 months to have a very early prototype for Dash Evolution that includes a basic implementation of DashDrive, Primitives, DAPI and a simple T3 wallet. In six to eight months, we should be entering testnet phase with most basic functionality. In 12-18 months, we plan for the first release version (a stable prototype). evo-prototype-text: Evolution introduces a new class of lite-wallet, with SPV security and browser compatibility that connects direct to our P2P network of over 4,000 nodes who get rewarded for hosting user accounts on the blockchain.
evo-prototype-btn: Dash Prototype evo-prototype-btn: Dash Prototype
slack-btn: Slack Chanel slack-btn: Slack Chanel
@ -119,9 +116,9 @@ pages:
Included below is our current work on Evolution, that adds many components such as: Included below is our current work on Evolution, that adds many components such as:
docs-heading: Evolution Documentation docs-heading: CONSUMER FRIENDLY
docs-text: The documentation below is intended to be a very early version of what were planning on implementing, however, everything is subject to change over time. These arent really intended to be whitepapers, just simple technical documents showing the design choices and structures. docs-text: In Evolution you can connect direct with merchants and get moderated refunds on all purchases or even setup auto-debits to pay subscriptions automatically. Every merchant that integrates Dash is searchable on the blockchain and you can rate purchases so the community can decide who's providing a good service or not.
docs-btn: Learn More docs-btn: Learn More
docs-link: https://www.dash.org/forum/threads/january-2017-budget-report.12601/ docs-link: https://www.dash.org/forum/threads/january-2017-budget-report.12601/
@ -134,12 +131,10 @@ pages:
proposal-btn: Proposals proposal-btn: Proposals
proposal-submit-btn: Submit a Proposal proposal-submit-btn: Submit a Proposal
prototype-heading: Evolution Prototype prototype-heading: EVOLUTION ALPHA
prototype-text: prototype-text:
Explore all of the features of the Dash Evolution prototype. Including Registration, Validation of the account, login, friending, pay-to-alias and pay-with-dash buttons. With Dash 12.1 released our next step will be an Alpha version of Evolution launched later in 2017. We will be releasing things before then including the whitepaper, so please check back here for updates and stay tuned!
We will be releasing many more documents not here yet in the near future, please keep coming back to see updates and progress of Evolution.
prototype-btn: Network Stats prototype-btn: Network Stats
explore-heading: Explore Dash explore-heading: Explore Dash
@ -152,16 +147,15 @@ pages:
subscribe-btn: Subscribe to News subscribe-btn: Subscribe to News
follow-soc-btn: Follow Twitter follow-soc-btn: Follow Twitter
merchants-heading: MERCHANTS merchants-heading: MERCHANT FRIENDLY
merchants-text: merchants-text:
Add Dash payments to your app in minutes using common web standards. Add Dash payments to your site or mobile app in minutes using a simple, decentralized API.
Forget about complex infrastructure or centralized services being needed to handle your customer's funds. Keep full control of your funds without the hassle or hidden costs of centralized payment processors. Forget about complex infrastructure or relying on 3rd parties to handle your customer's payments and build direct relationships with your customers using the blockchain.
merchants-btn: For Merchants merchants-btn: For Merchants
merchants-plugin-btn: Woocommerce Plugin merchants-plugin-btn: Woocommerce Plugin
social-heading: Dash Social social-heading: Dash Social
social-text: > social-text: >
@ -439,6 +433,7 @@ pages:
hero-map-btn: Merchants Map hero-map-btn: Merchants Map
hero-integrate-btn: Integrate Dash hero-integrate-btn: Integrate Dash
hero-getlisted-btn: Get Listed hero-getlisted-btn: Get Listed
hero-woo-btn: WooCommerce
cards-heading: Debit Cards cards-heading: Debit Cards
email-heading: Email Providers email-heading: Email Providers
vpn-heading: VPN Providers vpn-heading: VPN Providers

View file

@ -49,7 +49,7 @@
<li><a href="{{ basenav }}/team/">{% t nav.team %}</a></li> <li><a href="{{ basenav }}/team/">{% t nav.team %}</a></li>
<li><a href="{{ basenav }}/update/">{% t nav.update %}</a></li> <li><a href="{{ basenav }}/update/">{% t nav.update %}</a></li>
<li><a href="https://www.dashfoundation.io/" target="_blank">{% t nav.foundation %}</a></li> <li><a href="https://www.dashfoundation.io/" target="_blank">{% t nav.foundation %}</a></li>
<li><a href="{{ basenav }}/contact/">{% t nav.contact %}</a></li> <li><a href="mailto:contact@dash.org">{% t nav.contact %}</a></li>
</ul> </ul>
</section> </section>

View file

@ -19,7 +19,7 @@
<div class="hero__buttons"> <div class="hero__buttons">
<a href="https://dashpay.atlassian.net/wiki/x/DQBcAg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.hero-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/x/DQBcAg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.hero-btn %}</a>
<a href="{{basenav}}/contact/#mailing" class="btn-blue-solid btn-large">{% t pages.evolution.subscribe-btn %}</a> <!--a href="{{basenav}}/contact/#mailing" class="btn-blue-solid btn-large">{% t pages.evolution.subscribe-btn %}</a-->
</div> </div>
</div> </div>

View file

@ -17,6 +17,7 @@
<a href="https://www.zeemaps.com/map?group=2357566#" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-map-btn %}</a> <a href="https://www.zeemaps.com/map?group=2357566#" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-map-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/GADeAQ" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/x/GADeAQ" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a>
<a href="{{ basenav }}/woocommerce/" class="btn-white-solid">{% t pages.merchants.hero-woo-btn %}</a>
</div> </div>
</div> </div>

View file

@ -21,7 +21,7 @@ description: pages.evolution.description
<div class="section__btn-grp"> <div class="section__btn-grp">
<a href="https://www.youtube.com/watch?v=rcHC40YmS0g" class="btn-blue btn-large" target="_blank" data-js-popup="video">{% t pages.evolution.video-btn %}</a> <a href="https://www.youtube.com/watch?v=rcHC40YmS0g" class="btn-blue btn-large" target="_blank" data-js-popup="video">{% t pages.evolution.video-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/ErwxBg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.sentinel-btn %}</a> <!--a href="https://dashpay.atlassian.net/wiki/x/ErwxBg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.sentinel-btn %}</a-->
</div> </div>
</div> </div>
</section> </section>
@ -36,14 +36,38 @@ description: pages.evolution.description
{% tmd pages.evolution.evo-prototype-text %} {% tmd pages.evolution.evo-prototype-text %}
<a href="{{ basenav }}/get-dash/" class="btn-white-solid">{% t pages.evolution.evo-prototype-btn %}</a> <!--a href="{{ basenav }}/get-dash/" class="btn-white-solid">{% t pages.evolution.evo-prototype-btn %}</a-->
<div class="section__btn-grp">
<a href="https://www.youtube.com/watch?v=7J4m04Tkfb4" class="btn-blue btn-large" target="_blank" data-js-popup="video">{% t pages.evolution.video-btn2 %}</a>
</div>
<img src="/assets/img/evolution/bigwallet.png" alt=""> <img src="/assets/img/evolution/bigwallet.png" alt="">
</div> </div>
</section> </section>
<!-- <!--
NETWORK ARCHITECTURE EVOLUTION MERCHANTS
-->
<section>
<div class="content">
<div class="row">
<div class="col-sm-6">
<h2>{% t pages.evolution.merchants-heading %}</h2>
{% tmd pages.evolution.merchants-text %}
<!--a href="{{ basenav }}/network" class="btn-blue">{% t pages.evolution.merchants-btn %}</a>
<a href="{{ basenav }}/network" class="btn-blue">{% t pages.evolution.merchants-plugin-btn %}</a-->
</div>
<div class="col-sm-6 home-network-graphic-live">
<img src="/assets/img/evolution/merchants.png" alt="{% t pages.evolution.merchants-heading %}">
</div>
</div>
</div>
</section>
<!--
CONSUMERS
--> -->
<section class="section--masternode"> <section class="section--masternode">
<div class="content"> <div class="content">
@ -53,7 +77,7 @@ description: pages.evolution.description
{% tmd pages.evolution.docs-text %} {% tmd pages.evolution.docs-text %}
<a href="{% t pages.evolution.docs-link %}" target="_blank" class="btn-blue">{% t pages.evolution.docs-btn %}</a> <!--a href="{% t pages.evolution.docs-link %}" target="_blank" class="btn-blue">{% t pages.evolution.docs-btn %}</a-->
</div> </div>
<div class="col-sm-6 home-architecture-graphic"> <div class="col-sm-6 home-architecture-graphic">
<img src="/assets/img/evolution/doc.png" alt="{% t pages.evolution.docs-heading %}"> <img src="/assets/img/evolution/doc.png" alt="{% t pages.evolution.docs-heading %}">
@ -63,7 +87,7 @@ description: pages.evolution.description
</section> </section>
<!-- <!--
EVOLUTION PROTOTYPE EVOLUTION ALPHA
--> -->
<section> <section>
<div class="content"> <div class="content">
@ -73,7 +97,7 @@ description: pages.evolution.description
{% tmd pages.evolution.prototype-text %} {% tmd pages.evolution.prototype-text %}
<a href="{{ basenav }}/network" class="btn-blue">{% t pages.evolution.prototype-btn %}</a> <!--a href="{{ basenav }}/network" class="btn-blue">{% t pages.evolution.prototype-btn %}</a-->
</div> </div>
<div class="col-sm-6 home-network-graphic-live"> <div class="col-sm-6 home-network-graphic-live">
<img src="/assets/img/evolution/evo_prototype.png" alt="{% t pages.update.research-heading %}"> <img src="/assets/img/evolution/evo_prototype.png" alt="{% t pages.update.research-heading %}">
@ -82,10 +106,9 @@ description: pages.evolution.description
</div> </div>
</section> </section>
<!-- <!--
EVOLUTION EXPLORE EVOLUTION EXPLORE
-->
<section> <section>
<div class="content"> <div class="content">
<div class="row"> <div class="row">
@ -102,32 +125,10 @@ description: pages.evolution.description
</div> </div>
</div> </div>
</section> </section>
<!--
EVOLUTION MERCHANTS
--> -->
<section>
<div class="content">
<div class="row">
<div class="col-sm-6">
<h2>{% t pages.evolution.merchants-heading %}</h2>
{% tmd pages.evolution.merchants-text %}
<a href="{{ basenav }}/network" class="btn-blue">{% t pages.evolution.merchants-btn %}</a>
<a href="{{ basenav }}/network" class="btn-blue">{% t pages.evolution.merchants-plugin-btn %}</a>
</div>
<div class="col-sm-6 home-network-graphic-live">
<img src="/assets/img/evolution/merchants.png" alt="{% t pages.evolution.merchants-heading %}">
</div>
</div>
</div>
</section>
<!-- <!--
SOCIAL SOCIAL
-->
<section> <section>
<div class="content"> <div class="content">
@ -146,7 +147,7 @@ description: pages.evolution.description
</div> </div>
</div> </div>
</section> </section>
-->
<!-- <!--
LATEST NEWS LATEST NEWS
--> -->

View file

@ -38,7 +38,7 @@ description: pages.update.description
<p>{% tmd pages.update.merchants-text %}</p> <p>{% tmd pages.update.merchants-text %}</p>
<div> <div>
<a href="https://dashpay.atlassian.net/wiki/x/j5AxBg" class="btn-white-solid" target="_blank">{% t pages.update.merchants-btn%}</a> <a href="https://dashpay.atlassian.net/wiki/x/j5AxBg" class="btn-white-solid" target="_blank">{% t pages.update.merchants-btn%}</a>
<a href="https://dashpay.atlassian.net/wiki/x/sZAxBg" class="btn-white-solid" target="_blank">{% t pages.update.masternodes-btn%}</a> <a href="https://dashpay.atlassian.net/wiki/x/HJQ4Bg" class="btn-white-solid" target="_blank">{% t pages.update.masternodes-btn%}</a>
<a href="https://dashpay.atlassian.net/wiki/x/yJAxBg" class="btn-white-solid" target="_blank">{% t pages.update.exchanges-btn%}</a> <a href="https://dashpay.atlassian.net/wiki/x/yJAxBg" class="btn-white-solid" target="_blank">{% t pages.update.exchanges-btn%}</a>
</div> </div>

View file

@ -78,7 +78,7 @@ description: pages.woocommerce.description
<!-- <!--
Woocommerce setup video Woocommerce setup video
-->
<section class=""> <section class="">
<div class="content"> <div class="content">
<div class="row"> <div class="row">
@ -94,6 +94,6 @@ description: pages.woocommerce.description
</div> </div>
</div> </div>
</section> </section>
-->
</div> </div>