Merge branch 'develop' into fix/incomplete-emails-at-user-registration

RocketChat · Jun 16, 2023 · 22c132b · 22c132b
2 parents 587bd0f + 916c0dc
commit 22c132b
Show file tree

Hide file tree

Showing 124 changed files with 1,635 additions and 443 deletions.
diff --git a/.changeset/app-release-info-page.md b/.changeset/app-release-info-page.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed Marketplace Release Info tab loading loop
diff --git a/.changeset/flat-fireants-itch.md b/.changeset/flat-fireants-itch.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+fix: spotlight doesnt update with new rooms
diff --git a/.changeset/gorgeous-lamps-tan.md b/.changeset/gorgeous-lamps-tan.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fix emoji being rendered as big on headers and other places than message text
diff --git a/.changeset/moody-teachers-cheer.md b/.changeset/moody-teachers-cheer.md
@@ -0,0 +1,9 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-services": patch
+"@rocket.chat/core-typings": patch
+"@rocket.chat/model-typings": patch
+"@rocket.chat/rest-typings": patch
+---
+
+fix: Resume on-hold chat not working with max-chat's allowed per agent config
diff --git a/.changeset/nervous-bulldogs-fix.md b/.changeset/nervous-bulldogs-fix.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Re-added pagination to Department's agents list
diff --git a/.changeset/shiny-donkeys-prove.md b/.changeset/shiny-donkeys-prove.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/model-typings": patch
+---
+
+fix: [ENTERPRISE] Guest users can join more than maxRoomsPerGuest rooms
diff --git a/.changeset/tricky-tomatoes-sit.md b/.changeset/tricky-tomatoes-sit.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+fix: Message sent triggering thread subscriptions multiple times
diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
@@ -17,6 +17,9 @@ on:
         default: master
         required: false
 
+env:
+  HUSKY: 0
+
 jobs:
   new-release:
     runs-on: ubuntu-latest
@@ -25,15 +28,15 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-      # with:
-      #   ref: ${{ github.event.inputs.base-ref }}
 
-    - name: Setup Node.js 16
-      uses: actions/setup-node@v3
+    - name: Setup NodeJS
+      uses: ./.github/actions/setup-node
       with:
-        node-version: 16
+        node-version: 14.21.3
+        cache-modules: true
+        install: true
 
-    - run: yarn install
+    - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
     - name: Build
       run: yarn build

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -7,6 +7,9 @@ on:
 
 concurrency: ${{ github.workflow }}-${{ github.ref }}
 
+env:
+  HUSKY: 0
+
 jobs:
   release:
     name: Release
@@ -15,13 +18,14 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v3
 
-      - name: Setup Node.js 16
-        uses: actions/setup-node@v3
+      - name: Setup NodeJS
+        uses: ./.github/actions/setup-node
         with:
-          node-version: 16
+          node-version: 14.21.3
+          cache-modules: true
+          install: true
 
-      - name: Install Dependencies
-        run: yarn
+      - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
       - name: Build
         run: yarn build

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,162 @@
+# 6.2.5
+
+`2023-06-07  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.3`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.39.1`
+
+### 🐛 Bug fixes
+
+
+- Seat counter including apps ([#29489](https://github.com/RocketChat/Rocket.Chat/pull/29489))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
+# 6.2.4
+
+`2023-06-07  ·  2 🐛  ·  2 🔍  ·  5 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.3`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.39.1`
+
+### 🐛 Bug fixes
+
+
+- Imported messages are not displayed ([#29485](https://github.com/RocketChat/Rocket.Chat/pull/29485))
+
+  - Fix issue with imported messages not being displayed in the room.
+   - Fix importer agent being added as a member of every imported room.
+
+- message deletion fails if has files attached on filesystem storage ([#29313](https://github.com/RocketChat/Rocket.Chat/pull/29313))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix Omnichannel Webhooks tests ([#29344](https://github.com/RocketChat/Rocket.Chat/pull/29344))
+
+- use local httpbin container on github CI's ([#29067](https://github.com/RocketChat/Rocket.Chat/pull/29067))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@KevLehman](https://github.com/KevLehman)
+- [@debdutdeb](https://github.com/debdutdeb)
+- [@matheusbsilva137](https://github.com/matheusbsilva137)
+- [@murtaza98](https://github.com/murtaza98)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
+# 6.2.3
+
+`2023-06-05  ·  1 🎉  ·  9 🐛  ·  9 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.3`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.39.1`
+
+### 🎉 New features
+
+
+- Add support to use `TRANSPORTER` env var for monolith deployments ([#29373](https://github.com/RocketChat/Rocket.Chat/pull/29373))
+
+### 🐛 Bug fixes
+
+
+- `queuedForUser` endpoint not filtering by status ([#29189](https://github.com/RocketChat/Rocket.Chat/pull/29189))
+
+- Embedded layout stops working after navigation occurs ([#29147](https://github.com/RocketChat/Rocket.Chat/pull/29147))
+
+- File upload in Safari, IOS devices ([#27121](https://github.com/RocketChat/Rocket.Chat/pull/27121))
+
+- fix wrong %s translations  ([#29395](https://github.com/RocketChat/Rocket.Chat/pull/29395))
+
+- getActiveLocalUserCount query ([#29349](https://github.com/RocketChat/Rocket.Chat/pull/29349))
+
+- Import progress page stuck at 0% ([#29421](https://github.com/RocketChat/Rocket.Chat/pull/29421))
+
+  - Fix incorrect percentage calc;
+   - Fix import progress page stuck at 0%.
+
+- Importer crashes when sending the "active status" e-mail notification to users ([#29401](https://github.com/RocketChat/Rocket.Chat/pull/29401))
+
+  - Fix `getImportProgress` endpoint returning incorrect count info (`total: 0, completed: 0`);
+   - Fix server crash when sending the "active status" e-mail notification to users on import.
+
+- OTR session closing after 10 seconds without warning ([#29245](https://github.com/RocketChat/Rocket.Chat/pull/29245))
+
+  The `Notifications` streamer is sending two events when there's a license applied to the workspace and it's not using Microservices. I'm avoiding this by simply ignoring the second event in OTRRoom.
+
+  There is still an issue where there's 2 system messages being fired after accepting, but that's not a really big concern since it doesn't break anything.
+
+- unable to create user if Accounts_ManuallyApproveNewUsers is enabled ([#29293](https://github.com/RocketChat/Rocket.Chat/pull/29293))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@KevLehman](https://github.com/KevLehman)
+- [@debdutdeb](https://github.com/debdutdeb)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@jessicaschelly](https://github.com/jessicaschelly)
+- [@matheusbsilva137](https://github.com/matheusbsilva137)
+- [@murtaza98](https://github.com/murtaza98)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@yash-rajpal](https://github.com/yash-rajpal)
+
+# 6.2.2
+
+`2023-05-19  ·  1 🐛  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.3`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.39.1`
+
+### 🐛 Bug fixes
+
+
+- Livechat `CSP` whitelist validation ([#29278](https://github.com/RocketChat/Rocket.Chat/pull/29278))
+
+  This PR fixes the Livechat CSP validation, which was incorrectly blocking access to the widget for all non whitelisted domains.
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@aleksandernsilva](https://github.com/aleksandernsilva)
+- [@ggazzo](https://github.com/ggazzo)
+
+# 6.2.1
+
+`2023-05-17  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `14.21.3`
+- NPM: `6.14.17`
+- MongoDB: `4.4, 5.0, 6.0`
+- Apps-Engine: `1.39.1`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Bump apps engine and vm2 ([#29262](https://github.com/RocketChat/Rocket.Chat/pull/29262))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@AllanPazRibeiro](https://github.com/AllanPazRibeiro)
+
 # 6.2.0
 
 `2023-05-15  ·  9 🎉  ·  2 🚀  ·  80 🐛  ·  290 🔍  ·  56 👩‍💻👨‍💻`

diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
@@ -0,0 +1,26 @@
+# @rocket.chat/meteor
+
+## 6.2.6
+
+### Patch Changes
+
+- [#29545](https://github.com/RocketChat/Rocket.Chat/pull/29545) [`8ade880306`](https://github.com/RocketChat/Rocket.Chat/commit/8ade880306a2f4be6fb979c9db32a1ca5bdf4c1f) Thanks [@github-actions](https://github.com/apps/github-actions)! - fix: Frontend crash if IndexedDB is not available, i.e. in Firefox private mode
+
+- Updated dependencies []:
+  - @rocket.chat/core-typings@6.2.6
+  - @rocket.chat/rest-typings@6.2.6
+  - @rocket.chat/omnichannel-services@0.0.2
+  - @rocket.chat/pdf-worker@0.0.2
+  - @rocket.chat/presence@0.0.2
+  - @rocket.chat/api-client@0.0.2
+  - @rocket.chat/core-services@0.0.2
+  - @rocket.chat/gazzodown@0.0.1
+  - @rocket.chat/model-typings@0.0.2
+  - @rocket.chat/ui-contexts@0.0.2
+  - @rocket.chat/models@0.0.2
+  - @rocket.chat/ui-theming@0.0.1
+  - @rocket.chat/fuselage-ui-kit@0.31.16
+  - @rocket.chat/ui-client@0.0.1
+  - @rocket.chat/ui-video-conf@0.0.1
+  - @rocket.chat/web-ui-registration@0.0.1
+  - @rocket.chat/instance-status@0.0.2
diff --git a/apps/meteor/app/emoji-emojione/client/emojione-sprites.css b/apps/meteor/app/emoji-emojione/client/emojione-sprites.css
@@ -28,8 +28,3 @@
 	image-rendering: -webkit-optimize-contrast;
 	image-rendering: optimizeQuality;
 }
-
-.big > .emojione {
-	width: 44px;
-	height: 44px;
-}