Merge branch 'develop' into improve/remove-omnichannel-queue-col

RocketChat · Jun 7, 2022 · d9865c1 · d9865c1
2 parents 4dfe840 + 7f6bc92
commit d9865c1
Show file tree

Hide file tree

Showing 359 changed files with 9,832 additions and 5,309 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,3 +9,4 @@
 /_templates/ @RocketChat/chat-engine
 /apps/meteor/client/ @RocketChat/frontend
 /apps/meteor/tests/ @RocketChat/chat-engine
+/apps/meteor/app/apps/ @RocketChat/apps
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,5 @@ yarn-error.log*
 !.yarn/sdks
 !.yarn/versions
 
-.nvmrc
+.nvmrc
+.idea/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,5 +10,5 @@
 		}
 	],
 	"typescript.tsdk": "./node_modules/typescript/lib",
-	"cSpell.words": ["photoswipe"]
+	"cSpell.words": ["photoswipe", "tmid"]
 }
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -1,7 +1,5 @@
 nodeLinker: node-modules
 
-checksumBehavior: "update"
-
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
     spec: '@yarnpkg/plugin-workspace-tools'
@@ -13,5 +11,4 @@ plugins:
     spec: '@yarnpkg/plugin-typescript'
 
 yarnPath: .yarn/releases/yarn-3.2.0.cjs
-
-checksumBehavior: 'update'
+checksumBehavior: 'ignore'
diff --git a/apps/meteor/.snapcraft/launchpadkey.enc b/apps/meteor/.snapcraft/launchpadkey.enc
diff --git a/apps/meteor/.snapcraft/resources/Caddyfile b/apps/meteor/.snapcraft/resources/Caddyfile
diff --git a/apps/meteor/.snapcraft/resources/backupdb b/apps/meteor/.snapcraft/resources/backupdb
diff --git a/apps/meteor/.snapcraft/resources/initcaddy b/apps/meteor/.snapcraft/resources/initcaddy
diff --git a/apps/meteor/.snapcraft/resources/initreplset.js b/apps/meteor/.snapcraft/resources/initreplset.js
diff --git a/apps/meteor/.snapcraft/resources/prepareRocketChat b/apps/meteor/.snapcraft/resources/prepareRocketChat
diff --git a/apps/meteor/.snapcraft/resources/preparecaddy b/apps/meteor/.snapcraft/resources/preparecaddy
diff --git a/apps/meteor/.snapcraft/resources/preparemongo b/apps/meteor/.snapcraft/resources/preparemongo
diff --git a/apps/meteor/.snapcraft/resources/preparenode b/apps/meteor/.snapcraft/resources/preparenode
diff --git a/apps/meteor/.snapcraft/resources/restoredb b/apps/meteor/.snapcraft/resources/restoredb