-
Notifications
You must be signed in to change notification settings - Fork 10.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feat/integrations-script-engine
- Loading branch information
Showing
204 changed files
with
2,954 additions
and
1,692 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
--- | ||
|
||
fix: Managers allowed to make deactivated agent's available |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
--- | ||
|
||
load sounds right before playing them |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@rocket.chat/meteor': patch | ||
--- | ||
|
||
Fix moment timestamps language change |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@rocket.chat/meteor': patch | ||
--- | ||
|
||
Disabled call to tags enterprise endpoint when on community license |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
--- | ||
|
||
Fixed Importer Progress Bar progress indicator | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
--- | ||
|
||
Fix engagement dashboard not showing data |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
--- | ||
|
||
feat: Add flag to disable teams mention via troubleshoot page |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
"@rocket.chat/model-typings": patch | ||
--- | ||
|
||
fix: agent role being removed upon user deactivation |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@rocket.chat/meteor': patch | ||
--- | ||
|
||
Fixed selected departments not being displayed due to pagination |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- | ||
'@rocket.chat/model-typings': patch | ||
'@rocket.chat/meteor': patch | ||
--- | ||
|
||
Change SAU aggregation to consider only sessions from few days ago instead of the whole past. | ||
|
||
This is particularly important for large workspaces in case the cron job did not run for some time, in that case the amount of sessions would accumulate and the aggregation would take a long time to run. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
--- | ||
|
||
chore: Increase cache time from 5s to 10s on `getUnits` helpers. This should reduce the number of DB calls made by this method to fetch the unit limitations for a user. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
--- | ||
"@rocket.chat/meteor": patch | ||
"@rocket.chat/core-typings": patch | ||
"@rocket.chat/model-typings": patch | ||
--- | ||
|
||
Fixes a problem where the calculated time for considering the visitor abandonment was the first message from the visitor and not the visitor's reply to the agent. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
'@rocket.chat/rest-typings': minor | ||
'@rocket.chat/meteor': minor | ||
--- | ||
|
||
fix: missing params on updateOwnBasicInfo endpoint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
--- | ||
'@rocket.chat/ui-client': minor | ||
'@rocket.chat/meteor': minor | ||
--- | ||
|
||
feat: add ChangePassword field to Account/Security |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
'@rocket.chat/meteor': minor | ||
--- | ||
|
||
Fixed the issue of apps icon uneven alignment in case of missing icons inside message composer toolbar & message toolbar menu. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
name: 'Meteor Docker' | ||
|
||
inputs: | ||
CR_USER: | ||
required: true | ||
CR_PAT: | ||
required: true | ||
node-version: | ||
required: true | ||
description: 'Node version' | ||
type: string | ||
platform: | ||
required: false | ||
description: 'Platform' | ||
type: string | ||
|
||
runs: | ||
using: composite | ||
|
||
steps: | ||
- name: Login to GitHub Container Registry | ||
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 | ||
with: | ||
name: build | ||
path: /tmp/build | ||
|
||
- name: Unpack build | ||
shell: bash | ||
run: | | ||
cd /tmp/build | ||
tar xzf Rocket.Chat.tar.gz | ||
rm Rocket.Chat.tar.gz | ||
- uses: dtinth/setup-github-actions-caching-for-turbo@v1 | ||
|
||
- name: Setup NodeJS | ||
uses: ./.github/actions/setup-node | ||
with: | ||
node-version: ${{ inputs.node-version }} | ||
cache-modules: true | ||
install: true | ||
|
||
- run: yarn build | ||
shell: bash | ||
|
||
- name: Build Docker images | ||
shell: bash | ||
run: | | ||
args=(rocketchat) | ||
if [[ '${{ inputs.platform }}' = 'alpine' ]]; then | ||
args+=($SERVICES_PUBLISH) | ||
fi; | ||
docker compose -f docker-compose-ci.yml build "${args[@]}" | ||
- name: Publish Docker images to GitHub Container Registry | ||
shell: bash | ||
run: | | ||
args=(rocketchat) | ||
if [[ '${{ inputs.platform }}' = 'alpine' ]]; then | ||
args+=($SERVICES_PUBLISH) | ||
fi; | ||
docker compose -f docker-compose-ci.yml push "${args[@]}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,129 @@ | ||
name: 'Meteor Build' | ||
|
||
inputs: | ||
coverage: | ||
required: false | ||
description: 'Enable coverage' | ||
type: boolean | ||
reset-meteor: | ||
required: false | ||
description: 'Reset Meteor' | ||
type: boolean | ||
node-version: | ||
required: true | ||
description: 'Node version' | ||
type: string | ||
|
||
runs: | ||
using: composite | ||
|
||
steps: | ||
- name: Set Swap Space | ||
uses: pierotofy/set-swap-space@master | ||
with: | ||
swap-size-gb: 4 | ||
|
||
- name: Setup NodeJS | ||
uses: ./.github/actions/setup-node | ||
with: | ||
node-version: ${{ inputs.node-version }} | ||
cache-modules: true | ||
install: true | ||
|
||
# - name: Free disk space | ||
# run: | | ||
# sudo apt clean | ||
# docker rmi $(docker image ls -aq) | ||
# df -h | ||
|
||
- name: Cache vite | ||
uses: actions/cache@v3 | ||
with: | ||
path: ./node_modules/.vite | ||
key: vite-local-cache-${{ runner.OS }}-${{ hashFiles('package.json') }} | ||
restore-keys: | | ||
vite-local-cache-${{ runner.os }}- | ||
- name: Cache meteor local | ||
uses: actions/cache@v3 | ||
with: | ||
path: ./apps/meteor/.meteor/local | ||
key: meteor-local-cache-${{ runner.OS }}-${{ hashFiles('apps/meteor/.meteor/versions') }} | ||
restore-keys: | | ||
meteor-local-cache-${{ runner.os }}- | ||
- name: Cache meteor | ||
uses: actions/cache@v3 | ||
with: | ||
path: ~/.meteor | ||
key: meteor-cache-${{ runner.OS }}-${{ hashFiles('apps/meteor/.meteor/release') }} | ||
restore-keys: | | ||
meteor-cache-${{ runner.os }}- | ||
- name: Install Meteor | ||
shell: bash | ||
run: | | ||
# Restore bin from cache | ||
set +e | ||
METEOR_SYMLINK_TARGET=$(readlink ~/.meteor/meteor) | ||
METEOR_TOOL_DIRECTORY=$(dirname "$METEOR_SYMLINK_TARGET") | ||
set -e | ||
LAUNCHER=$HOME/.meteor/$METEOR_TOOL_DIRECTORY/scripts/admin/launch-meteor | ||
if [ -e $LAUNCHER ] | ||
then | ||
echo "Cached Meteor bin found, restoring it" | ||
sudo cp "$LAUNCHER" "/usr/local/bin/meteor" | ||
else | ||
echo "No cached Meteor bin found." | ||
fi | ||
# only install meteor if bin isn't found | ||
command -v meteor >/dev/null 2>&1 || curl https://install.meteor.com | sed s/--progress-bar/-sL/g | /bin/sh | ||
- name: Versions | ||
shell: bash | ||
run: | | ||
npm --versions | ||
yarn -v | ||
node -v | ||
meteor --version | ||
meteor npm --versions | ||
meteor node -v | ||
git version | ||
- uses: dtinth/setup-github-actions-caching-for-turbo@v1 | ||
|
||
- name: Translation check | ||
shell: bash | ||
run: yarn turbo run translation-check | ||
|
||
- name: Reset Meteor | ||
shell: bash | ||
if: ${{ inputs.reset-meteor == 'true' }} | ||
working-directory: ./apps/meteor | ||
run: meteor reset | ||
|
||
- name: Build Rocket.Chat From Pull Request | ||
shell: bash | ||
if: startsWith(github.ref, 'refs/pull/') == true | ||
env: | ||
METEOR_PROFILE: 1000 | ||
BABEL_ENV: ${{ inputs.coverage == 'true' && 'coverage' || '' }} | ||
run: 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: | | ||
cd /tmp/dist | ||
tar czf /tmp/Rocket.Chat.tar.gz bundle | ||
- name: Store build | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: build | ||
path: /tmp/Rocket.Chat.tar.gz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.