Skip to content

Commit

Permalink
Merge branch 'develop' into fix/retention-threads
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris committed Jun 20, 2024
2 parents 10ce987 + 1428778 commit db0434c
Show file tree
Hide file tree
Showing 205 changed files with 3,335 additions and 726 deletions.
6 changes: 6 additions & 0 deletions .changeset/breezy-pens-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Removed "Unknown media type" errors on the client side by using `application/octet-stream` as a fallback media type (MIME type) for all files
5 changes: 5 additions & 0 deletions .changeset/chilly-toys-hunt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed "File Upload > Accepted Media Types" setting to allow all type of files uploads
6 changes: 6 additions & 0 deletions .changeset/clean-moose-cover.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Introduced the use of the `API_User_Limit` setting to limit amount of members to simultaneously auto-join a room in a team
5 changes: 5 additions & 0 deletions .changeset/dry-shoes-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes the supported versions problem, where in most cases the data chosen was the oldest
6 changes: 6 additions & 0 deletions .changeset/famous-scissors-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---

Prevent usage of OTR messages with End-to-end Encryption, both feature shouldn't and can't work together.
5 changes: 5 additions & 0 deletions .changeset/fuzzy-readers-bake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes issues with loading license modules when loading the page while logged out
6 changes: 6 additions & 0 deletions .changeset/gold-flowers-shake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Added E2EE room setup header, with just limited functionality and room actions.
5 changes: 5 additions & 0 deletions .changeset/green-camels-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed 2 issues with `QueueInactivityMonitor` callback. This callback was in charge of scheduling the job that would close the inquiry, but it was checking on a property that didn't exist. This caused the callback to early return without scheduling the job, making the feature to not to work.
4 changes: 4 additions & 0 deletions .changeset/grumpy-games-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
'@rocket.chat/meteor': patch
---
Changed streaming logic to prevent hidden system messages from being broadcasted through `stream-room-messages`.
5 changes: 5 additions & 0 deletions .changeset/happy-cameras-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed an issue where private encrypted room creation was being forced even when E2EE feature was disabled.
5 changes: 5 additions & 0 deletions .changeset/healthy-clouds-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/gazzodown": patch
---

Fixes long katex lines overflowing the message component
5 changes: 5 additions & 0 deletions .changeset/hungry-waves-lick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed file name being incorrectly sent from the client when uploading assets
6 changes: 6 additions & 0 deletions .changeset/lastmessage-e2ee.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 last message preview in Sidebar for E2E Ecrypted channels
5 changes: 5 additions & 0 deletions .changeset/nervous-wolves-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes the issue not allowing users without edit-room-retention-policy permission try to edit the room with the retention policy enabled
5 changes: 5 additions & 0 deletions .changeset/odd-goats-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where settings code mirror is not being displayed correctly in full screen mode
6 changes: 6 additions & 0 deletions .changeset/plenty-buses-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Disable "Reply in direct message", "Copy link" and "Forward message" message menu items for encrypted messages as they don't apply to encrypted messages and also disable apps menu items and show a warning.
6 changes: 6 additions & 0 deletions .changeset/popular-bulldogs-accept.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': patch
'@rocket.chat/meteor': patch
---

Disable slash commands in encrypted rooms and show a disabled warning.
5 changes: 5 additions & 0 deletions .changeset/proud-coats-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fix the sorting by last chat in Contact Center table
8 changes: 8 additions & 0 deletions .changeset/rude-llamas-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
"@rocket.chat/omnichannel-services": patch
---

Added a new setting `Restrict files access to users who can access room` that controls file visibility. This new setting allows users that "can access a room" to also download the files that are there. This is specially important for users with livechat manager or monitor roles, or agents that have special permissions to view closed rooms, since this allows them to download files on the conversation even after the conversation is closed.
New setting is disabled by default and it is mutually exclusive with the setting `Restrict file access to room members` since this allows _more_ types of users to download files.
41 changes: 41 additions & 0 deletions .changeset/tame-weeks-shout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
'@rocket.chat/omnichannel-services': minor
'rocketchat-services': minor
'@rocket.chat/omnichannel-transcript': minor
'@rocket.chat/authorization-service': minor
'@rocket.chat/web-ui-registration': minor
'@rocket.chat/stream-hub-service': minor
'@rocket.chat/uikit-playground': minor
'@rocket.chat/presence-service': minor
'@rocket.chat/fuselage-ui-kit': minor
'@rocket.chat/instance-status': minor
'@rocket.chat/account-service': minor
'@rocket.chat/mock-providers': minor
'@rocket.chat/api-client': minor
'@rocket.chat/ddp-client': minor
'@rocket.chat/pdf-worker': minor
'@rocket.chat/ui-theming': minor
'@rocket.chat/core-services': minor
'@rocket.chat/model-typings': minor
'@rocket.chat/ui-video-conf': minor
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/ddp-streamer': minor
'@rocket.chat/queue-worker': minor
'@rocket.chat/presence': minor
'@rocket.chat/ui-composer': minor
'@rocket.chat/ui-contexts': minor
'@rocket.chat/license': minor
'@rocket.chat/gazzodown': minor
'@rocket.chat/ui-avatar': minor
'@rocket.chat/ui-client': minor
'@rocket.chat/livechat': minor
'@rocket.chat/models': minor
'@rocket.chat/ui-kit': minor
'@rocket.chat/apps': minor
'@rocket.chat/cron': minor
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

New runtime for apps in the Apps-Engine based on the Deno platform
5 changes: 5 additions & 0 deletions .changeset/thin-suns-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes issues causing nonstop sound notification when taking a chat from the `Current Chats` view
5 changes: 5 additions & 0 deletions .changeset/three-squids-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed Encrypted thread main message reactivity issues. Earlier the encrypted thread main message was having some reactivity issues and flaky behavior.
5 changes: 5 additions & 0 deletions .changeset/weak-books-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Forces the highlight code language registration, preventing it to not being available when trying to use on the UI
8 changes: 8 additions & 0 deletions .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ inputs:
install:
required: false
type: boolean
deno-dir:
required: false
type: string
default: ~/.deno-cache

outputs:
node-version:
Expand All @@ -19,13 +23,17 @@ runs:
using: composite

steps:
- run: echo 'DENO_DIR=${{ inputs.deno-dir }}' >> $GITHUB_ENV
shell: bash

- name: Cache Node Modules
if: inputs.cache-modules
id: cache-node-modules
uses: actions/cache@v3
with:
path: |
node_modules
${{ env.DENO_DIR }}
apps/meteor/node_modules
apps/meteor/ee/server/services/node_modules
key: node-modules-${{ hashFiles('yarn.lock') }}
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/ci-test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,13 @@ jobs:
name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }})${{ matrix.mongodb-version == '6.0' && ' - Alpine' || '' }}

steps:
- name: Collect Workflow Telemetry
uses: catchpoint/workflow-telemetry-action@v2
with:
theme: dark
job_summary: true
comment_on_pr: false

- 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')
uses: docker/login-action@v2
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/ci-test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ jobs:
name: Unit Tests

steps:
- name: Collect Workflow Telemetry
uses: catchpoint/workflow-telemetry-action@v2
with:
theme: dark
job_summary: true
comment_on_pr: false
- uses: actions/checkout@v4

- name: Setup NodeJS
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,12 @@ jobs:
runs-on: ubuntu-20.04

steps:
- name: Collect Workflow Telemetry
uses: catchpoint/workflow-telemetry-action@v2
with:
theme: dark
job_summary: true
comment_on_pr: false
- name: Github Info
run: |
echo "GITHUB_ACTION: $GITHUB_ACTION"
Expand All @@ -192,6 +198,12 @@ jobs:
runs-on: ubuntu-20.04

steps:
- name: Collect Workflow Telemetry
uses: catchpoint/workflow-telemetry-action@v2
with:
theme: dark
job_summary: true
comment_on_pr: false
- name: Github Info
run: |
echo "GITHUB_ACTION: $GITHUB_ACTION"
Expand Down
25 changes: 14 additions & 11 deletions apps/meteor/.docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,24 @@ RUN groupadd -g 65533 -r rocketchat \
# --chown requires Docker 17.12 and works only on Linux
ADD --chown=rocketchat:rocketchat . /app

# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV DEPLOY_METHOD=docker \
NODE_ENV=production \
MONGO_URL=mongodb://mongo:27017/rocketchat \
HOME=/tmp \
PORT=3000 \
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads \
DENO_DIR=/usr/share/deno

RUN aptMark="$(apt-mark showmanual)" \
&& apt-get install -y --no-install-recommends g++ make python3 ca-certificates \
&& cd /app/bundle/programs/server \
&& npm install \
&& cd npm/node_modules/isolated-vm \
&& npm install \
&& cd npm/node_modules/isolated-vm \
&& npm install \
&& cd /app/bundle/programs/server/npm/node_modules/@rocket.chat/apps-engine/deno-runtime \
&& ../../../deno-bin/bin/deno cache main.ts \
&& apt-mark auto '.*' > /dev/null \
&& apt-mark manual $aptMark > /dev/null \
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
Expand All @@ -37,15 +49,6 @@ VOLUME /app/uploads

WORKDIR /app/bundle

# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV DEPLOY_METHOD=docker \
NODE_ENV=production \
MONGO_URL=mongodb://mongo:27017/rocketchat \
HOME=/tmp \
PORT=3000 \
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads

EXPOSE 3000

CMD ["node", "main.js"]
Loading

0 comments on commit db0434c

Please sign in to comment.