Merge remote-tracking branch 'upstream/master'

merge after build
This commit is contained in:
Madeleine Shang 2017-02-11 05:35:26 +00:00
commit bd00ea0383
431 changed files with 267 additions and 200 deletions

View file

@ -290,7 +290,7 @@
title: FrontEnd Developer
description: prtfw is a reformed ex-VC and Financier turned coder, Startup + FinTech Pro, usually hacking on AI/Machine-Learning projects, pilot, adventurer, polymath + nomad with mild ADHD
image: prtfw.png
email: maddie@dash.org
email: mns_catdogmice@yahoo.ca
keybase: https://keybase.io/longgamma_act
twitter:

View file

@ -182,88 +182,88 @@
label: PGP
url: "/binaries/dashcore-0.12.1.0-RPi2.tar.gz.asc"
- name: Dash Electrum 32/64bit
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: linux
type: desktop
vendor_id: electrum
vendor_label: Electrum
control_type: full
validation_type: spv
access_type: multi
product_id: dash_electrum
product_label: Dash Electrum
product_website_label: Electrum-Dash.org
product_website_url: "https://electrum-dash.org/"
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download PKG
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: linux
# type: desktop
# vendor_id: electrum
# vendor_label: Electrum
# control_type: full
# validation_type: spv
# access_type: multi
# product_id: dash_electrum
# product_label: Dash Electrum
# product_website_label: Electrum-Dash.org
# product_website_url: "https://electrum-dash.org/"
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download PKG
# url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
- name: Dash Electrum 32/64bit
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: win32
type: desktop
vendor_id: dash_core
vendor_label: Dash Core
control_type: full
validation_type: spv
access_type: multi
product_id: dash_electrum
product_label: Dash Electrum
product_website_label: Electrum-Dash.org
product_website_url: "https://electrum-dash.org/"
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: win32
# type: desktop
# vendor_id: dash_core
# vendor_label: Dash Core
# control_type: full
# validation_type: spv
# access_type: multi
# product_id: dash_electrum
# product_label: Dash Electrum
# product_website_label: Electrum-Dash.org
# product_website_url: "https://electrum-dash.org/"
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
- name: Dash Electrum 32/64bit
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: win64
type: desktop
vendor_id: dash_core
vendor_label: Dash Core
control_type: full
validation_type: spv
access_type: multi
product_id: dash_electrum
product_label: Dash Electrum
product_website_label: Electrum-Dash.org
product_website_url: "https://electrum-dash.org/"
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: win64
# type: desktop
# vendor_id: dash_core
# vendor_label: Dash Core
# control_type: full
# validation_type: spv
# access_type: multi
# product_id: dash_electrum
# product_label: Dash Electrum
# product_website_label: Electrum-Dash.org
# product_website_url: "https://electrum-dash.org/"
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
- name: Jaxx
description: |
All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
logo_url: "https://jaxx.io/images/favicon.ico"
logo_url: "/assets/img/wallets/jaxx-logo.ico"
os: linux
type: desktop
vendor_id: jaxx
@ -282,7 +282,7 @@
- name: Jaxx
description: |
All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
logo_url: "https://jaxx.io/images/favicon.ico"
logo_url: "/assets/img/wallets/jaxx-logo.ico"
os: win32
type: desktop
vendor_id: jaxx
@ -301,7 +301,7 @@
- name: Jaxx
description: |
All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
logo_url: "https://jaxx.io/images/favicon.ico"
logo_url: "/assets/img/wallets/jaxx-logo.ico"
os: win64
type: desktop
vendor_id: jaxx
@ -341,34 +341,34 @@
label: PGP
url: "/binaries/dashcore-0.12.1.0-osx.dmg.asc"
- name: Dash Electrum
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: osx
type: desktop
vendor_id: dash_core
vendor_label: Dash Core
control_type: full
validation_type: full
access_type: p2p
product_id: dash_electrum
product_label: Dash Electrum
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download PKG
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc"
#- name: Dash Electrum
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: osx
# type: desktop
# vendor_id: dash_core
# vendor_label: Dash Core
# control_type: full
# validation_type: full
# access_type: p2p
# product_id: dash_electrum
# product_label: Dash Electrum
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download PKG
# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc"
- name: Jaxx
description: |
All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
logo_url: "https://jaxx.io/images/favicon.ico"
logo_url: "/assets/img/wallets/jaxx-logo.ico"
os: osx
type: desktop
vendor_id: jaxx
@ -403,7 +403,7 @@
type: mobile
vendor_id: hash_engineering_solutions
vendor_label: Hash Engineering Solutions
control_type: semi
control_type: full
validation_type: hosted
access_type: vendor
product_id: dash_android_wallet
@ -452,7 +452,7 @@
Jaxx Blockchain Interface & Wallet
</p>
All keys are created on your local device and never sent to any servers. This means you have full control of your wallet and Jaxx neither holds nor has access to your funds.
logo_url: "https://jaxx.io/images/favicon.ico"
logo_url: "/assets/img/wallets/jaxx-logo.ico"
os: android
type: mobile
vendor_id: jaxx