Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into new/…
Browse files Browse the repository at this point in the history
…hideUi

* 'develop' of github.com:RocketChat/Rocket.Chat: (112 commits)
  chore: update yarn.lock
  chore: Replace `FramedIcon` in favor of fuselage component (#31356)
  chore: fix dep version
  Release 6.5.2
  fix: wrong value used for workspace registration
  ci: update release PR description with change log
  fix: inquiries being limited to 50 items (#31267)
  fix: close image gallery on backdrop click (#31344)
  fix: No error message when uploading a file that is not allowed (#31346)
  fix: Text area only shows the last line of the message for very long texts #31252 #31257 (#31262)
  chore: adding new streamer event for imported messages (#31063)
  chore: adapt read receipts feature to work without oplog on msgs (#30996)
  chore: remove Messages model dependency of Rooms model (#31272)
  chore: `Card` normalization (#31335)
  refactor: unify useStream and useSingleStream (#31326)
  chore: add new msg stream for reported msgs (#31087)
  Bump 6.5.2
  feat: Highlight words in thread messages (#31281)
  fix: Show only departments that are allowed on registration page on livechat widget (#31302)
  fix: Fallback forward department not working as expected on chat forwarding (#31296)
  ...
  • Loading branch information
gabriellsh committed Jan 3, 2024
2 parents 781af15 + adbc874 commit 096265a
Show file tree
Hide file tree
Showing 638 changed files with 12,168 additions and 6,789 deletions.
5 changes: 5 additions & 0 deletions .changeset/brave-shrimps-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Improved support for higlighted words in threads (rooms are now marked as unread and notifications are sent)
6 changes: 6 additions & 0 deletions .changeset/calm-rules-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/model-typings": patch
---

Fixed issue with notifications for thread messages still being sent after thread has been read
5 changes: 5 additions & 0 deletions .changeset/chilled-cooks-end.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed an issue displaying the language selection preference empty when it should display 'Default' on the initial value
5 changes: 5 additions & 0 deletions .changeset/chilled-mails-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed an issue that caused Omnichannel Business Units to be saved even when the "monitors" list passed on the endpoint included users without monitor role
5 changes: 5 additions & 0 deletions .changeset/eight-windows-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed a problem with the Fallback Forward Department functionality when transferring rooms, caused by a missing return. This provoked the system to transfer to fallback department, as expected, but then continue the process and transfer to the department with no agents anyways. Also, a duplicated "user joined" message was removed from "Forward to department" functionality.
5 changes: 5 additions & 0 deletions .changeset/forty-adults-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Resolved Search List Issue when pressing ENTER
5 changes: 0 additions & 5 deletions .changeset/fresh-radios-whisper.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/fresh-socks-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Mentioning users that are not in the channel now dispatches a warning message with actions
5 changes: 5 additions & 0 deletions .changeset/green-turkeys-fry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed toolbox sub-menu not being displayed when in smaller resolutions
5 changes: 5 additions & 0 deletions .changeset/late-pots-travel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

fix: Loading state for `Marketplace` related lists
5 changes: 5 additions & 0 deletions .changeset/lemon-shrimps-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed error message when uploading a file that is not allowed
6 changes: 6 additions & 0 deletions .changeset/loud-planes-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
---

Fixed a problem that caused the wrong system message to be sent when a chat was resumed from on hold status.
Note: This fix is not retroactive so rooms where a wrong message was already sent will still show the wrong message. New calls to the resume actions will have the proper message.
6 changes: 0 additions & 6 deletions .changeset/nasty-islands-trade.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/pretty-eyes-sleep.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed issue searching connected users on spotlight
5 changes: 0 additions & 5 deletions .changeset/spicy-kiwis-argue.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/spotty-bulldogs-fly.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes the `overview` endpoint to show busiest time of the day in users timezone instead of UTC.
5 changes: 5 additions & 0 deletions .changeset/spotty-suns-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Improved the experience of receiving conference calls on the mobile app by disabling the push notification for the "new call" message if a push is already being sent to trigger the phone's ringing tone.
5 changes: 5 additions & 0 deletions .changeset/thick-nails-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed the problem of not being possible to add a join code to a public room
5 changes: 5 additions & 0 deletions .changeset/thin-chairs-clean.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed the problem of displaying the wrong composer for archived room
5 changes: 5 additions & 0 deletions .changeset/thin-socks-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Removed an old behavior that allowed visitors to be created with an empty token on `livechat/visitor` endpoint.
5 changes: 5 additions & 0 deletions .changeset/three-moles-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed conversations in queue being limited to 50 items
5 changes: 5 additions & 0 deletions .changeset/three-steaks-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/livechat": patch
---

Fixed a problem that caused Livechat Widget registration page to ignore the `showOnRegistration` flag for departments, showing all items.
5 changes: 5 additions & 0 deletions .changeset/violet-pears-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed the filter for file type in the list of room files
6 changes: 2 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,13 @@
-->

## Proposed changes (including videos or screenshots)
<!-- CHANGELOG -->
<!--
Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request.
If it fixes a bug or resolves a feature request, be sure to link to that issue below.
This description will appear in the release notes if we accept the contribution.
This description won't be displayed to our end users in the release notes, so feel free to add as much technical context as needed.
If the changes introduced in this pull request must be presented in the release notes, make sure to add a changeset file. Check our guidelines for adding a changeset to your pull request: https://developer.rocket.chat/contribute-to-rocket.chat/modes-of-contribution/participate-in-rocket.chat-development/development-workflow#4.-adding-changeset-to-your-pull-request
-->

<!-- END CHANGELOG -->

## Issue(s)
<!-- Link the issues being closed by or related to this PR. For example, you can use #594 if this PR closes issue number 594 -->

Expand Down
8 changes: 1 addition & 7 deletions .github/actions/meteor-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,8 @@ runs:
working-directory: ./apps/meteor
run: meteor reset

- name: Build Rocket.Chat From Pull Request
- name: Build Rocket.Chat
shell: bash
if: startsWith(github.ref, 'refs/pull/') == true
env:
METEOR_PROFILE: 1000
BABEL_ENV: ${{ inputs.coverage == 'true' && 'coverage' || '' }}
Expand All @@ -118,11 +117,6 @@ runs:
yarn build:ci -- --directory /tmp/dist
- name: Build Rocket.Chat
shell: bash
if: startsWith(github.ref, 'refs/pull/') != true
run: yarn build:ci -- --directory /tmp/dist

- name: Prepare build
shell: bash
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ jobs:
- uses: ./.github/actions/meteor-build
with:
node-version: ${{ needs.release-versions.outputs.node-version }}
coverage: true
coverage: ${{ github.event_name != 'release' }}

build-prod:
name: 📦 Meteor Build - official
Expand All @@ -207,7 +207,7 @@ jobs:
- uses: ./.github/actions/meteor-build
with:
node-version: ${{ needs.release-versions.outputs.node-version }}
coverage: false
coverage: ${{ github.event_name != 'release' }}

build-gh-docker-coverage:
name: 🚢 Build Docker Images for Testing
Expand Down
39 changes: 39 additions & 0 deletions .github/workflows/pr-update-description.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: 'Release PR Description'

on:
pull_request:
branches:
- master

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
update-pr:
runs-on: ubuntu-latest
if: startsWith(github.head_ref, 'release-')
steps:
- name: Checkout Repo
uses: actions/checkout@v4
with:
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

- uses: dtinth/setup-github-actions-caching-for-turbo@v1

- name: Build packages
run: yarn build

- name: Update PR description
uses: ./packages/release-action
with:
action: update-pr-description
env:
GITHUB_TOKEN: ${{ secrets.CI_PAT }}

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,6 @@ yarn-error.log*
.idea/
.exrc
.history
.envrc
.envrc

*.sublime-workspace
55 changes: 55 additions & 0 deletions Rocket.Chat.sublime-project
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"folders":
[
{
"name": "Monorepo Root",
"path": ".",
"folder_exclude_patterns": [
"//apps/meteor",
"//packages",
"//ee/apps",
"//ee/packages"
],
},
{
"name": "Rocket.Chat",
"path": "./apps/meteor",
},
{
"name": "Packages",
"path": "./packages",
},
{
"name": "Enterprise Apps",
"path": "./ee/apps",
},
{
"name": "Enterprise Packages",
"path": "./ee/packages",
}
],
"settings": {
"LSP": {
"LSP-typescript": {
"enabled": true,
"disabled_capabilities": {
// Uncomment the line below to load auto complete suggestions from sublime's index instead of typescript.
// The index is much faster, but doesn't filter out results based on the current context.

// "completionProvider": true,
},
},
"LSP-eslint": {
"settings": {
// If node path is not automatically detected, you can specify it here (use the global eslint settings if you have a global node)
// "nodePath": null
"workingDirectories": [
{
"mode": "auto",
}
],
},
},
},
},
}
76 changes: 76 additions & 0 deletions apps/meteor/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,81 @@
# @rocket.chat/meteor

## 6.5.2

### Patch Changes

- a075950e23: Bump @rocket.chat/meteor version.
- Bump @rocket.chat/meteor version.
- 84c4b0709e: Fixed conversations in queue being limited to 50 items
- 886d92009e: Fix wrong value used for Workspace Registration
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]

## 6.5.1

### Patch Changes

- c2b224fd82: Bump @rocket.chat/meteor version.
- Bump @rocket.chat/meteor version.
- c2b224fd82: Security improvements
- c2b224fd82: Fixed issue with the new `custom-roles` license module not being checked throughout the application
- c2b224fd82: fix: stop refetching banner data each 5 minutes
- c2b224fd82: Fixed an issue allowing admin user cancelling subscription when license's trial param is provided
- c2b224fd82: Fixed Country select component at Organization form from `onboarding-ui` package
- c2b224fd82: fix Federation Regression, builds service correctly
- c2b224fd82: fix: Wrong `Message Roundtrip Time` metric

Removes the wrong metric gauge named `rocketchat_messages_roundtrip_time` and replace it by a new summary metric named `rocketchat_messages_roundtrip_time_summary`. Add new percentiles `0.5, 0.95 and 1` to all summary metrics.

- c2b224fd82: Exceeding API calls when sending OTR messages
- c2b224fd82: Fixed a problem with the subscription creation on Omnichannel rooms.
Rooms were being created as seen, causing sound notifications to not work
- c2b224fd82: Fixed a problem where chained callbacks' return value was being overrided by some callbacks returning something different, causing callbacks with lower priority to operate on invalid values
- c2b224fd82: Fix desktop notification routing for direct rooms
- c2b224fd82: Improved the experience of receiving conference calls on the mobile app by disabling the push notification for the "new call" message if a push is already being sent to trigger the phone's ringing tone.
- c2b224fd82: Fixed verify the account through email link
- c2b224fd82: Fixed the filter for file type in the list of room files
- Updated dependencies [c2b224fd82]
- Updated dependencies [c2b224fd82]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]
- @rocket.chat/[email protected]

## 6.5.0

### Minor Changes
Expand Down
Loading

0 comments on commit 096265a

Please sign in to comment.