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

fix: Login Terms custom content #28999

Merged
merged 12 commits into from
May 31, 2023
Merged

fix: Login Terms custom content #28999

merged 12 commits into from
May 31, 2023

Conversation

hugocostadev
Copy link
Contributor

@hugocostadev hugocostadev commented Apr 20, 2023

Proposed changes (including videos or screenshots)

The custom layout Login Terms option does not have any effect on the login screen.
image

Previous:
image

Now:
image

Issue(s)

fix #28586

Steps to test or reproduce

Further comments

@codecov
Copy link

codecov bot commented Apr 20, 2023

Codecov Report

Merging #28999 (a5a7813) into develop (9959bc6) will increase coverage by 0.09%.
The diff coverage is n/a.

❗ Current head a5a7813 differs from pull request most recent head c36ad18. Consider uploading reports for the commit c36ad18 to get more accurate results

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #28999      +/-   ##
===========================================
+ Coverage    46.66%   46.76%   +0.09%     
===========================================
  Files          698      707       +9     
  Lines        13075    13241     +166     
  Branches      2227     2221       -6     
===========================================
+ Hits          6102     6192      +90     
- Misses        6656     6730      +74     
- Partials       317      319       +2     
Flag Coverage Δ
e2e 46.72% <ø> (+0.08%) ⬆️

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

@casalsgh casalsgh requested review from a team and gabriellsh April 24, 2023 13:36
@casalsgh casalsgh added this to the 6.3.0 milestone Apr 24, 2023
yash-rajpal
yash-rajpal previously approved these changes Apr 24, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels May 2, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels May 16, 2023
ggazzo
ggazzo previously requested changes May 16, 2023
Copy link
Member

@ggazzo ggazzo left a comment

Choose a reason for hiding this comment

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

are we no longer planning to use translation when text is the default?

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels May 17, 2023
@hugocostadev
Copy link
Contributor Author

are we no longer planning to use translation when text is the default?

Thanks, man! I fixed it and took the chance to change the input to code and add a translation for this content for EN and PT-BR

@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label May 18, 2023
@changeset-bot
Copy link

changeset-bot bot commented May 18, 2023

🦋 Changeset detected

Latest commit: c36ad18

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 25 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/api-client Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

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

@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 18, 2023
@hugocostadev hugocostadev requested a review from ggazzo May 18, 2023 12:49
@hugocostadev hugocostadev requested a review from a team as a code owner May 25, 2023 13:40
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 25, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels May 25, 2023
Copy link
Member

@debdutdeb debdutdeb left a comment

Choose a reason for hiding this comment

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

Code wise lgtm.

@ggazzo Idk if we are only adding migrations only to major versions or not, if so Ig we won't be able to ship it soon. Maybe in that case we should remove the migration, and have this behaviour only for new installs as I suggested initially. Otherwise, this is fine.

@dionisio-bot dionisio-bot bot removed the stat: ready to merge PR tested and approved waiting for merge label May 26, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels May 30, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels May 31, 2023
@kodiakhq kodiakhq bot merged commit ebbb608 into develop May 31, 2023
@kodiakhq kodiakhq bot deleted the fix/login-terms branch May 31, 2023 20:08
gabriellsh added a commit that referenced this pull request Jun 1, 2023
…e/system-messages-update

* 'develop' of github.com:RocketChat/Rocket.Chat: (26 commits)
  fix: Importer crashes when sending the "active status" e-mail notification to users (#29401)
  docs: new README file (#27955)
  refactor: replace with new `Select` (#29368)
  fix: Sidebar's sort by name not being checked properly (#29415)
  fix: Login Terms custom content (#28999)
  fix: Broken link fixed inside webhook menu (#29048)
  fix: Apps settings i18n translation (#29394)
  fix: OTR session closing after 10 seconds without warning (#29245)
  fix: Register Username form showing before homepage (#29356)
  regression(ui-client): Toolbox action button badge in the wrong position (#29412)
  fix: marketplace filters are changing size (#28738)
  chore: Update highlighted word color (#29407)
  i18n: Language update from LingoHub 🤖 on 2023-05-22Z (#29317)
  chore(ddp-sdk): ts-jest -> swc/jest (#29380)
  chore: `ToolboxAction` pressed state (#29397)
  chore: add logs to recurring omnichannel cron jobs (#29392)
  regression: `t` using always sprintf (#29396)
  fix: fix wrong %s translations (#29395)
  regression(push): fix error when selecting what to import (#29289)
  chore: Change ddpsdk.stream to return subscription (#29375)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Login Terms layout option does not have any effect
5 participants