Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/single-contac…
Browse files Browse the repository at this point in the history
…t-id
  • Loading branch information
dougfabris committed Aug 19, 2024
2 parents 81c9ea0 + 7e2facc commit 2b90fb7
Show file tree
Hide file tree
Showing 1,165 changed files with 26,633 additions and 9,509 deletions.
6 changes: 0 additions & 6 deletions .changeset/afraid-guests-jog.md

This file was deleted.

13 changes: 13 additions & 0 deletions .changeset/brown-crabs-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
'@rocket.chat/uikit-playground': patch
'@rocket.chat/fuselage-ui-kit': patch
'@rocket.chat/ui-theming': patch
'@rocket.chat/ui-video-conf': patch
'@rocket.chat/ui-composer': patch
'@rocket.chat/gazzodown': patch
'@rocket.chat/ui-avatar': patch
'@rocket.chat/ui-client': patch
'@rocket.chat/meteor': patch
---

Bumped @rocket.chat/fuselage that fixes the Menu onPointerUp event behavior
5 changes: 5 additions & 0 deletions .changeset/calm-tigers-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/ui-kit": patch
---

fix UiKit error message: Failed to resolve module: @rocket.chat/icons
5 changes: 0 additions & 5 deletions .changeset/chilly-papayas-march.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/cuddly-ravens-swim.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/empty-readers-teach.md

This file was deleted.

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

Federated users can no longer be deleted.
5 changes: 0 additions & 5 deletions .changeset/fast-buttons-shake.md

This file was deleted.

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

Fixed an issue due to an endpoint pagination that was causing that when an agent have assigned more than 50 departments, the departments have a blank space instead of the name.
8 changes: 0 additions & 8 deletions .changeset/fifty-mails-admire.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/funny-boats-guess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Added a new Audit endpoint `audit/rooms.members` that allows users with `view-members-list-all-rooms` to fetch a list of the members of any room even if the user is not part of it.
10 changes: 0 additions & 10 deletions .changeset/funny-snails-promise.md

This file was deleted.

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

Prevent `processRoomAbandonment` callback from erroring out when a room was inactive during a day Business Hours was not configured for.
5 changes: 5 additions & 0 deletions .changeset/gentle-news-wonder.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Added a new 'Deactivated' tab to the users page, this tab lists users who have logged in for the first time but have been deactivated for any reason. Also added the UI code for the Active tab;
5 changes: 5 additions & 0 deletions .changeset/gorgeous-hotels-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Stopped non channel members from dragging and dropping files in a channel they do not belong
5 changes: 0 additions & 5 deletions .changeset/grumpy-worms-appear.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/happy-peaches-nail.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/hip-queens-taste.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/large-geese-ring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Replaces an outdated banner with the Bubble component in order to display retention policy warning
6 changes: 6 additions & 0 deletions .changeset/lemon-steaks-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Added an accordion for advanced settings on Create teams and channels
7 changes: 0 additions & 7 deletions .changeset/lucky-beds-glow.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lucky-countries-look.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/nervous-rockets-impress.md

This file was deleted.

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

Fixed an issue that caused UI to show an error when the call to get the Business Hour type from settings returned `undefined`.
5 changes: 5 additions & 0 deletions .changeset/proud-years-buy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/i18n': patch
---

Fixes a typo in german translation and fixes the broken hyperlink for Resend and Change Email
6 changes: 0 additions & 6 deletions .changeset/rare-penguins-hope.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/rotten-eggs-end.md

This file was deleted.

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

Fixed a behavior when updating messages that prevented the `customFields` prop from being updated if there were no changes to the `msg` property. Now, `customFields` will be always updated on message update even if `msg` doesn't change
6 changes: 0 additions & 6 deletions .changeset/selfish-emus-sing.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/sour-forks-breathe.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/strong-swans-double.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/uikit-playground': minor
'@rocket.chat/meteor': minor
---

Upgrades fuselage-toastbar version in order to add pause on hover functionality
9 changes: 9 additions & 0 deletions .changeset/swift-maps-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@rocket.chat/core-services': minor
'@rocket.chat/model-typings': minor
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/meteor': minor
---

Added `sidepanel` field to `teams.create` and `rooms.saveRoomSettings` endpoints
5 changes: 0 additions & 5 deletions .changeset/thin-windows-reply.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/thirty-dryers-help.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/livechat": patch
---

Fixed issue where `after-registration-triggers` would show up in a page when the user was not yet registered
5 changes: 5 additions & 0 deletions .changeset/twelve-windows-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed: Custom fields in extraData now correctly added to extraRoomInfo by livechat.beforeRoom callback during livechat room creation.
13 changes: 0 additions & 13 deletions .changeset/witty-bats-develop.md

This file was deleted.

30 changes: 25 additions & 5 deletions .github/actions/build-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,33 @@ inputs:
required: false
description: 'Containers to build along with Rocket.Chat'
type: string
turbo-cache:
required: false
description: 'Enable turbo cache'
default: 'true'
publish-image:
required: false
description: 'Publish image'
default: 'true'
setup:
required: false
description: 'Setup node.js'
default: 'true'

runs:
using: composite

steps:
- name: Login to GitHub Container Registry
if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
if: inputs.publish-image == 'true' &&(github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ inputs.CR_USER }}
password: ${{ inputs.CR_PAT }}

- name: Restore build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: build
path: /tmp/build
Expand All @@ -42,17 +54,20 @@ runs:
cd /tmp/build
tar xzf Rocket.Chat.tar.gz
rm Rocket.Chat.tar.gz
- uses: dtinth/setup-github-actions-caching-for-turbo@v1
- uses: rharkor/[email protected]
# if we are testing a PR from a fork, we already called the turbo cache at this point, so it should be false
if: inputs.turbo-cache == 'true'

- name: Setup NodeJS
uses: ./.github/actions/setup-node
if: inputs.setup == 'true'
with:
node-version: ${{ inputs.node-version }}
cache-modules: true
install: true

- run: yarn build
if: inputs.setup == 'true'
shell: bash

- name: Build Docker images
Expand All @@ -63,9 +78,14 @@ runs:
docker compose -f docker-compose-ci.yml build "${args[@]}"
- name: Publish Docker images to GitHub Container Registry
if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
if: inputs.publish-image == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
shell: bash
run: |
args=(rocketchat ${{ inputs.build-containers }})
docker compose -f docker-compose-ci.yml push "${args[@]}"
- name: Clean up temporary files
shell: bash
run: |
sudo rm -rf /tmp/bundle
5 changes: 3 additions & 2 deletions .github/actions/meteor-build/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ runs:
meteor node -v
git version
- uses: dtinth/setup-github-actions-caching-for-turbo@v1
- uses: rharkor/caching-for-turbo@v1.5

- name: Translation check
shell: bash
Expand Down Expand Up @@ -124,7 +124,8 @@ runs:
tar czf /tmp/Rocket.Chat.tar.gz bundle
- name: Store build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: build
path: /tmp/Rocket.Chat.tar.gz
overwrite: true
1 change: 1 addition & 0 deletions .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ runs:
uses: actions/cache@v3
with:
path: |
.turbo/cache
node_modules
${{ env.DENO_DIR }}
apps/meteor/node_modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-code-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
# docker rmi $(docker image ls -aq)
# df -h

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

- name: Cache TypeCheck
uses: actions/cache@v3
Expand Down
Loading

0 comments on commit 2b90fb7

Please sign in to comment.