Merged
Conversation
rodrigok
requested changes
Sep 26, 2018
| "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.", |
Member
There was a problem hiding this comment.
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
changed the title
…et.Chat into e2e-option-to-change-key
rodrigok
requested changes
Sep 26, 2018
| import { RocketChat } from 'meteor/rocketchat:lib'; | ||
| import { e2e } from 'meteor/rocketchat:e2e'; | ||
|
|
||
| window.qrcode = qrcode; |
| /* globals Template, t, ReactiveVar */ | ||
| import toastr from 'toastr'; | ||
| import s from 'underscore.string'; | ||
| import qrcode from 'yaqrcode'; |
…et.Chat into e2e-option-to-change-key
rodrigok
approved these changes
Sep 26, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.