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: merge develop into feat/voip-freeswitch-6-12 #33380

Merged
merged 42 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
f3e8b6b
Bump 6.12.1
rocketchat-github-ci Sep 10, 2024
3cbb9f6
fix: message parser being slow to process very long messages with too…
dionisio-bot[bot] Sep 11, 2024
ed7398d
fix: Allow to use the token from `room.v` when requesting transcript …
dionisio-bot[bot] Sep 11, 2024
c2d7216
fix: Retention Policy cached settings not updated during upgrade proc…
dionisio-bot[bot] Sep 12, 2024
4aeb619
fix: imported fixes (#33268)
dionisio-bot[bot] Sep 13, 2024
2dacd9d
Merge pull request #33245 from RocketChat/release-6.12.1
ggazzo Sep 13, 2024
e22ea8f
Release 6.12.1
rocketchat-github-ci Sep 13, 2024
b919221
fix: Federation callback not awaiting model call (#33298)
KevLehman Sep 16, 2024
636d32d
fix: correct parameter order in afterSaveMessage to restore outgoing …
ricardogarim Sep 17, 2024
3a161c4
feat: New endpoint for listing rooms & discussions from teams (#33177)
KevLehman Sep 17, 2024
f27092b
chore: Update typings on callbacks to accept less than a full room ob…
KevLehman Sep 17, 2024
4202d65
fix: resolve avatar download issue on setUsername by refining service…
ricardogarim Sep 17, 2024
9a38c8e
feat: Allow managing association to business units on departments' cr…
matheusbsilva137 Sep 18, 2024
fdde637
fix: Local avatars prioritized over external avatar provider and remo…
tassoevan Sep 18, 2024
ba8bee4
fix: Mark as unread not working (#32939)
MartinSchoeler Sep 18, 2024
6a3c25c
refactor: Remove old `setreaction` callbacks and use new after/before…
KevLehman Sep 18, 2024
d0595a3
fix: `LivechatSessionTaken` webhook event called without `agent` para…
KevLehman Sep 18, 2024
a541f64
fix: error on sendmessage stub (#33317)
ggazzo Sep 19, 2024
4033974
feat: contextualbar based on chat size (#33321)
ggazzo Sep 19, 2024
12d6307
feat: `RoomSidepanel` (#33225)
juliajforesti Sep 19, 2024
015c862
ci: auto candidate releases (#33325)
ggazzo Sep 19, 2024
7faba77
refactor: Reactions set/unset (#32994)
KevLehman Sep 19, 2024
274f4f5
feat: E2EE messages mentions (#32510)
hugocostadev Sep 20, 2024
9c119a0
fix: markdown inconsistency with bold and italics (#33157)
csuadev Sep 20, 2024
5997627
fix: conference calls are shown as "not answered" after they end (#33…
pierre-lehnen-rc Sep 20, 2024
027183f
Release 6.13.0-rc.0
rocketchat-github-ci Sep 20, 2024
65d2a45
chore: update E2EE setting text (#33226)
hugocostadev Sep 20, 2024
9bcb802
feat: Implement proper accessbility for report user modal (#33294)
rique223 Sep 23, 2024
827850d
fix: imported fixes (#33330)
julio-cfa Sep 23, 2024
a6b9152
chore: create network broker package (#33338)
sampaiodiego Sep 23, 2024
1f89f78
feat: Adds new admin feature preview setting management (#33212)
lucas-a-pelegrino Sep 24, 2024
a4fcd99
chore: move common files to core-services (#33341)
sampaiodiego Sep 24, 2024
d94a159
regression: `Sidepanel` color highlight (#33342)
ggazzo Sep 24, 2024
2f9eea0
feat: Adds new admin feature preview setting management (#33212)
lucas-a-pelegrino Sep 24, 2024
1d29a74
Merge remote-tracking branch 'origin/master' into release-6.13.0
ggazzo Sep 24, 2024
519ed86
fix: Avoid destructuring `connectionData` when value is undefined (#3…
KevLehman Sep 24, 2024
2327ff5
Release 6.13.0-rc.1
rocketchat-github-ci Sep 24, 2024
47c584c
Merge remote-tracking branch 'origin/release-6.13.0' into develop
ggazzo Sep 25, 2024
7dc9c41
chore: replace Meteor._localStorage -> Accounts.storageLocation (#33356)
ggazzo Sep 25, 2024
b4c3e5c
Bump rocket.chat to 6.14.0-develop (#33366)
sampaiodiego Sep 25, 2024
6bee2a1
ci: use node20 for release action (#33343)
trivikr Sep 26, 2024
ebd7875
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into feat…
aleksandernsilva Sep 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/brave-brooms-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes a problem that caused visitor creation to fail when GDPR setting was enabled and visitor was created via Apps Engine or the deprecated `livechat:registerGuest` method.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1727212585363.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/cyan-ladybugs-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed error during sendmessage client stub
7 changes: 7 additions & 0 deletions .changeset/dirty-stingrays-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/model-typings": minor
"@rocket.chat/rest-typings": minor
---

Added support for specifying a unit on departments' creation and update
5 changes: 5 additions & 0 deletions .changeset/five-coats-rhyme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/fuselage-ui-kit': patch
---

Fixed an error that incorrectly showed conference calls as not answered after they ended
5 changes: 5 additions & 0 deletions .changeset/great-humans-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed a Federation callback not awaiting db call
5 changes: 5 additions & 0 deletions .changeset/hot-balloons-travel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed issue where when you marked a room as unread and you were part of it, sometimes it would mark it as read right after
5 changes: 5 additions & 0 deletions .changeset/kind-llamas-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Changed the contextualbar behavior based on chat size instead the viewport
6 changes: 6 additions & 0 deletions .changeset/late-hats-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Improves the accessibility of the report user modal by adding an appropriate label, description, and ARIA attributes.
7 changes: 7 additions & 0 deletions .changeset/late-planes-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/core-typings": patch
"@rocket.chat/i18n": patch
---

Added a new setting to enable mentions in end to end encrypted channels
5 changes: 5 additions & 0 deletions .changeset/little-bottles-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Security Hotfix (https://docs.rocket.chat/docs/security-fixes-and-updates)
103 changes: 103 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
{
"mode": "pre",
"tag": "rc",
"initialVersions": {
"@rocket.chat/meteor": "6.13.0-develop",
"rocketchat-services": "1.3.3",
"@rocket.chat/uikit-playground": "0.4.0",
"@rocket.chat/account-service": "0.4.6",
"@rocket.chat/authorization-service": "0.4.6",
"@rocket.chat/ddp-streamer": "0.3.6",
"@rocket.chat/omnichannel-transcript": "0.4.6",
"@rocket.chat/presence-service": "0.4.6",
"@rocket.chat/queue-worker": "0.4.6",
"@rocket.chat/stream-hub-service": "0.4.6",
"@rocket.chat/license": "0.2.6",
"@rocket.chat/omnichannel-services": "0.3.3",
"@rocket.chat/pdf-worker": "0.2.3",
"@rocket.chat/presence": "0.2.6",
"@rocket.chat/ui-theming": "0.2.1",
"@rocket.chat/account-utils": "0.0.2",
"@rocket.chat/agenda": "0.1.0",
"@rocket.chat/api-client": "0.2.6",
"@rocket.chat/apps": "0.1.6",
"@rocket.chat/base64": "1.0.13",
"@rocket.chat/cas-validate": "0.0.2",
"@rocket.chat/core-services": "0.6.0",
"@rocket.chat/core-typings": "6.13.0-develop",
"@rocket.chat/cron": "0.1.6",
"@rocket.chat/ddp-client": "0.3.6",
"@rocket.chat/eslint-config": "0.7.0",
"@rocket.chat/favicon": "0.0.2",
"@rocket.chat/fuselage-ui-kit": "10.0.0",
"@rocket.chat/gazzodown": "10.0.0",
"@rocket.chat/i18n": "0.7.0",
"@rocket.chat/instance-status": "0.1.6",
"@rocket.chat/jest-presets": "0.0.1",
"@rocket.chat/jwt": "0.1.1",
"@rocket.chat/livechat": "1.19.3",
"@rocket.chat/log-format": "0.0.2",
"@rocket.chat/logger": "0.0.2",
"@rocket.chat/message-parser": "0.31.29",
"@rocket.chat/mock-providers": "0.1.2",
"@rocket.chat/model-typings": "0.7.0",
"@rocket.chat/models": "0.2.3",
"@rocket.chat/poplib": "0.0.2",
"@rocket.chat/password-policies": "0.0.2",
"@rocket.chat/patch-injection": "0.0.1",
"@rocket.chat/peggy-loader": "0.31.25",
"@rocket.chat/random": "1.2.2",
"@rocket.chat/release-action": "2.2.3",
"@rocket.chat/release-changelog": "0.1.0",
"@rocket.chat/rest-typings": "6.13.0-develop",
"@rocket.chat/server-cloud-communication": "0.0.2",
"@rocket.chat/server-fetch": "0.0.3",
"@rocket.chat/sha256": "1.0.10",
"@rocket.chat/tools": "0.2.2",
"@rocket.chat/ui-avatar": "6.0.0",
"@rocket.chat/ui-client": "10.0.0",
"@rocket.chat/ui-composer": "0.2.1",
"@rocket.chat/ui-contexts": "10.0.0",
"@rocket.chat/ui-kit": "0.36.1",
"@rocket.chat/ui-video-conf": "10.0.0",
"@rocket.chat/web-ui-registration": "10.0.0"
},
"changesets": [
"brave-brooms-invent",
"brown-singers-appear",
"bump-patch-1727212585363",
"cyan-ladybugs-thank",
"dirty-stingrays-beg",
"five-coats-rhyme",
"four-cherries-kneel",
"great-humans-live",
"healthy-rivers-nail",
"heavy-snails-help",
"hot-balloons-travel",
"khaki-cameras-glow",
"kind-llamas-grin",
"late-planes-sniff",
"many-balloons-scream",
"many-rules-shout",
"mighty-drinks-hide",
"nasty-tools-enjoy",
"pink-swans-teach",
"quick-rings-wave",
"quiet-cherries-punch",
"rich-toes-bow",
"rotten-rabbits-brush",
"short-drinks-itch",
"sixty-spoons-own",
"small-crabs-travel",
"soft-mirrors-remember",
"spicy-rocks-burn",
"strong-grapes-brake",
"stupid-pigs-share",
"sweet-nails-grin",
"tame-mayflies-press",
"tiny-geckos-kiss",
"wet-hats-walk",
"wise-avocados-taste",
"witty-lemons-type"
]
}
7 changes: 7 additions & 0 deletions .changeset/quick-rings-wave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
"@rocket.chat/ui-client": minor
---

Added new Admin Feature Preview management view, this will allow the workspace admins to both enable feature previewing in the workspace as well as define which feature previews are enabled by default for the users in the workspace.
5 changes: 5 additions & 0 deletions .changeset/rotten-rabbits-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Resolves the issue where outgoing integrations failed to trigger after the version 6.12.0 upgrade by correcting the parameter order from the `afterSaveMessage` callback to listener functions. This ensures the correct room information is passed, restoring the functionality of outgoing webhooks, IRC bridge, Autotranslate, and Engagement Dashboard.
5 changes: 5 additions & 0 deletions .changeset/small-crabs-travel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed avatar blob image setting in setUserAvatar method by correcting service handling logic.
8 changes: 8 additions & 0 deletions .changeset/soft-mirrors-remember.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/core-services": minor
"@rocket.chat/model-typings": minor
"@rocket.chat/rest-typings": minor
---

New `teams.listChildren` endpoint that allows users listing rooms & discussions from teams. Only the discussions from the team's main room are returned.
5 changes: 5 additions & 0 deletions .changeset/spicy-rocks-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed `LivechatSessionTaken` webhook event being called without the `agent` param, which represents the agent serving the room.
9 changes: 9 additions & 0 deletions .changeset/strong-grapes-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@rocket.chat/meteor': patch
---

Fixed remaining direct references to external user avatar URLs

Fixed local avatars having priority over external provider

It mainly corrects the behavior of E2E encryption messages and desktop notifications.
5 changes: 5 additions & 0 deletions .changeset/sweet-nails-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed inconsistency between the markdown parser from the composer and the rest of the application when using bold and italics in a text.
10 changes: 10 additions & 0 deletions .changeset/witty-lemons-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@rocket.chat/core-services': minor
'@rocket.chat/model-typings': minor
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/ui-client': minor
'@rocket.chat/meteor': minor
---

Implemented new feature preview for Sidepanel
35 changes: 35 additions & 0 deletions .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Release candidate cut
on:
schedule:
- cron: '28 0 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
jobs:
new-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.ref_name }}
fetch-depth: 0
token: ${{ secrets.CI_PAT }}

- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 14.21.3
cache-modules: true
install: true
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- uses: rharkor/[email protected]

- name: Build packages
run: yarn build

- name: 'Start release candidate'
uses: ./packages/release-action
with:
action: next
base-ref: ${{ github.ref_name }}
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ secrets.CI_PAT }}
1 change: 1 addition & 0 deletions _templates/service/new/package.json.ejs.t
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ to: ee/apps/<%= name %>/package.json
"dependencies": {
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/network-broker": "workspace:^",
"@rocket.chat/emitter": "next",
"@rocket.chat/model-typings": "workspace:^",
"@rocket.chat/models": "workspace:^",
Expand Down
10 changes: 3 additions & 7 deletions _templates/service/new/service.ejs.t
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
---
to: ee/apps/<%= name %>/src/service.ts
---
import type { Document } from 'mongodb';
import { api, getConnection, getTrashCollection } from '@rocket.chat/core-services';
import { broker } from '@rocket.chat/network-broker';
import polka from 'polka';
import { api } from '@rocket.chat/core-services';

import { broker } from '../../../../apps/meteor/ee/server/startup/broker';
import { Collections, getCollection, getConnection } from '../../../../apps/meteor/ee/server/services/mongo';
import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';

const PORT = process.env.PORT || <%= h.random() %>;

(async () => {
const db = await getConnection();

const trash = await getCollection<Document>(Collections.Trash);

registerServiceModels(db, trash);
registerServiceModels(db, await getTrashCollection());

api.setBroker(broker);

Expand Down
Loading
Loading