Skip to content

add external link pointing to RAQ (import pubkey from unknown source) #4340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomholub merged 2 commits into from
May 2, 2022
Merged

add external link pointing to RAQ (import pubkey from unknown source) #4340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
208641e
add external link pointing to RAQ (import pubkey from unknown source)
martgil Mar 16, 2022
9c56f60
Merge remote-tracking branch 'origin/master' into issue-4114-external…
martgil May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion extension/chrome/elements/add_pubkey.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ <h1>Add a public key to email address</h1>
<textarea class="pubkey" placeholder="ASCII Armored Public Key" spellcheck="false" data-test="input-pubkey"></textarea>
</div>
<div class="line orange" id="manual-import-warning" data-test="manual-import-warning">
Manually importing Public Keys can be dangerous
Manually importing Public Keys can be dangerous <br>
Please read the <a href="https://flowcrypt.com/docs/help/raq.html" target="_blank">"Manually importing public keys can be dangerous"</a> before proceeding.
</div>
<div class="line">
<button class="button long orange action_ok" data-test="action-add-pubkey">OK</button>
Expand Down
3 changes: 2 additions & 1 deletion extension/chrome/settings/modules/contacts.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ <h1></h1>

<div id="bulk_import" style="display: none;">
<div class="line orange">
Manually importing Public Keys can be dangerous
Manually importing Public Keys can be dangerous <br>
Please read the <a href="https://flowcrypt.com/docs/help/raq.html" target="_blank">"Manually importing public keys can be dangerous"</a> before proceeding.
</div>
<div class="line" id="file_import">
<a id="fineuploader_button" href="#">Select a file</a> or paste public key(s) below:
Expand Down