Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into livechat-tests
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinSchoeler committed Nov 30, 2023
2 parents b06f616 + d71876c commit ca6b0c5
Show file tree
Hide file tree
Showing 414 changed files with 7,845 additions and 4,898 deletions.
5 changes: 5 additions & 0 deletions .changeset/bump-patch-1699738736996.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/bump-patch-1699940713809.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/bump-patch-1699991612617.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/bump-patch-1699998565522.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/bump-patch-1700263798234.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/cool-timers-fix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed issue with read receipts for older messages not being created on the first time a user reads a DM
5 changes: 5 additions & 0 deletions .changeset/giant-dancers-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed an `UnhandledPromiseRejection` error on `PUT livechat/departments/:_id` endpoint when `agents` array failed validation
5 changes: 5 additions & 0 deletions .changeset/great-kings-tickle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Off the record feature was calling a deprecated and useless method.
5 changes: 5 additions & 0 deletions .changeset/honest-socks-sniff.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Google Maps and Katex config settings were not visible
5 changes: 5 additions & 0 deletions .changeset/loud-foxes-grin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: Visitor message not being sent to webhook due to wrong validation of settings
5 changes: 5 additions & 0 deletions .changeset/ninety-files-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

regression: changed UniqueID modal being displayed wrongly during startup
7 changes: 7 additions & 0 deletions .changeset/old-buckets-camp.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": patch
---

Add the date and time to the email sent when a new device logs in


12 changes: 12 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
"brown-donuts-drive",
"bump-patch-1699478965737",
"bump-patch-1699591347357",
"bump-patch-1699738736996",
"bump-patch-1699940713809",
"bump-patch-1699991612617",
"bump-patch-1699998565522",
"bump-patch-1700263798234",
"cool-rockets-talk",
"cool-zoos-move",
"cuddly-ties-run",
Expand All @@ -74,6 +79,7 @@
"gentle-radios-relate",
"heavy-ads-carry",
"hip-pans-argue",
"honest-socks-sniff",
"khaki-feet-dance",
"kind-books-love",
"large-pandas-beam",
Expand All @@ -83,7 +89,9 @@
"lucky-vans-develop",
"nice-chairs-add",
"ninety-carrots-flow",
"ninety-files-sing",
"odd-hounds-thank",
"old-buckets-camp",
"old-zoos-hang",
"perfect-onions-develop",
"perfect-pianos-yawn",
Expand All @@ -93,7 +101,9 @@
"quiet-phones-reply",
"rich-dogs-smell",
"rotten-dryers-allow",
"rotten-pears-watch",
"selfish-hounds-pay",
"selfish-panthers-stare",
"serious-cats-fetch",
"seven-carpets-march",
"seven-emus-pay",
Expand All @@ -107,6 +117,7 @@
"sweet-chefs-exist",
"sweet-feet-relate",
"tall-moons-beam",
"thick-ads-run",
"thick-spoons-compete",
"thirty-jokes-compete",
"thirty-pumpkins-fix",
Expand All @@ -119,6 +130,7 @@
"twenty-colts-hope",
"warm-melons-type",
"weak-cameras-pay",
"weak-elephants-kneel",
"wicked-humans-hang",
"wicked-jars-double",
"workspace-status-admin-page"
Expand Down
8 changes: 8 additions & 0 deletions .changeset/rotten-pears-watch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@rocket.chat/meteor": patch
---

fix: wrong client hash calculation due to race condition on assets

Some deployments may suffer from some reloads if running multiple instances. It's caused by different client hashes generated due to a possible race condition on custom assets load at the startup time. Forcing the clients to talk to the right backend instances, which causes reloads if sticky sessions are not enabled.
This change removes the assets from the hash calculation preventing the race condition and possible different hashes. After this change, the clients will not reload when the admin changes assets.
5 changes: 5 additions & 0 deletions .changeset/selfish-panthers-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

Fixed Canned responses stream not working, causing users to refresh to see newly created responses.
5 changes: 5 additions & 0 deletions .changeset/silver-mice-allow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: mention channel redirecting to own DM
5 changes: 5 additions & 0 deletions .changeset/spicy-kiwis-argue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fix desktop notification routing for direct rooms
5 changes: 5 additions & 0 deletions .changeset/weak-elephants-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@rocket.chat/meteor": patch
---

fix: `TypeError`: Cannot use 'in' operator in `undefined` for every message sent
4 changes: 0 additions & 4 deletions .husky/pre-push

This file was deleted.

2 changes: 1 addition & 1 deletion apps/meteor/.docker/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN set -x \
&& npm install --production \
# Start hack for sharp...
&& rm -rf npm/node_modules/sharp \
&& npm install sharp@0.30.4 \
&& npm install sharp@0.32.6 \
&& mv node_modules/sharp npm/node_modules/sharp \
# End hack for sharp
# Start hack for isolated-vm...
Expand Down
Loading

0 comments on commit ca6b0c5

Please sign in to comment.