Skip to content

Commit

Permalink
Merge branch 'develop' into testing_feat/multiple_files_in_one_msg
Browse files Browse the repository at this point in the history
  • Loading branch information
dougfabris authored Dec 9, 2024
2 parents 66bb3f1 + c2cf2d7 commit 4e1ef0c
Show file tree
Hide file tree
Showing 757 changed files with 16,379 additions and 6,405 deletions.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1732728542480.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Bump @rocket.chat/meteor version.
5 changes: 5 additions & 0 deletions .changeset/chilly-pants-hunt.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Removes a validation that allowed only the room creator to propagate E2EE room keys. This was causing issues when the rooms were created via apps or some other integration, as the creator may not be online or able to create E2EE keys
5 changes: 5 additions & 0 deletions .changeset/cold-mangos-impress.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixed an issue that caused clients to not properly receive certain server notifications right after login
5 changes: 5 additions & 0 deletions .changeset/curly-snails-walk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes issue that caused the livechat appearance form not be able to submit on CE servers
5 changes: 5 additions & 0 deletions .changeset/green-shirts-fold.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes condition causing Omnichannel queue to start more than once.
5 changes: 5 additions & 0 deletions .changeset/happy-stingrays-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes issue that could cause multiple discussions to be created when creating it from a message action
6 changes: 6 additions & 0 deletions .changeset/lazy-avocados-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---

Improves thread metrics featuring user avatars, better titles and repositioned elements.
5 changes: 5 additions & 0 deletions .changeset/lucky-mirrors-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where premium settings were using the wrong `Tag` variant in Omnichannel Appearance configuration
6 changes: 6 additions & 0 deletions .changeset/mean-cobras-sneeze.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@rocket.chat/rest-typings': minor
'@rocket.chat/meteor': minor
---

Adds cursor pagination on chat.syncMessages endpoint
5 changes: 5 additions & 0 deletions .changeset/metal-wolves-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/ui-voip": patch
---

Fixes an issue preventing VoIP permission updates from being properly reflected in the UI.
5 changes: 5 additions & 0 deletions .changeset/pink-dodos-greet.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes sidepanel not replicating sidebar sort preference
5 changes: 5 additions & 0 deletions .changeset/plenty-snakes-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": minor
---

Adds a new route to allow fetching avatars by the user's id `/avatar/uid/<UserID>`
17 changes: 17 additions & 0 deletions .changeset/popular-queens-brake.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
'@rocket.chat/model-typings': minor
'@rocket.chat/core-typings': minor
'@rocket.chat/rest-typings': minor
'@rocket.chat/apps-engine': minor
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

These changes aims to add:
- A brand-new omnichannel contact profile
- The ability to communicate with known contacts only
- Communicate with verified contacts only
- Merge verified contacts across different channels
- Block contact channels
- Resolve conflicting contact information when registered via different channels
- An advanced contact center filters
111 changes: 111 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"mode": "pre",
"tag": "rc",
"initialVersions": {
"@rocket.chat/meteor": "7.1.0-develop",
"rocketchat-services": "2.0.0",
"@rocket.chat/uikit-playground": "0.6.0",
"@rocket.chat/account-service": "0.4.9",
"@rocket.chat/authorization-service": "0.4.9",
"@rocket.chat/ddp-streamer": "0.3.9",
"@rocket.chat/omnichannel-transcript": "0.4.9",
"@rocket.chat/presence-service": "0.4.9",
"@rocket.chat/queue-worker": "0.4.9",
"@rocket.chat/stream-hub-service": "0.4.9",
"@rocket.chat/license": "1.0.0",
"@rocket.chat/network-broker": "0.1.1",
"@rocket.chat/omnichannel-services": "0.3.6",
"@rocket.chat/pdf-worker": "0.2.6",
"@rocket.chat/presence": "0.2.9",
"@rocket.chat/ui-theming": "0.4.0",
"@rocket.chat/account-utils": "0.0.2",
"@rocket.chat/agenda": "0.1.0",
"@rocket.chat/api-client": "0.2.9",
"@rocket.chat/apps": "0.2.0",
"@rocket.chat/apps-engine": "1.47.0",
"@rocket.chat/base64": "1.0.13",
"@rocket.chat/cas-validate": "0.0.2",
"@rocket.chat/core-services": "0.7.1",
"@rocket.chat/core-typings": "7.1.0-develop",
"@rocket.chat/cron": "0.1.9",
"@rocket.chat/ddp-client": "0.3.9",
"@rocket.chat/eslint-config": "0.7.0",
"@rocket.chat/favicon": "0.0.2",
"@rocket.chat/freeswitch": "1.0.0",
"@rocket.chat/fuselage-ui-kit": "12.0.0",
"@rocket.chat/gazzodown": "12.0.0",
"@rocket.chat/i18n": "1.0.0",
"@rocket.chat/instance-status": "0.1.9",
"@rocket.chat/jest-presets": "0.0.1",
"@rocket.chat/jwt": "0.1.1",
"@rocket.chat/livechat": "1.20.1",
"@rocket.chat/log-format": "0.0.2",
"@rocket.chat/logger": "0.0.2",
"@rocket.chat/message-parser": "0.31.31",
"@rocket.chat/mock-providers": "0.1.4",
"@rocket.chat/model-typings": "1.0.0",
"@rocket.chat/models": "1.0.0",
"@rocket.chat/poplib": "0.0.2",
"@rocket.chat/password-policies": "0.0.2",
"@rocket.chat/patch-injection": "0.0.1",
"@rocket.chat/peggy-loader": "0.31.27",
"@rocket.chat/random": "1.2.2",
"@rocket.chat/release-action": "2.2.3",
"@rocket.chat/release-changelog": "0.1.0",
"@rocket.chat/rest-typings": "7.1.0-develop",
"@rocket.chat/server-cloud-communication": "0.0.2",
"@rocket.chat/server-fetch": "0.0.3",
"@rocket.chat/sha256": "1.0.10",
"@rocket.chat/tools": "0.2.2",
"@rocket.chat/tracing": "0.0.1",
"@rocket.chat/ui-avatar": "8.0.0",
"@rocket.chat/ui-client": "12.0.0",
"@rocket.chat/ui-composer": "0.4.0",
"@rocket.chat/ui-contexts": "12.0.0",
"@rocket.chat/ui-kit": "0.37.0",
"@rocket.chat/ui-video-conf": "12.0.0",
"@rocket.chat/ui-voip": "2.0.0",
"@rocket.chat/web-ui-registration": "12.0.0"
},
"changesets": [
"bump-patch-1732728542480",
"clean-flies-collect",
"curvy-flies-greet",
"fair-colts-remain",
"forty-gorillas-kneel",
"friendly-ravens-teach",
"green-papayas-thank",
"happy-stingrays-provide",
"honest-pumpkins-joke",
"lazy-avocados-whisper",
"lemon-foxes-carry",
"light-terms-ring",
"mean-cobras-sneeze",
"metal-avocados-serve",
"neat-flies-drive",
"nervous-rivers-fry",
"old-coins-bow",
"pink-dodos-greet",
"plenty-snakes-dream",
"popular-queens-brake",
"real-jeans-worry",
"serious-mice-film",
"seven-berries-check",
"seven-otters-fold",
"silent-steaks-happen",
"smart-radios-reflect",
"spicy-spiders-search",
"spotty-ads-knock",
"stale-actors-enjoy",
"sweet-needles-melt",
"swift-suns-perform",
"three-dragons-brush",
"tricky-trees-destroy",
"twelve-horses-suffer",
"twenty-news-own",
"two-guests-tan",
"unlucky-kangaroos-yawn",
"unlucky-wasps-check",
"weak-trees-exercise"
]
}
5 changes: 5 additions & 0 deletions .changeset/proud-cups-share.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixes `im.counters` endpoint returning `null` on `unread` messages property for users that have never opened the queried DM
5 changes: 5 additions & 0 deletions .changeset/real-crabs-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': minor
---

Organizes App Settings interface by introducing section-based accordion groups to improve navigation and readability for administrators.
5 changes: 5 additions & 0 deletions .changeset/selfish-fishes-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fixes mail export form "To additional emails" field validation
6 changes: 6 additions & 0 deletions .changeset/seven-berries-check.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": patch
"@rocket.chat/i18n": patch
---

Adds "Master volume" and "Call ringer volume" to the user preferences sound section.
5 changes: 5 additions & 0 deletions .changeset/sour-guests-whisper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue which caused action menu to be clipped in moderation page on smaller screens for better usability.
5 changes: 5 additions & 0 deletions .changeset/strange-bulldogs-roll.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Sorts the list of language options by name correctly
5 changes: 5 additions & 0 deletions .changeset/strange-countries-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

fixed an issue that caused the conference call ringer to fail to accept calls if the user logged out and in again
8 changes: 8 additions & 0 deletions .changeset/three-dragons-brush.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@rocket.chat/apps-engine': minor
'@rocket.chat/livechat': minor
'@rocket.chat/i18n': minor
'@rocket.chat/meteor': minor
---

Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions
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/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/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ jobs:
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
if: matrix.platform == needs.release-versions.outputs.official-platform && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop') && github.actor != 'dependabot[bot]'
run: |
IMAGE_NAME_BASE="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: 'Code scanning - action'

on:
push:
branches-ignore:
- dependabot/**
pull_request:
schedule:
- cron: '0 13 * * *'
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/[email protected].2
- uses: thehanimo/[email protected].3
with:
GITHUB_TOKEN: ${{ secrets.RC_TITLE_CHECKER }}
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
62 changes: 62 additions & 0 deletions .yarn/patches/swiper-npm-11.1.14-8126fa478a.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
diff --git a/package.json b/package.json
index 9f37b1dd9e3ea128aafb0ceef83641e864474308..795e15b1b008596f0a278ff43cb1103794c10d9d 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
"default": "./swiper-bundle.mjs"
},
"./css": "./swiper.css",
+ "./swiper.css": "./swiper.css",
"./css/bundle": "./swiper-bundle.css",
"./swiper-bundle.css": "./swiper-bundle.css",
"./css/a11y": "./modules/a11y.css",
@@ -49,6 +50,7 @@
"./css/thumbs": "./modules/thumbs.css",
"./css/virtual": "./modules/virtual.css",
"./css/zoom": "./modules/zoom.css",
+ "./modules/zoom.css": "./modules/zoom.css",
"./less": "./swiper.less",
"./less/a11y": "./modules/a11y.less",
"./less/autoplay": "./modules/autoplay.less",
@@ -136,6 +138,10 @@
"types": "./swiper-react.d.ts",
"default": "./swiper-react.mjs"
},
+ "./swiper-react.mjs": {
+ "types": "./swiper-react.d.ts",
+ "default": "./swiper-react.mjs"
+ },
"./vue": {
"types": "./swiper-vue.d.ts",
"default": "./swiper-vue.mjs"
@@ -144,6 +150,10 @@
"types": "./types/modules/index.d.ts",
"default": "./modules/index.mjs"
},
+ "./modules/index.mjs": {
+ "types": "./types/modules/index.d.ts",
+ "default": "./modules/index.mjs"
+ },
"./types": "./types/index.d.ts",
"./package.json": "./package.json"
},
@@ -152,6 +162,9 @@
"modules": [
"./types/modules/index.d.ts"
],
+ "modules/index.mjs": [
+ "./types/modules/index.d.ts"
+ ],
"element": [
"./swiper-element.d.ts"
],
@@ -161,6 +174,9 @@
"react": [
"./swiper-react.d.ts"
],
+ "swiper-react.mjs": [
+ "./swiper-react.d.ts"
+ ],
"vue": [
"./swiper-vue.d.ts"
]
Loading

0 comments on commit 4e1ef0c

Please sign in to comment.