Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into chore/bump-storybo…
Browse files Browse the repository at this point in the history
…k-fuselage-ui-kit-cloud-surface
  • Loading branch information
dougfabris committed Nov 19, 2024
2 parents df8e534 + 6ba7372 commit 7dc8e55
Show file tree
Hide file tree
Showing 1,246 changed files with 8,806 additions and 8,361 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.
6 changes: 6 additions & 0 deletions .changeset/lemon-foxes-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---

Fixes message character limit not being applied to file upload descriptions
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/seven-otters-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Sends server statistics only once a day despite multiple instance being started at different times.
6 changes: 6 additions & 0 deletions .changeset/silent-steaks-happen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Improves the customizability of the naming of automatic Persistent video calls discussions, allowing the date of the call to be in different parts of the name, using the `[date]` keyword.
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/sweet-needles-melt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes edge case of thread unread not being added to unread group
5 changes: 5 additions & 0 deletions .changeset/swift-suns-perform.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/livechat": patch
---

Fixes livechat popout mode not working correctly in cross domain situations
4 changes: 4 additions & 0 deletions .changeset/tricky-trees-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
"@rocket.chat/meteor": patch
---
Adds login and permission validation for resetIrcConnection method
6 changes: 6 additions & 0 deletions .changeset/twelve-horses-suffer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Adds a confirmation modal to the cancel subscription action
6 changes: 6 additions & 0 deletions .changeset/twenty-news-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Disables the possiblity to upload exempted apps
5 changes: 5 additions & 0 deletions .changeset/unlucky-wasps-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where resizable handler renders over the expanded thread view while using contextualbarResizable feature preview
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
9 changes: 9 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,15 @@ jobs:
run: |
docker run --rm -w /app/bundle/programs/server/npm/node_modules/matrix-appservice-bridge ghcr.io/rocketchat/rocket.chat:$RC_DOCKER_TAG -e 'require(".")'
- name: Rename official Docker tag to GitHub Container Registry
if: matrix.platform == needs.release-versions.outputs.official-platform
run: |
IMAGE_NAME_BASE="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}"
echo "Push Docker image: ${IMAGE_NAME_BASE}.official"
docker tag ${IMAGE_NAME_BASE}.${{matrix.platform}} ${IMAGE_NAME_BASE}.official
docker push ${IMAGE_NAME_BASE}.official
build-gh-docker:
name: 🚢 Build Docker Images for Production
needs: [build-prod, release-versions]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Release candidate cut
on:
schedule:
- cron: '28 0 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
- cron: '28 12 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
jobs:
new-release:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-version-durability.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v4.0.4
uses: actions/setup-node@v4.1.0
with:
node-version: '20.18.0'

Expand Down
2 changes: 0 additions & 2 deletions .kodiak.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ include_coauthors=true
[merge.automerge_dependencies]
versions = ["minor", "patch"]
usernames = ["dependabot"]
[update]
ignored_usernames = ["dependabot"]
[approve]
auto_approve_usernames = ["dependabot"]
1 change: 1 addition & 0 deletions apps/meteor/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
!/client/.eslintrc.js
!/ee/client/.eslintrc.js
/storybook-static/
/packages/
Loading

0 comments on commit 7dc8e55

Please sign in to comment.