mirror of
https://github.com/seigler/dash-website
synced 2025-07-27 15:26:09 +00:00
Merge remote-tracking branch 'dashpay/master'
This commit is contained in:
tungfa
commit
75ab81c207
9 changed files with 146 additions and 330 deletions
|
|
@ -13,16 +13,16 @@
|
||||||
product_website_url: "https://www.dash.org"
|
product_website_url: "https://www.dash.org"
|
||||||
product_source_label: Github
|
product_source_label: Github
|
||||||
product_source_url: "https://github.com/dashpay/dash"
|
product_source_url: "https://github.com/dashpay/dash"
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download Installer
|
label: Download Installer
|
||||||
url: "/binaries/dash-0.12.1.0-win32-setup.exe"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-win32-setup.exe.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-win32-setup.exe.asc"
|
||||||
|
|
||||||
- name: "Dash Core Win/32 ZIP"
|
- name: "Dash Core Win/32 ZIP"
|
||||||
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
||||||
|
|
@ -42,13 +42,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download ZIP
|
label: Download ZIP
|
||||||
url: "/binaries/dash-0.12.1.0-win32.zip"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-win32.zip.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip.asc"
|
||||||
|
|
||||||
- name: "Dash Core Win/64 Installer"
|
- name: "Dash Core Win/64 Installer"
|
||||||
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
||||||
|
|
@ -68,13 +68,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download Installer
|
label: Download Installer
|
||||||
url: "/binaries/dash-0.12.1.0-win64-setup.exe"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-win64-setup.exe.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-win64-setup.exe.asc"
|
||||||
|
|
||||||
- name: Dash Core Win/64 ZIP
|
- name: Dash Core Win/64 ZIP
|
||||||
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
||||||
|
|
@ -94,13 +94,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download ZIP
|
label: Download ZIP
|
||||||
url: "/binaries/dash-0.12.1.0-win64.zip"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-win32.zip.asc"
|
||||||
-
|
-
|
||||||
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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-win64.zip.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-win64.zip.asc"
|
||||||
|
|
||||||
|
|
||||||
- name: Dash Core Linux 32 Bit
|
- name: Dash Core Linux 32 Bit
|
||||||
|
|
@ -121,13 +121,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download TGZ
|
label: Download TGZ
|
||||||
url: "/binaries/dash-0.12.1.0-linux32.tar.gz"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-linux32.tar.gz.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-linux32.tar.gz.asc"
|
||||||
|
|
||||||
- name: Dash Core Linux 64 Bit
|
- name: Dash Core Linux 64 Bit
|
||||||
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
||||||
|
|
@ -147,13 +147,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download TGZ
|
label: Download TGZ
|
||||||
url: "/binaries/dash-0.12.1.0-linux64.tar.gz"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-linux64.tar.gz.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-linux64.tar.gz.asc"
|
||||||
|
|
||||||
- name: Dash Core Raspberry Pi 2
|
- name: Dash Core Raspberry Pi 2
|
||||||
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
description: Dash Core QT Wallet (All Features incl IS, PS, ....)
|
||||||
|
|
@ -173,13 +173,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download TGZ
|
label: Download TGZ
|
||||||
url: "/binaries/dash-0.12.1.0-RPi2.tar.gz"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/dash-0.12.1.0-RPi2.tar.gz.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-RPi2.tar.gz.asc"
|
||||||
|
|
||||||
- name: Dash Electrum 32/64bit
|
- name: Dash Electrum 32/64bit
|
||||||
description: Dash Core "Light" Wallet (No Features)
|
description: Dash Core "Light" Wallet (No Features)
|
||||||
|
|
@ -202,10 +202,10 @@
|
||||||
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin"
|
||||||
-
|
-
|
||||||
label: Hash File
|
label: Hash File
|
||||||
url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
|
||||||
|
|
||||||
- name: Dash Electrum 32/64bit
|
- name: Dash Electrum 32/64bit
|
||||||
description: Dash Core "Light" Wallet (No Features)
|
description: Dash Core "Light" Wallet (No Features)
|
||||||
|
|
@ -225,13 +225,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download
|
label: Download
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
|
||||||
-
|
-
|
||||||
label: Hash File
|
label: Hash File
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
|
||||||
|
|
||||||
- name: Dash Electrum 32/64bit
|
- name: Dash Electrum 32/64bit
|
||||||
description: Dash Core "Light" Wallet (No Features)
|
description: Dash Core "Light" Wallet (No Features)
|
||||||
|
|
@ -251,13 +251,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download
|
label: Download
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
|
||||||
-
|
-
|
||||||
label: Hash File
|
label: Hash File
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
|
||||||
|
|
||||||
- name: Jaxx
|
- name: Jaxx
|
||||||
description: |
|
description: |
|
||||||
|
|
@ -332,13 +332,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download DMG
|
label: Download DMG
|
||||||
url: "/binaries/dash-0.12.1.0-osx.dmg"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-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.0.58/SHA256SUMS.asc"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: pgp
|
||||||
url: "/binaries/dash-0.12.1.0-osx.dmg.asc"
|
url: "https://www.dash.org/binaries/dash-0.12.0.58-osx.dmg.asc"
|
||||||
|
|
||||||
- name: Dash Electrum
|
- name: Dash Electrum
|
||||||
description: Dash Core "Light" Wallet (No Features incl IS, PS, ....)
|
description: Dash Core "Light" Wallet (No Features incl IS, PS, ....)
|
||||||
|
|
@ -356,13 +356,13 @@
|
||||||
links:
|
links:
|
||||||
-
|
-
|
||||||
label: Download PKG
|
label: Download PKG
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Installer.pkg"
|
||||||
-
|
-
|
||||||
label: Hash File
|
label: Hash File
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt"
|
||||||
-
|
-
|
||||||
label: PGP
|
label: PGP
|
||||||
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc"
|
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc"
|
||||||
|
|
||||||
- name: Jaxx
|
- name: Jaxx
|
||||||
description: |
|
description: |
|
||||||
|
|
|
||||||
|
|
@ -132,11 +132,9 @@ pages:
|
||||||
masternodes-btn: Masternodes
|
masternodes-btn: Masternodes
|
||||||
exchanges-btn: Exchanges
|
exchanges-btn: Exchanges
|
||||||
|
|
||||||
integrate-heading: Dash Evolution Progress
|
proposal-heading: Proposal Automated Service
|
||||||
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.
|
proposal-text:
|
||||||
|
proposal-btn: Learn more
|
||||||
slack-btn: Slack Chanel
|
|
||||||
forum-btn: Dash Forums
|
|
||||||
|
|
||||||
execution-heading: What is Evolution
|
execution-heading: What is Evolution
|
||||||
execution-text:
|
execution-text:
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
<p class="hero__lead">{% t pages.evolution.hero-text %}</p>
|
<p class="hero__lead">{% t pages.evolution.hero-text %}</p>
|
||||||
|
|
||||||
<div class="hero__buttons">
|
<div class="hero__buttons">
|
||||||
<a href="{{basenav}}/get-dash/" class="btn-blue-solid btn-large">{% 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}}/get-dash/" 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>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
<div class="hero" id="hero">
|
<div class="hero hero--home" id="hero">
|
||||||
<div class="hero__background">
|
<div class="hero__background">
|
||||||
{% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %}
|
{% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %}
|
||||||
{% srcset_source width:1920 %}
|
{% srcset_source width:1920 %}
|
||||||
|
|
|
||||||
BIN
assets/img/update/Voting.png
Normal file
BIN
assets/img/update/Voting.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 323 KiB |
|
|
@ -20,7 +20,7 @@ description: pages.contact.description
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="section section--cta section--colored">
|
<section id="mailing" class="section section--cta section--colored">
|
||||||
<div class="section__content">
|
<div class="section__content">
|
||||||
|
|
||||||
<h3>{% t pages.contact.mail-list-heading %}</h3>
|
<h3>{% t pages.contact.mail-list-heading %}</h3>
|
||||||
|
|
|
||||||
|
|
@ -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="{{ basenav }}/get-dash/" class="btn-blue-solid btn-large">{% 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>
|
||||||
|
|
@ -42,118 +42,6 @@ description: pages.evolution.description
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!--
|
|
||||||
COMPONENTS
|
|
||||||
-->
|
|
||||||
<section>
|
|
||||||
<div class="content">
|
|
||||||
<div>
|
|
||||||
<h2>{% t pages.evolution.component-heading %}</h2>
|
|
||||||
|
|
||||||
{% tmd pages.evolution.component-text %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="ctabox ctabox_small-font ctabox--gray-light-bg" data-js-ctabox>
|
|
||||||
<div class="ctabox__inner">
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://shakepay.co" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/network.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">DashDrive</h4>
|
|
||||||
<p class="ctabox__description">A decentralized shared file system that lives on the second tier network</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://www.livingroomofsatoshi.com/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/update.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">DAPI</h4>
|
|
||||||
<p class="ctabox__description">A decentralized API which allows third tier users to access the network securely</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://www.bolehvpn.net/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/frontend.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">DashPay Decentralized Wallets</h4>
|
|
||||||
<p class="ctabox__description">These wallets are light clients connected to the network via DAPI and run on various platforms</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://node40.com" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/backend.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">Second Tier</h4>
|
|
||||||
<p class="ctabox__description">The masternode network, which provides compensated infrastructure for the project</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://shapeshift.io" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/code.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title"> Budgets</h4>
|
|
||||||
<p class="ctabox__description">The second tier is given voting power to allocate funds for specific projects on the network via the budget system</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">Governance</h4>
|
|
||||||
<p class="ctabox__description">The second tier is given voting power to govern the currency and chart the course the currency takes</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">Quorum Chain</h4>
|
|
||||||
<p class="ctabox__description">This feature introduces a permanent stable masternode list, which can be used to calculate past and present quorums</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">Social Wallet</h4>
|
|
||||||
<p class="ctabox__description">We introduce a social wallet, which allows friends lists, grouping of users and shared multisig accounts.</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<a href="/merchants/" target="_blank" class="btn-blue">{% t pages.evolution.slack-btn %}</a>
|
|
||||||
<a href="{% t pages.home.merchants-link %}" target="_blank" class="btn-blue">{% t pages.evolution.forum-btn %}</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
|
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
NETWORK ARCHITECTURE
|
NETWORK ARCHITECTURE
|
||||||
-->
|
-->
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ description: pages.currency.description
|
||||||
<a href="http://dashvotetracker.com/" target="_blank" class="btn-blue-solid">DashVoteTracker</a>
|
<a href="http://dashvotetracker.com/" target="_blank" class="btn-blue-solid">DashVoteTracker</a>
|
||||||
<a href="https://www.dashcentral.org/" target="_blank" class="btn-blue-solid">DashCentral</a>
|
<a href="https://www.dashcentral.org/" target="_blank" class="btn-blue-solid">DashCentral</a>
|
||||||
<a href="https://www.dashninja.pl/budgets.html" target="_blank" class="btn-blue-solid">DashNinja</a>
|
<a href="https://www.dashninja.pl/budgets.html" target="_blank" class="btn-blue-solid">DashNinja</a>
|
||||||
|
<a href="http://govobject-proposal.slayer.work/" target="_blank" class="btn-blue-solid">Proposal Generator</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<table id="budgets">
|
<table id="budgets">
|
||||||
|
|
|
||||||
|
|
@ -46,90 +46,19 @@ description: pages.update.description
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
INTEGRATION
|
PROPOSAL
|
||||||
-->
|
-->
|
||||||
<section>
|
<section>
|
||||||
<div class="content">
|
<div class="content">
|
||||||
<div>
|
<div>
|
||||||
<h2>{% t pages.update.integrate-heading %}</h2>
|
<h2>{% t pages.update.proposal-heading %}</h2>
|
||||||
|
<img src="/assets/img/update/Voting.png" alt="">
|
||||||
{% tmd pages.update.integrate-text %}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="ctabox ctabox_small-font ctabox--gray-light-bg" data-js-ctabox>
|
|
||||||
<div class="ctabox__inner">
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://shakepay.co" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/network.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">EVOLUTION</h4>
|
|
||||||
<p class="ctabox__description">Lead evolution developer Andy Freer has been locked away producing huge amounts of documentation for the various concepts of Evolution.</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://www.livingroomofsatoshi.com/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/update.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">RESEARCH</h4>
|
|
||||||
<p class="ctabox__description">In January 2016 we released an early Evolution prototype based on Electrum which enabled basic functions such as registering a username and paying friends by name.</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://www.bolehvpn.net/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/frontend.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">FRONTEND</h4>
|
|
||||||
<p class="ctabox__description">The 3 main areas of frontend design and development have been to design a secure, SPV based Web Wallet, merchant tools to enable drag-and-drop checkout on a website, and an SDK that connects web clients to DAPI.</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://node40.com" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/backend.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">BACKEND</h4>
|
|
||||||
<p class="ctabox__description">The first has been to port BitPay’s Bitcore Platform to Dash including merging Bitcore Node to DashCore 12.1 for native API support.</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://shapeshift.io" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/code.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title"> CORE</h4>
|
|
||||||
<p class="ctabox__description">Evolution Core work has been focused on first providing a basis to the new system in the form of Sentinel and improving DashCore to be implementation-agnostic to governance functions and objects.</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
<article class="ctabox__cta" data-js-ctabox-item>
|
|
||||||
<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
|
|
||||||
<div class="ctabox__imagewrapper">
|
|
||||||
<img src="/assets/img/update/netw.png" class="ctabox__image">
|
|
||||||
</div>
|
|
||||||
<div class="ctabox__text">
|
|
||||||
<h4 class="ctabox__title">NETWORK</h4>
|
|
||||||
<p class="ctabox__description">Enforcement will be turned off for this network upgrade, meaning nodes running the old version of the Dash software (12.0) will quickly stop being paid (contingent on miners upgrading).</p>
|
|
||||||
</div>
|
|
||||||
</a>
|
|
||||||
</article>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<a href="http://dash-nation-invite.herokuapp.com/" target="_blank" class="btn-blue">{% t pages.update.slack-btn %}</a>
|
<a href="http://govobject-proposal.slayer.work/" target="_blank" class="btn-blue">{% t pages.update.proposal-btn %}</a>
|
||||||
<a href="https://www.dash.org/forum" target="_blank" class="btn-blue">{% t pages.update.forum-btn %}</a>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue