Merge branch 'develop' into feat/CORL-3213-premoderate-email-aliases

coralproject · Feb 14, 2025 · 1d56ed8 · 1d56ed8
2 parents a8cec89 + 71843bb
commit 1d56ed8
Show file tree

Hide file tree

Showing 70 changed files with 172 additions and 4,101 deletions.
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.6.3",
+  "version": "9.7.0",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [
@@ -98,12 +98,9 @@
     "@babel/preset-typescript": "^7.10.1",
     "@babel/runtime-corejs3": "^7.10.3",
     "@coralproject/rte": "^2.2.4",
-    "@emotion/cache": "^10.0.29",
-    "@emotion/core": "^10.1.1",
     "@fluent/react": "^0.12.0",
     "@giphy/js-fetch-api": "^4.1.2",
     "@giphy/js-types": "^5.0.0",
-    "@giphy/react-components": "^5.4.0",
     "@graphql-codegen/cli": "^1.20.0",
     "@graphql-codegen/introspection": "^1.18.1",
     "@intervolga/optimize-cssnano-plugin": "^1.0.6",

diff --git a/client/pnpm-lock.yaml b/client/pnpm-lock.yaml
diff --git a/client/src/core/client/admin/components/ExperimentalCallOut.css b/client/src/core/client/admin/components/ExperimentalCallOut.css
diff --git a/client/src/core/client/admin/components/ExperimentalCallOut.tsx b/client/src/core/client/admin/components/ExperimentalCallOut.tsx
diff --git a/client/src/core/client/admin/components/StoryInfoDrawer/StorySettingsContainer.tsx b/client/src/core/client/admin/components/StoryInfoDrawer/StorySettingsContainer.tsx
@@ -5,7 +5,7 @@ import { Field, Form } from "react-final-form";
 import { graphql } from "relay-runtime";
 
 import { useMutation, withFragmentContainer } from "coral-framework/lib/relay";
-import ExpertSelectionQuery from "coral-stream/tabs/Configure/Q&A/ExpertSelectionQuery";
+import ExpertSelectionQuery from "coral-stream/tabs/Configure/QA/ExpertSelectionQuery";
 import { CogIcon, SvgIcon } from "coral-ui/components/icons";
 import {
   CheckBox,