Merge remote-tracking branch 'dashpay/master'

This commit is contained in:
tungfa 2017-02-06 21:30:44 +08:00
commit 7da309a2f1
5 changed files with 10 additions and 22 deletions

View file

@ -45,7 +45,7 @@
- name: Chae-Pil Lim
title: Core Development
description: Chaep-pil(AKA "chaeplin") has a degree in electronic engineering and over 15 years experience as a networkwork engineer.
description: Chaep-pil(AKA \"chaeplin\") has a degree in electronic engineering and over 15 years experience as a networkwork engineer.
image: chaeplin.jpeg
email: chaeplin@gmail.com
keybase: https://keybase.io/chaeplin
@ -88,7 +88,7 @@
- name: Jon Kindel
title: Evolution Backend Lead
description: Jon (AKA "snogcel") has a degree in Information Systems with 3 years experience in project management and 10+ years in web development including HTML, PHP, CSS, NodeJS and JavaScript.
description: Jon (AKA \"snogcel\") has a degree in Information Systems with 3 years experience in project management and 10+ years in web development including HTML, PHP, CSS, NodeJS and JavaScript.
image: jon.png
email: jon@dash.org
keybase: https://keybase.io/snogcel
@ -97,7 +97,7 @@
- name: Cofresi
title: Evolution Backend Developer
description: While his academic background is in Chinese Studies, Political Science and International Law, "Cofresi" has been working for 15 years with different technologies in the telecom industry as a systems administrator and webmaster, for the most part concentrating on client/server backends and database administration.
description: While his academic background is in Chinese Studies, Political Science and International Law, \"Cofresi\" has been working for 15 years with different technologies in the telecom industry as a systems administrator and webmaster, for the most part concentrating on client/server backends and database administration.
image: cofresi.png
email: cofresi888@gmail.com
keybase: https://keybase.io/cofresi
@ -105,7 +105,7 @@
- name: Alex Werner
title: Evolution Backend Developer
description: While his academic background is in Chinese Studies, Political Science and International Law, "Cofresi" has been working for 15 years with different technologies in the telecom industry as a systems administrator and webmaster, for the most part concentrating on client/server backends and database administration.
description: While his academic background is in Chinese Studies, Political Science and International Law, \"Cofresi\" has been working for 15 years with different technologies in the telecom industry as a systems administrator and webmaster, for the most part concentrating on client/server backends and database administration.
image: alex_werner.png
email: alex@werner.fr
keybase: https://keybase.io/awerner
@ -113,7 +113,7 @@
- name: 0xfff
title: Evolution Frontend Developer
description: \"0xfff\" is a frontend-developer and designer. With a background in both Design and Computer Science he's able to deliver the whole process. From concept to design to implementation. He brings 5 years of experience doing work in an agency context and later as a freelancer."
description: \"0xfff\" is a frontend-developer and designer. With a background in both Design and Computer Science he's able to deliver the whole process. From concept to design to implementation. He brings 5 years of experience doing work in an agency context and later as a freelancer.
image: anon.png
email: 0xfff@protonmail.com
keybase: https://keybase.io/0xfff
@ -171,7 +171,7 @@
- name: Philipp Engelhorn
title: Press & Multitool
description: Philipp (AKA "tungfa") is a freelance photographer who brings 20 years of press, magazine & newspaper, promotion, design, social media and communications experience to the team. He is located in Asia
description: Philipp (AKA \"tungfa\") is a freelance photographer who brings 20 years of press, magazine & newspaper, promotion, design, social media and communications experience to the team. He is located in Asia
image: philipp.png
email: press@dash.org
keybase: https://keybase.io/tungfa
@ -296,7 +296,7 @@
- name: Perry Woodin
title: Advisor
description: Co-founder of <a href="https://node40.com" target="_blank">Node40</a>
description: Co-founder of <a href=\"https://node40.com\" target=\"_blank\">Node40</a>
image: perry_sm.jpg
email: perry@node40.com
keybase: https://keybase.io/perrywoodin

View file

@ -491,7 +491,7 @@
- name: Exodus
description: Exodus is the first desktop multi-asset wallet with ShapeShift built in. Exodus encrypts private keys and transaction data locally for your eyes only - no accounts, no servers, no data sharing. Track the value of your blockchain asset portfolio, in real time, as market conditions change.
logo_url: "https://www.exodus.io/favicon.ico"
logo_url: "/assets/img/wallets/exodus.png"
os: osx
type: desktop
vendor_id: exodus

View file

@ -242,7 +242,7 @@ pages:
wallets-security-header: Security
modal-platform: Platform
wallets-security-subtitle: Please secure your wallets by protecting them with strong, difficult-to-guess passwords and by backing them up in a secure place. If your funds are lost or stolen, there is no way to recover them without a backup. If using a hardware and online Wallets, please secure your "seeds" just as you would a regular wallet password. They are the only way to recover your wallet. (Very helpful apps for Password/Seed security are <http://keepass.info> and others)
wallets-security-subtitle: Please secure your wallets by protecting them with strong, difficult-to-guess passwords and by backing them up in a secure place. Always chose to encrypt your wallet and any backups, because if your funds are lost or stolen, there is no way to recover them. If using an HD wallet such as a hardware or paper wallet, please secure your "seeds" just as you would a regular wallet password. They are the only way to recover your wallet. For help on securing passowrds, visit
modal-header-vendor-label-descriptor: Wallet for Dash
modal-download-action-button-label: Download
modal-source-code-view: View

View file

@ -36,17 +36,5 @@ description: pages.team.description
</ul>
</div>
<!--
<div class="section__content content">
<div>
<h2 class="section__title">{% t pages.community.social-heading %}</h2>
</div>
<ul class="member-list">
{% for member in site.data.team %}
{% include member-list.html %}
{% endfor %}
</ul>
</div>
-->
</section>
</div>

View file

@ -26,7 +26,7 @@ description: pages.wallets.description
<section class="section clearfix">
<div class="section__content">
<h3>{% t pages.wallets.wallets-security-header %}</h3>
<p>{% t pages.wallets.wallets-security-subtitle %}</p>
<p>{% t pages.wallets.wallets-security-subtitle %} <a href="http://keepass.info/" target="_blank">keepass.info</a></p>
<div class="row">
{% for wallet in security-wallets %}
{% include wallet-tile.html %}