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

chore: move all webclient code out of the COSS folders #32273

Merged
merged 4 commits into from
May 22, 2024

Conversation

pierre-lehnen-rc
Copy link
Contributor

@pierre-lehnen-rc pierre-lehnen-rc commented Apr 19, 2024

Proposed changes (including videos or screenshots)

In an effort to have a FOSS-compatible build of Rocket.Chat, we're moving the whole webclient codebase out of the folders with commercial licenses.

Issue(s)

FOSS-17

Steps to test or reproduce

Further comments

Copy link

changeset-bot bot commented Apr 19, 2024

⚠️ No Changeset found

Latest commit: 3a56bef

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

@pierre-lehnen-rc pierre-lehnen-rc added this to the 6.8 milestone Apr 19, 2024
Copy link
Contributor

dionisio-bot bot commented Apr 19, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link

codecov bot commented Apr 19, 2024

Codecov Report

Attention: Patch coverage is 76.19048% with 5 lines in your changes are missing coverage. Please review.

Project coverage is 55.94%. Comparing base (612c78a) to head (3a56bef).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32273      +/-   ##
===========================================
- Coverage    56.20%   55.94%   -0.26%     
===========================================
  Files         2431     2422       -9     
  Lines        53560    53437     -123     
  Branches     11031    11008      -23     
===========================================
- Hits         30102    29897     -205     
- Misses       20818    20910      +92     
+ Partials      2640     2630      -10     
Flag Coverage Δ
e2e 55.80% <73.68%> (-0.03%) ⬇️
unit 72.30% <100.00%> (-0.03%) ⬇️

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

@pierre-lehnen-rc pierre-lehnen-rc marked this pull request as ready for review April 22, 2024 14:23
@pierre-lehnen-rc pierre-lehnen-rc requested review from a team as code owners April 22, 2024 14:23
@scuciatto scuciatto modified the milestones: 6.8, 7.0 Apr 23, 2024
@pierre-lehnen-rc pierre-lehnen-rc modified the milestones: 7.0, 6.9 May 8, 2024
@pierre-lehnen-rc pierre-lehnen-rc force-pushed the foss/move-client-to-ce branch from 5930800 to 711c907 Compare May 17, 2024 18:30
ggazzo
ggazzo previously approved these changes May 17, 2024
@ggazzo ggazzo added the stat: QA assured Means it has been tested and approved by a company insider label May 22, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label May 22, 2024
@ggazzo ggazzo merged commit c6450b1 into develop May 22, 2024
49 checks passed
@ggazzo ggazzo deleted the foss/move-client-to-ce branch May 22, 2024 16:54
@ggazzo ggazzo modified the milestones: 6.9, 6.10 May 22, 2024
gabriellsh added a commit that referenced this pull request May 28, 2024
…retention

* 'develop' of github.com:RocketChat/Rocket.Chat: (36 commits)
  refactor: IntegrationHistory out of DB Watcher (#32502)
  fix: Message update being broadcasted without updated values (#32472)
  test: make api teams test fully independent (#31756)
  test: Fix test name (#32490)
  fix: streams being called with no logged user (#32489)
  feat: Un-encrypted messages not allowed in E2EE rooms (#32040)
  feat(UiKit): Users select (#31455)
  fix: Re-login same browser tab issues (#32479)
  chore: move all webclient code out of the COSS folders (#32273)
  chore(deps): bump thehanimo/pr-title-checker from 1.3.7 to 1.4.1 (#30619)
  fix: Don't show join default channels option for edit user form  (#31750)
  fix: CAS user merge not working (#32444)
  fix: Overriding Retention Policy not working (#32454)
  fix: `rooms.export` endpoint generates an empty export when given an invalid date (#32364)
  fix: "Allow Password Change for OAuth Users" setting is not honored in the "Forgot Password" flow (#32398)
  fix: Bypass trash when removing OTR system messages and read receipts (#32269)
  fix: Monitors dissapearing from Unit upon edit (#32393)
  fix: Link image preview not opening in gallery (#32391)
  feat: Allow visitors & integrations to access downloaded files after a room has closed (#32439)
  regression: Users tab misaligned (#32451)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants