Skip to content

Commit

Permalink
Merge branch 'develop' into feat/increase-the-number-of-auto-join-mem…
Browse files Browse the repository at this point in the history
…bers
  • Loading branch information
Gustrb authored Jun 4, 2024
2 parents 1702b1c + 3da6e14 commit b50ec18
Show file tree
Hide file tree
Showing 543 changed files with 5,519 additions and 1,684 deletions.
5 changes: 0 additions & 5 deletions .changeset/angry-rocks-try.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/breezy-geckos-sparkle.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/chilly-poems-explode.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"@rocket.chat/ui-kit": minor
---

Introduced new elements for apps to select channels
Introduced new elements for apps to select users
5 changes: 5 additions & 0 deletions .changeset/cuddly-maps-peel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed streams being called when the user is not logged in
5 changes: 0 additions & 5 deletions .changeset/fair-grapes-thank.md

This file was deleted.

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

Fixed codeBlock styles in light mode
5 changes: 0 additions & 5 deletions .changeset/flat-starfishes-crash.md

This file was deleted.

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

When using `DISABLE_DB_WATCHERS=true` this fixes message updates with URLs that were missing the link preview.
5 changes: 0 additions & 5 deletions .changeset/fresh-students-remember.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/gorgeous-lizards-shave.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/lazy-gorilas-shop.md

This file was deleted.

9 changes: 0 additions & 9 deletions .changeset/nasty-swans-compete.md

This file was deleted.

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

Fixes an issue not rendering the proper error and empty state on users in role table
6 changes: 6 additions & 0 deletions .changeset/real-bobcats-train.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/rest-typings': patch
'@rocket.chat/meteor': patch
---

Don't show Join default channels option on edit user form.
5 changes: 0 additions & 5 deletions .changeset/rich-bananas-complain.md

This file was deleted.

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

Fix user not being set as online when setting "Use REST instead of websocket for Meteor calls" is disabled
5 changes: 0 additions & 5 deletions .changeset/shiny-crabs-peel.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/shy-oranges-provide.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/silly-clocks-return.md

This file was deleted.

8 changes: 8 additions & 0 deletions .changeset/slow-cars-press.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Introduced a new setting which doesn't allow users to access encrypted rooms until E2EE is configured and also doesn't allow users to send un-encrypted messages in encrypted rooms.

New room setup for E2EE feature which helps users to setup their E2EE keys and introduced states to E2EE feature.
7 changes: 7 additions & 0 deletions .changeset/smooth-knives-turn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": patch
---

Executing a logout and login action in the same "tab/instance", some streams were not being recreated, causing countless types of bugs.

PS: as a workaround reloading after logout or login in also solves the problem.
5 changes: 0 additions & 5 deletions .changeset/strange-bears-dance.md

This file was deleted.

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

Clicking on a message attachment link in the Desktop App will now initiate a direct download of the attachment only when the attachment is not a PDF file
5 changes: 0 additions & 5 deletions .changeset/tall-wombats-love.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/unlucky-berries-guess.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/warm-squids-deliver.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/weak-starfishes-fail.md

This file was deleted.

8 changes: 0 additions & 8 deletions .changeset/weak-turkeys-sit.md

This file was deleted.

9 changes: 0 additions & 9 deletions .changeset/wicked-points-deliver.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/wild-teachers-design.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/yellow-lies-judge.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/young-yaks-suffer.md

This file was deleted.

2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ apps/meteor/server/startup/migrations @RocketChat/Architecture
/apps/meteor/ee/app/canned-responses @RocketChat/omnichannel
/apps/meteor/ee/app/livechat @RocketChat/omnichannel
/apps/meteor/ee/app/livechat-enterprise @RocketChat/omnichannel
/apps/meteor/ee/client/omnichannel @RocketChat/omnichannel
/apps/meteor/client/omnichannel @RocketChat/omnichannel
/apps/meteor/client/components/omnichannel @RocketChat/omnichannel
/apps/meteor/client/components/voip @RocketChat/omnichannel
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,7 @@ jobs:

strategy:
matrix:
service: ['account', 'authorization', 'ddp-streamer', 'presence', 'stream-hub']
service: ['account', 'authorization', 'ddp-streamer', 'omnichannel-transcript', 'presence', 'queue-worker', 'stream-hub']

steps:
- name: Login to DockerHub
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-title-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ jobs:
check:
runs-on: ubuntu-latest
steps:
- uses: thehanimo/pr-title-checker@v1.3.7
- uses: thehanimo/pr-title-checker@v1.4.1
with:
GITHUB_TOKEN: ${{ secrets.RC_TITLE_CHECKER }}
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
steps:
- uses: actions/stale@v5
with:
days-before-issue-stale: 10
days-before-issue-close: 4
days-before-issue-stale: 14
days-before-issue-close: 14
any-of-labels: 'stat: need more info,stat: waiting response'
stale-issue-label: "stat: no response"
stale-issue-message: "This issue has been marked as stale because there has been no further activity in the last 10 days. If the issue remains stale for the next 4 days (a total of 14 days with no activity), then it will be assumed that the question has been resolved and the issue will be automatically closed."
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ module.exports = {
'../client/**/*.stories.{js,tsx}',
'../app/**/*.stories.{js,tsx}',
'../ee/app/**/*.stories.{js,tsx}',
'../ee/client/**/*.stories.{js,tsx}',
],
addons: [
'@storybook/addon-essentials',
Expand Down
Loading

0 comments on commit b50ec18

Please sign in to comment.