Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	app/components/chat.tsx

app/app/(auth)/login/user-login-core.tsx

@@ -21,6 +21,7 @@ import {
 import type { FormProps, TabsProps } from "antd";
 import { SignInOptions } from "next-auth/react";
 import { getSession } from "next-auth/react";
+import { FieldData } from "rc-field-form/es/interface";
 
 export default function UserLoginCore() {
   const [loading, setLoading] = useState(false);
@@ -153,7 +154,7 @@ export default function UserLoginCore() {
                 <span>
                   无权限，请确认用户名正确并等待审批
                   <br />
-                  <span style={{ color: "red" }}>或联系管理员</span>
+                  <span style={{ color: "red" }}>或联系管理员&nbsp;小司</span>
                 </span>
               ),
             });
@@ -172,7 +173,7 @@ export default function UserLoginCore() {
               name: "password",
               errors: [result.error],
             },
-          ]);
+          ] as FieldData[]);
         }
         if (loginProvider === "email") {
           loginForm.setFields([
@@ -180,7 +181,7 @@ export default function UserLoginCore() {
               name: "email",
               errors: [result.error],
             },
-          ]);
+          ] as FieldData[]);
         }
       }
       console.log("response,", result);

app/components/chat.tsx

@@ -651,11 +651,11 @@ export function ChatActions(props: {
         />
       )}
 
-      <ChatAction
-        onClick={() => setShowPluginSelector(true)}
-        text={Locale.Plugin.Name}
-        icon={<PluginIcon />}
-      />
+      {/*<ChatAction*/}
+      {/*  onClick={() => setShowPluginSelector(true)}*/}
+      {/*  text={Locale.Plugin.Name}*/}
+      {/*  icon={<PluginIcon />}*/}
+      {/*/>*/}
       {showPluginSelector && (
         <Selector
           multiple

app/components/exporter.tsx

@@ -541,7 +541,7 @@ export function ImagePreviewer(props: {
           <div>
             <div className={styles["main-title"]}>NextChat</div>
             <div className={styles["sub-title"]}>
-              github.com/Yidadaa/ChatGPT-Next-Web
+              github.com/ChatGPTNextWeb/ChatGPT-Next-Web
             </div>
             <div className={styles["icons"]}>
               <ExportAvatar avatar={config.avatar} />

app/constant.ts

@@ -1,4 +1,4 @@
-export const OWNER = "Yidadaa";
+export const OWNER = "ChatGPTNextWeb";
 export const REPO = "ChatGPT-Next-Web";
 export const REPO_URL = `https://github.com/${OWNER}/${REPO}`;
 export const ISSUE_URL = `https://github.com/${OWNER}/${REPO}/issues`;

src-tauri/tauri.conf.json

@@ -9,7 +9,7 @@
   },
   "package": {
     "productName": "NextChat",
-    "version": "2.13.1"
+    "version": "2.14.0"
   },
   "tauri": {
     "allowlist": {