Skip to content

Commit

Permalink
Merge branch 'develop' into file-description-char-limit
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinSchoeler authored Nov 18, 2024
2 parents 310c15a + b56d4c5 commit 2babbb1
Show file tree
Hide file tree
Showing 1,173 changed files with 6,139 additions and 5,013 deletions.
5 changes: 5 additions & 0 deletions .changeset/friendly-ravens-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

adds unread badge to sidebar collapser
7 changes: 7 additions & 0 deletions .changeset/green-papayas-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@rocket.chat/model-typings': patch
'@rocket.chat/core-typings': patch
'@rocket.chat/meteor': patch
---

Fixes an issue where updating custom emojis didn’t work as expected, ensuring that uploaded emojis now update correctly and display without any caching problems.
5 changes: 5 additions & 0 deletions .changeset/honest-pumpkins-joke.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

adds missing html attributes in sidebar item templates
5 changes: 5 additions & 0 deletions .changeset/light-terms-ring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes the issue where newly created teams are incorrectly displayed as channels on the sidebar when the DISABLE_DB_WATCHERS environment variable is enabled
5 changes: 5 additions & 0 deletions .changeset/metal-avocados-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/livechat": patch
---

Fixes the 'Finish Chat' option in Livechat appearing before the conversation is started, which caused the action to fail.
5 changes: 5 additions & 0 deletions .changeset/neat-flies-drive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Adds a divider on Create team modal - advanced settings
5 changes: 5 additions & 0 deletions .changeset/old-coins-bow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/apps-engine': patch
---

Fixes an issue that would cause apps to appear disabled after a subprocess restart
5 changes: 5 additions & 0 deletions .changeset/serious-mice-film.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes client-side updates for recent emoji list when custom emojis are modified.
5 changes: 5 additions & 0 deletions .changeset/spotty-ads-knock.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes display of emoji aliases in custom emoji list by adding commas between aliases
5 changes: 5 additions & 0 deletions .changeset/stale-actors-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes `waiting queue` feature. When `Livechat_waiting_queue` setting is enabled, incoming conversations should be sent to the queue instead of being assigned directly.
6 changes: 6 additions & 0 deletions .changeset/unlucky-kangaroos-yawn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---

Updates VoIP field labels from 'Free Extension Numbers' to 'Available Extensions' to better describe the field's purpose and improve clarity.
7 changes: 4 additions & 3 deletions .github/actions/build-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ runs:

steps:
- name: Login to GitHub Container Registry
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
if: inputs.publish-image == 'true' && github.actor != 'dependabot[bot]' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ inputs.CR_USER }}
Expand All @@ -61,6 +61,7 @@ runs:
cd /tmp/build
tar xzf Rocket.Chat.tar.gz
rm Rocket.Chat.tar.gz
- 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'
Expand Down Expand Up @@ -100,7 +101,7 @@ runs:
docker compose -f docker-compose-ci.yml build "${args[@]}"
- name: Publish Docker images to GitHub Container Registry
if: inputs.publish-image == 'true' && (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.actor != 'dependabot[bot]' && (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 }})
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ runs:

- name: Use Node.js ${{ inputs.node-version }}
id: node-version
uses: actions/setup-node@v3.7.0
uses: actions/setup-node@v4.1.0
with:
node-version: ${{ inputs.node-version }}
cache: 'yarn'
Expand Down
198 changes: 41 additions & 157 deletions .github/actions/update-version-durability/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2babbb1

Please sign in to comment.