chore: update E2EE setting text #33226

hugocostadev · 2024-09-06T18:29:47Z

Proposed changes (including videos or screenshots)

Reformulate the setting name and description to properly convey its function

Title: Access unencrypted content in encrypted rooms

Description: Allow access to encrypted rooms to people without room encryption keys. They'll be able to see and send unencrypted messages.

Issue(s)

Steps to test or reproduce

Further comments

https://rocketchat.atlassian.net/browse/E2EE2-61

dionisio-bot · 2024-09-06T18:29:51Z

Looks like this PR is not ready to merge, because of the following issues:

This PR is targeting the wrong base branch. It should target 7.0.0, but it targets 6.13.0

Please fix the issues and try again

If you have any trouble, please check the PR guidelines

changeset-bot · 2024-09-06T18:29:51Z

⚠️ No Changeset found

Latest commit: 1d06307

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

codecov · 2024-09-06T18:39:08Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 59.89%. Comparing base (5997627) to head (1d06307).
Report is 1 commits behind head on develop.

Additional details and impacted files

@@           Coverage Diff            @@
##           develop   #33226   +/-   ##
========================================
  Coverage    59.89%   59.89%           
========================================
  Files         2555     2555           
  Lines        63082    63132   +50     
  Branches     14151    14159    +8     
========================================
+ Hits         37781    37812   +31     
- Misses       22898    22914   +16     
- Partials      2403     2406    +3

Flag	Coverage Δ
unit	`77.19% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

github-actions · 2024-09-16T18:46:38Z

PR Preview Action v1.4.8
Preview removed because the pull request was closed.
2024-09-20 13:57 UTC

…hAvatarById * 'develop' of github.com:RocketChat/Rocket.Chat: feat: Implement proper accessbility for report user modal (#33294) chore: update E2EE setting text (#33226) fix: conference calls are shown as "not answered" after they end (#33179) fix: markdown inconsistency with bold and italics (#33157) feat: E2EE messages mentions (#32510) refactor: Reactions set/unset (#32994) ci: auto candidate releases (#33325) feat: `RoomSidepanel` (#33225) feat: contextualbar based on chat size (#33321) fix: error on sendmessage stub (#33317) fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209) refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309) fix: Mark as unread not working (#32939) fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) feat: Allow managing association to business units on departments' creation and update (#32682)

* Bump 6.12.1 * fix: message parser being slow to process very long messages with too many symbols (#33254) Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> * fix: Allow to use the token from `room.v` when requesting transcript instead of finding visitor (#33242) Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com> * fix: Retention Policy cached settings not updated during upgrade procedure (#33265) Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> * fix: imported fixes (#33268) Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com> * Release 6.12.1 [no ci] * fix: Federation callback not awaiting model call (#33298) * fix: correct parameter order in afterSaveMessage to restore outgoing webhooks and related features (#33295) * feat: New endpoint for listing rooms & discussions from teams (#33177) * chore: Update typings on callbacks to accept less than a full room object (#33305) * fix: resolve avatar download issue on setUsername by refining service selection logic (#33193) * feat: Allow managing association to business units on departments' creation and update (#32682) * fix: Local avatars prioritized over external avatar provider and remove remnant references on client of `Accounts_AvatarExternalProviderUrl` (#33296) Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> * fix: Mark as unread not working (#32939) Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> * refactor: Remove old `setreaction` callbacks and use new after/before callbacks (#33309) * fix: `LivechatSessionTaken` webhook event called without `agent` param (#33209) * fix: error on sendmessage stub (#33317) * feat: contextualbar based on chat size (#33321) * feat: `RoomSidepanel` (#33225) Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com> * ci: auto candidate releases (#33325) Co-authored-by: Diego Sampaio <chinello@gmail.com> * refactor: Reactions set/unset (#32994) * feat: E2EE messages mentions (#32510) * fix: markdown inconsistency with bold and italics (#33157) * fix: conference calls are shown as "not answered" after they end (#33179) * Release 6.13.0-rc.0 * chore: update E2EE setting text (#33226) * feat: Implement proper accessbility for report user modal (#33294) Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> * fix: imported fixes (#33330) * chore: create network broker package (#33338) * feat: Adds new admin feature preview setting management (#33212) Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> * chore: move common files to core-services (#33341) * regression: `Sidepanel` color highlight (#33342) * feat: Adds new admin feature preview setting management (#33212) Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> * fix: Avoid destructuring `connectionData` when value is undefined (#33339) * Release 6.13.0-rc.1 [no ci] * chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356) * Bump rocket.chat to 6.14.0-develop (#33366) * ci: use node20 for release action (#33343) --------- Co-authored-by: rocketchat-github-ci <buildmaster@rocket.chat> Co-authored-by: dionisio-bot[bot] <117394943+dionisio-bot[bot]@users.noreply.github.com> Co-authored-by: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com> Co-authored-by: Kevin Aleman <11577696+KevLehman@users.noreply.github.com> Co-authored-by: gabriellsh <40830821+gabriellsh@users.noreply.github.com> Co-authored-by: Julio A. <52619625+julio-cfa@users.noreply.github.com> Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com> Co-authored-by: Kevin Aleman <kaleman960@gmail.com> Co-authored-by: Ricardo Garim <rswarovsky@gmail.com> Co-authored-by: Matheus Barbosa Silva <36537004+matheusbsilva137@users.noreply.github.com> Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat> Co-authored-by: Martin Schoeler <martin.schoeler@rocket.chat> Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> Co-authored-by: Júlia Jaeger Foresti <60678893+juliajforesti@users.noreply.github.com> Co-authored-by: Guilherme Gazzo <5263975+ggazzo@users.noreply.github.com> Co-authored-by: Diego Sampaio <chinello@gmail.com> Co-authored-by: Hugo Costa <hugocarreiracosta@gmail.com> Co-authored-by: csuadev <72958726+csuadev@users.noreply.github.com> Co-authored-by: Henrique Guimarães Ribeiro <43561537+rique223@users.noreply.github.com> Co-authored-by: Tasso Evangelista <2263066+tassoevan@users.noreply.github.com> Co-authored-by: Lucas Pelegrino <lucas.pelegrino@icloud.com> Co-authored-by: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>

…apped/composer-restriction * 'develop' of github.com:RocketChat/Rocket.Chat: (55 commits) regression: `Sidepanel` sort requires refresh after room update (#33370) ci: use node20 for release action (#33343) Bump rocket.chat to 6.14.0-develop (#33366) chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356) Release 6.13.0-rc.1 fix: Avoid destructuring `connectionData` when value is undefined (#33339) feat: Adds new admin feature preview setting management (#33212) regression: `Sidepanel` color highlight (#33342) chore: move common files to core-services (#33341) feat: Adds new admin feature preview setting management (#33212) chore: create network broker package (#33338) fix: imported fixes (#33330) feat: Implement proper accessbility for report user modal (#33294) chore: update E2EE setting text (#33226) Release 6.13.0-rc.0 fix: conference calls are shown as "not answered" after they end (#33179) fix: markdown inconsistency with bold and italics (#33157) feat: E2EE messages mentions (#32510) refactor: Reactions set/unset (#32994) ci: auto candidate releases (#33325) ...

chore: update setting text

856a692

hugocostadev marked this pull request as ready for review September 6, 2024 19:15

yash-rajpal approved these changes Sep 10, 2024

View reviewed changes

hugocostadev added the stat: QA skipped label Sep 11, 2024

dionisio-bot bot added stat: QA assured Means it has been tested and approved by a company insider and removed stat: QA skipped labels Sep 11, 2024

Merge branch 'develop' into chore/e2ee-setting-update

bdb754f

hugocostadev added 2 commits September 17, 2024 09:17

Merge branch 'develop' into chore/e2ee-setting-update

74bab78

Merge branch 'develop' into chore/e2ee-setting-update

e217096

hugocostadev added this to the 7.0 milestone Sep 20, 2024

dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Sep 20, 2024

Merge branch 'develop' into chore/e2ee-setting-update

1d06307

kodiakhq bot merged commit 65d2a45 into develop Sep 20, 2024
47 checks passed

kodiakhq bot deleted the chore/e2ee-setting-update branch September 20, 2024 13:56

ggazzo modified the milestones: 7.0, 6.14 Sep 21, 2024

ggazzo modified the milestones: 6.14, 7.0 Oct 17, 2024

abhinavkrin pushed a commit that referenced this pull request Oct 25, 2024

chore: update E2EE setting text (#33226)

ded2e04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: update E2EE setting text #33226

chore: update E2EE setting text #33226

hugocostadev commented Sep 6, 2024 •

edited

Loading

dionisio-bot bot commented Sep 6, 2024 •

edited

Loading

changeset-bot bot commented Sep 6, 2024 •

edited

Loading

codecov bot commented Sep 6, 2024 •

edited

Loading

github-actions bot commented Sep 16, 2024 •

edited

Loading

chore: update E2EE setting text #33226

chore: update E2EE setting text #33226

Conversation

hugocostadev commented Sep 6, 2024 • edited Loading

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

dionisio-bot bot commented Sep 6, 2024 • edited Loading

changeset-bot bot commented Sep 6, 2024 • edited Loading

⚠️ No Changeset found

codecov bot commented Sep 6, 2024 • edited Loading

Codecov Report

github-actions bot commented Sep 16, 2024 • edited Loading

hugocostadev commented Sep 6, 2024 •

edited

Loading

dionisio-bot bot commented Sep 6, 2024 •

edited

Loading

changeset-bot bot commented Sep 6, 2024 •

edited

Loading

codecov bot commented Sep 6, 2024 •

edited

Loading

github-actions bot commented Sep 16, 2024 •

edited

Loading