Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
Merge pull request #2060 from kvhnuke/devop/privacy-policy
Browse files Browse the repository at this point in the history
devop/privacy-policy
  • Loading branch information
gamalielhere authored Sep 12, 2018
2 parents b05699d + 0391387 commit 6dea0a6
Show file tree
Hide file tree
Showing 32 changed files with 36,508 additions and 8,502 deletions.
25 changes: 11 additions & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
language: node_js
cache:
directories:
- node_modules
sudo: required
dist: trusty
node_js: '8'
node_js: "8"
env: CXX=g++-4.8
addons:
apt:
sources: ubuntu-toolchain-r-test
packages: g++-4.8
before_script: npm install -g gulp
script:
- gulp prep
- gulp prep
before_deploy:
- openssl aes-256-cbc -K $encrypted_85fecf66b314_key -iv $encrypted_85fecf66b314_iv -in mew.gpg.enc -out mew.gpg -d
- mkdir deploy
- gpg --allow-secret-key-import --import mew.gpg
- gulp clean
- gulp travisZip
- |
for f in deploy/*; do
gpg --output $f.sig --detach-sig $f
done
- openssl aes-256-cbc -K $encrypted_85fecf66b314_key -iv $encrypted_85fecf66b314_iv -in mew.gpg.enc -out mew.gpg -d
- mkdir deploy
- gpg --allow-secret-key-import --import mew.gpg
- gulp clean
- gulp travisZip
- |
for f in deploy/*; do
gpg --output $f.sig --detach-sig $f
done
deploy:
provider: releases
api_key:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
### New
- Update NPM packages [#2054](https://github.com/kvhnuke/etherwallet/pull/2054)
- Add ROCK2 Fake address in darklist, add PDATA token [#2062](https://github.com/kvhnuke/etherwallet/pull/2062)
- update CARD token address [#2061](https://github.com/kvhnuke/etherwallet/pull/2061)
- Add privacy policy [#2060](https://github.com/kvhnuke/etherwallet/pull/2060)
- Add RUNE and Ecrypto tokens [#2059](https://github.com/kvhnuke/etherwallet/pull/2059)
- [EOSC] Enable ledger wallet for EOS Classic [#2056](https://github.com/kvhnuke/etherwallet/pull/2056)
- Add ROCK2(ICE ROCK MINING) token [#2053](https://github.com/kvhnuke/etherwallet/pull/2053)
Expand Down
5 changes: 5 additions & 0 deletions app/includes/footer.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@
Disclaimer
</a>
</p>
<p>
<a href="https://www.myetherwallet.com/privacy-policy.html" target="_blank">
Privacy policy
</a>
</p>

<p ng-show="showBlocks">
Latest Block#: {{currentBlockNumber}}
Expand Down
2 changes: 1 addition & 1 deletion app/layouts/phishing.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@@include( '../includes/header.tpl', { "site": "mew" } )
<section class="container" style="height: 60%; text-align: center;">
<section class="container phishing">
<h1>You've been redirected to safety!</h1>
<div id="phishingMsg">
</div>
Expand Down
210 changes: 210 additions & 0 deletions app/layouts/privacy-policy.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,210 @@
@@include( '../includes/header.tpl', { "site": "mew" } )
<section class="container privacy-policy">
<h1>PRIVACY POLICY</h1>
<p> Last updated: August 17, 2018 </p>
<div class="privacy-policy-body">
<h3>INTRODUCTION</h3>
<p>Welcome to MyEtherWallet, a free, open-source, client-side tool for interacting
with the blockchain. MyEtherWallet, Inc. values privacy and we make a
concerted effort to minimize and, to the extent possible, eliminate the
exposure of personal data during the use of our interface. MyEtherWallet
does not collect, hold, or store keys, account information, or passwords.
We do not collect data passively, do not monetize the collection of data,
and do not use your data for marketing or advertising.</p>
<p>
To the extent we collect any personal information, this privacy policy
(“Policy”) describes how MyEtherWallet collects, uses, and shares personal
information of people who visit our website (the “Site”), use our mobile
application, MEWconnect (the “App”), or otherwise use our services
(collectively, the “Services”).
</p>
<p>
This Policy applies to anyone who accesses the Services. Please read the
Policy carefully to understand our practices regarding your information
and how we will treat it. By visiting the Site, App, and/or using the
Services, you acknowledge that the collection, use, and sharing of your
information will take place as described in this Policy.
</p>
<p>
So that we are clear about the terminology we are using, when we use the
phrase “Personal Information” in this Privacy Policy, we mean information
about an individual that (either by itself or when combined with information
from other available sources) allows that individual to be identified,
including, the individual’s name, telephone number, or e-mail address.
</p>
<h3>THE BLOCKCHAIN</h3>
<p>
Due to the inherent transparency of many blockchains, including the Ethereum
Blockchain, transactions that individuals broadcast via MyEtherWallet may
be publicly accessible. This includes, but is not limited to, your public
sending address, the public address of the receiver, the amount sent or
received, and any other data a user has chosen to include in a given
transaction. Information stored on a blockchain may be public, immutable,
and difficult or even impossible to remove or delete. Transactions and
addresses may reveal information about the user’s identity and information
can potentially be correlated now or in the future by any party who chooses
to do so, including law enforcement. Users are encouraged to review how
privacy and transparency on the blockchain works.
</p>
<h3>WHAT WE COLLECT</h3>
<p>
We collect information about you as described below. We use this
information to enhance your experience with our Services.
</p>
<h5>Information You Provide</h5>
<p>
We may collect Personal Information you choose to provide to us. For
example, when you contact us for support through the Services, you give
us with your e-mail address and any other information that you choose to
provide. Also, if you participate in a MyEtherWallet offer, give-away, or
promotion (“Promotion”), you provide your name, e-mail address, and
mailing address.
</p>
<h5>California Do Not Track Disclosures</h5>
<p>
MyEtherWallet does not track users over time and across third party
websites to provide targeted advertising and therefore does not respond
to Do Not Track (DNT) signals.
</p>
<h3>USE OF INFORMATION</h3>
<p>
We use the information that we have about you to provide support and certain Services to you.
</p>
<p>
We may use the Personal Information we collect from and about you to (1)
provide you with information or services that you request from us,
including to respond to your comments, questions, and/or provide customer
service; (2) monitor and analyze usage and trends and personalize and
improve the Services and your experience using the Services; and (3)
for any other purpose with your consent.
</p>
<h3>SHARING OF PERSONAL INFORMATION</h3>
<p>
We will not disclose your Personal Information other than as described
below, and we do not and will not sell your Personal Information to anyone.
</p>
<p>
We may share the Personal Information we collect from and about you (1)
to fulfill the purpose for which you provided it; (2) with your consent;
(3) for legal, protection, and safety purposes; (4) to comply with any
court order, law, or legal process, including to respond to any government
or regulatory request; (5) to protect the rights of MyEtherWallet, our
agents, customers, and others, including by enforcing our agreements,
policies, and terms of service; and (6) with those who need it to do work
for us (our Service Providers, as defined below).
</p>
<h5>Service providers</h5>
<p>
We may contract with third parties to perform functions related to the
Services (“Service Providers”). In general, Service Providers will have
access to your Personal Information only to the extent needed to perform
their business functions but may not use or share that personal
information for purposes outside the scope of their functions related to
the Services.
</p>
<h3>LINKS TO OTHER SITES</h3>
<p>
The Services contain links to other third-party websites or applications.
Once you click on such a link and leave the Site or are redirected to a
third-party website or application, you are no longer governed by this
Policy. Any information you provide on those sites is subject to that
third party’s privacy policy and we are not responsible for the privacy
and security practices and policies of those third-party sites or
applications.
</p>
<h3>OUR COMMITMENT TOWARDS CHILDREN'S PRIVACY</h3>
<p>
We do not direct the Services to, nor do we knowingly collect any Personal
Information from children under 13. Children under 13 are not eligible to
use the Services. If we learn that someone using our Services is under 13
years of age, we will take steps to remove any Personal Information from
our database and to prevent them from utilizing the Services.
</p>
<h3>SECURITY OF YOUR PERSONAL INFORMATION & RIGHTS</h3>
<p>
We are committed to protecting the security of Personal Information. We
have taken certain physical, administrative, and technical steps to help
safeguard the information we collect from and about you. While we take
steps to help ensure the integrity and security of our network and
systems, we cannot guarantee our security measures.
</p>
<p>In certain circumstances, you will also have the following rights:</p>
<ol>
<li>
Right to access: the right to request certain information about, access
to and copies of any Personal Information about you that we are holding
(please note that you are entitled to request one copy of the Personal
Information that we hold about you at no cost, but for any further copies,
we reserve the right to charge a reasonable fee based on administration
costs);
</li>
<li>
Right to rectification: the right to have your Personal Information
rectified if it is inaccurate or incomplete;
</li>
<li>
Right to erasure/“right to be forgotten”: where the processing of your
information is based on your consent, the right to withdraw that consent
and the right to request that we delete or erase your Personal
Information from our systems (however, this will not apply if we are
required to hold on to the information for compliance with any legal
obligation, or if we require the information to establish or defend any
legal claim);
</li>
<li>
Right to restriction of use of your information: the right to stop us
from using your Personal Information or limit the way in which we can
use it;
</li>
<li>
Right to data portability: the right to request that we return any
information you have provided in a structured, commonly used, and
machine-readable format, or that we send it directly to another company,
where technically feasible; and
</li>
<li>
Right to object: the right to object to our use of your Personal
Information including where we use it for our legitimate interests.
</li>
</ol>
<p>Requests in relation to the above rights should be sent to: <a href="mailto:[email protected]">[email protected]</a></p>
<h5>Legal Basis for Processing</h5>
<p>The following legal bases apply to the ways in which we use and share an individual’s Personal Information:</p>
<ol>
<li>
We rely on an individual’s consent to process Personal Information to
provide support and/or carry out Promotions. This consent can be
withdrawn at any time.
</li>
<li>
We also process the information provided by an individual in our
legitimate interests in ensuring our business is conducted legitimately
and to a high standard.
</li>
</ol>
<h3>RETENTION</h3>
<p>
We will retain the information you provide in order to process your
request, provide support, and/or carry out and fulfill our Promotions. If
you request support, we will retain your information for no longer than
six (6) months. If you participate in a Promotion, we will retain your
information until the Promotion is carried out and ninety (90) days after
any prize, reward, or offer is fulfilled. Your Personal Information will
then be deleted.
</p>
<h3>CONTACT INFORMATION</h3>
<p>
We welcome your comments or questions about this Policy. You may contact us at <a href="mailto:[email protected]">[email protected]</a>
</p>
<h3>CHANGES TO PRIVACY POLICY</h3>
<p>
We may modify this Policy from time to time. If we make any changes, we
will change the Last Updated date above. We also may provide additional
notice, as applicable, depending on the type of change. If you object to
any changes, you may stop using the Services. Your continued use of the
Services after we publish or otherwise provide notice about our changes
to the Policy means that you are consenting to the updated Policy.
</p>
</div>
</section>
@@include( '../includes/footer.tpl', { "site": "mew" } )
19 changes: 19 additions & 0 deletions app/styles/etherwallet-custom.less
Original file line number Diff line number Diff line change
Expand Up @@ -1005,3 +1005,22 @@ header.ATH {
}
}
}

.privacy-policy {
width: 90%;

h1,
h3 {
font-weight: bold;
text-align: center;
}

.privacy-policy-body {
margin-top: 30px;
}
}

.phishing {
height: 60%;
text-align: center;
}
5 changes: 5 additions & 0 deletions chrome-extension/contest.html
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,11 @@ <h2>MEW 100K Followers Contest Official Rules</h2>
Disclaimer
</a>
</p>
<p>
<a href="https://www.myetherwallet.com/privacy-policy.html" target="_blank">
Privacy policy
</a>
</p>

<p ng-show="showBlocks">
Latest Block#: {{currentBlockNumber}}
Expand Down
2 changes: 1 addition & 1 deletion chrome-extension/css/etherwallet-master.min.css

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions chrome-extension/cx-wallet.html
Original file line number Diff line number Diff line change
Expand Up @@ -8113,6 +8113,11 @@ <h5 translate="ENS_WrongAddress_2">
Disclaimer
</a>
</p>
<p>
<a href="https://www.myetherwallet.com/privacy-policy.html" target="_blank">
Privacy policy
</a>
</p>

<p ng-show="showBlocks">
Latest Block#: {{currentBlockNumber}}
Expand Down
Loading

0 comments on commit 6dea0a6

Please sign in to comment.