Skip to content
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.

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

New: Option to change E2E key #12169

Merged
merged 16 commits into from
Sep 26, 2018
Merged

New: Option to change E2E key #12169

merged 16 commits into from
Sep 26, 2018

Conversation

Hudell
Copy link
Contributor

@Hudell Hudell commented Sep 26, 2018

No description provided.

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-12169 September 26, 2018 16:45 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-12169 September 26, 2018 16:50 Inactive
@rodrigok rodrigok temporarily deployed to rocket-chat-pr-12169 September 26, 2018 16:55 Inactive
@@ -1030,6 +1032,8 @@
"Encrypted": "Encrypted",
"Encrypted_channel_Description": "End to end encrypted channel. Search will not work with encrypted channels and notifications may not show the messages content.",
"Encrypted_message": "Encrypted message",
"EncryptionKey_Change_Disabled": "You can't change your encryption key because it was never used on this browser.",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest:
You can't set a password for your encryption key because your private key is not present on this client. Please go to the client you have the encryption working and set the password there to be able to import it here.

@rodrigok rodrigok changed the title [NEW] Option to change E2E key New: Option to change E2E key Sep 26, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-12169 September 26, 2018 19:49 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-12169 September 26, 2018 19:51 Inactive
import { RocketChat } from 'meteor/rocketchat:lib';
import { e2e } from 'meteor/rocketchat:e2e';

window.qrcode = qrcode;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove this?

/* globals Template, t, ReactiveVar */
import toastr from 'toastr';
import s from 'underscore.string';
import qrcode from 'yaqrcode';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove this?

@rodrigok rodrigok temporarily deployed to rocket-chat-pr-12169 September 26, 2018 20:16 Inactive
@rodrigok rodrigok added this to the 0.70.0 milestone Sep 26, 2018
@rodrigok rodrigok merged commit 062af91 into develop Sep 26, 2018
@rodrigok rodrigok deleted the e2e-option-to-change-key branch September 26, 2018 21:02
This was referenced Sep 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants