Merge remote-tracking branch 'upstream/dev' into fix-a-typo

This commit is contained in:
screenbeard 2020-07-05 10:39:58 +09:30
commit 208912ddc4
No known key found for this signature in database
GPG key ID: 3AB72AFE4AF4C7A4
3 changed files with 3 additions and 1 deletions

View file

@ -26,7 +26,7 @@
<h3 id="how-is-this-privacy-friendly-and-secure"><a href="#how-is-this-privacy-friendly-and-secure">#</a> How is this privacy friendly and secure?</h3> <h3 id="how-is-this-privacy-friendly-and-secure"><a href="#how-is-this-privacy-friendly-and-secure">#</a> How is this privacy friendly and secure?</h3>
<p>You can't make an account on <a href="/">Keyoxide</a> because for basic cryptographic operations, we don't need your data or your keys. By not knowing anything about you or using any trackers, this is as privacy-friendly as it gets.</p> <p>You can't make an account on <a href="/">Keyoxide</a> because for basic cryptographic operations, we don't need your data or your keys. By not knowing anything about you or using any trackers, this is as privacy-friendly as it gets.</p>
<p>As for secure, <a href="/">Keyoxide</a> does all the cryptographic processing on your device and never sends data to the server. Besides, it never uses private keys and should you ever enter those.</p> <p>As for secure, <a href="/">Keyoxide</a> does all the cryptographic processing on your device and never sends data to the server. It also doesn't use private keys for any operation (so make sure to never upload those anywhere).</p>
<h3 id="how-can-i-make-an-account"><a href="#how-can-i-make-an-account">#</a> How can I make an account?</h3> <h3 id="how-can-i-make-an-account"><a href="#how-can-i-make-an-account">#</a> How can I make an account?</h3>
<p>Well, you can't and that is the whole point of <a href="/">Keyoxide</a>. We don't want your data or your keys. Uploading your keys and/or data to our servers is required for any of the operations provided by <a href="/">Keyoxide</a>.</p> <p>Well, you can't and that is the whole point of <a href="/">Keyoxide</a>. We don't want your data or your keys. Uploading your keys and/or data to our servers is required for any of the operations provided by <a href="/">Keyoxide</a>.</p>

View file

@ -11,6 +11,7 @@
<h2>Utilities</h2> <h2>Utilities</h2>
<p> <p>
<a class="bigBtn" href="/util/wkd">wkd</a> <a class="bigBtn" href="/util/wkd">wkd</a>
<a class="bigBtn" href="/util/qr">QR</a>
</p> </p>
<h2>Getting started</h2> <h2>Getting started</h2>
<p> <p>

View file

@ -3,6 +3,7 @@
<h1>QR Code</h1> <h1>QR Code</h1>
<div class="content"> <div class="content">
<form id="form-util-qr" method="post"> <form id="form-util-qr" method="post">
<p>This tool generates a QR code containing the fingerprint of your public key (<a href="https://github.com/open-keychain/open-keychain/wiki/QR-Codes">format</a>). This QR code can be scanned by apps like <a href="https://www.openkeychain.org/">OpenKeyChain</a>.</p>
<h3>Fingerprint</h3> <h3>Fingerprint</h3>
<input type="text" name="input" id="input" placeholder="Fingerprint" value="<?=$this->escape($input)?>"> <input type="text" name="input" id="input" placeholder="Fingerprint" value="<?=$this->escape($input)?>">
<div id="qrcode"></div> <div id="qrcode"></div>