Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into airg…
Browse files Browse the repository at this point in the history
…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)
  ...
  • Loading branch information
gabriellsh committed Sep 26, 2024
2 parents 26ebd54 + fc26d85 commit 90373df
Show file tree
Hide file tree
Showing 1,073 changed files with 9,835 additions and 3,242 deletions.
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)
5 changes: 5 additions & 0 deletions .changeset/many-rules-shout.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)
5 changes: 5 additions & 0 deletions .changeset/pink-swans-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixed retention policy max age settings not being respected after upgrade
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.
5 changes: 5 additions & 0 deletions .changeset/wet-hats-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed issue that caused an infinite loading state when uploading a private app to Rocket.Chat
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
1 change: 1 addition & 0 deletions .github/actions/meteor-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,4 @@ runs:
name: build
path: /tmp/Rocket.Chat.tar.gz
overwrite: true
include-hidden-files: true
41 changes: 41 additions & 0 deletions .github/workflows/ci-deploy-gh-pages-preview.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# .github/workflows/ci-preview.yml
name: Deploy PR previews
concurrency: preview-${{ github.ref }}
on:
pull_request:
types:
- opened
- reopened
- synchronize
- closed

jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: rharkor/[email protected]
if: github.event.action != 'closed'

- name: Setup NodeJS
uses: ./.github/actions/setup-node
if: github.event.action != 'closed'
with:
node-version: 14.21.3
cache-modules: true
install: true

- name: Build
if: github.event.action != 'closed'
run: |
yarn turbo run build-preview
yarn turbo run .:build-preview-move
npx indexifier .preview --html --extensions .html > .preview/index.html
- uses: rossjrw/pr-preview-action@v1
with:
source-dir: .preview
preview-branch: gh-pages
umbrella-dir: pr-preview
action: auto
38 changes: 38 additions & 0 deletions .github/workflows/ci-deploy-gh-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# .github/workflows/ci-preview-deploy.yml
name: Deploy GitHub Pages
concurrency: preview-deploy-${{ github.ref }}
on:
push:
branches:
- main
- master
- develop
jobs:
deploy-preview:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: rharkor/[email protected]

- name: Setup NodeJS
uses: ./.github/actions/setup-node
with:
node-version: 14.21.3
cache-modules: true
install: true

- name: Build
run: |
yarn turbo run build-preview
yarn turbo run .:build-preview-move
npx indexifier .preview --html --extensions .html > .preview/index.html
mv .preview ${{ github.ref_name }}
mkdir .preview
mv ${{ github.ref_name }} .preview
- name: Deploy
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: .preview
keep_files: true
5 changes: 4 additions & 1 deletion .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,8 +291,9 @@ jobs:
if: inputs.type == 'ui' && always()
uses: actions/upload-artifact@v4
with:
name: playwright-test-trace-${{ matrix.mongodb-version }}-${{ matrix.shard }}
name: playwright-test-trace-${{ inputs.release }}-${{ matrix.mongodb-version }}-${{ matrix.shard }}
path: ./apps/meteor/tests/e2e/.playwright*
include-hidden-files: true

- name: Show server logs if E2E test failed
if: failure()
Expand Down Expand Up @@ -326,10 +327,12 @@ jobs:
with:
name: e2e-api-ee-coverage-${{ matrix.mongodb-version }}-${{ matrix.shard }}
path: /tmp/coverage
include-hidden-files: true

- name: Store e2e-ee-coverage
if: inputs.type == 'ui' && inputs.release == 'ee'
uses: actions/upload-artifact@v4
with:
name: e2e-ee-coverage-${{ matrix.mongodb-version }}-${{ matrix.shard }}
path: ./apps/meteor/coverage*
include-hidden-files: true
Loading

0 comments on commit 90373df

Please sign in to comment.