diff --git a/.github/ISSUE_TEMPLATE/0_bug_report.yml b/.github/ISSUE_TEMPLATE/0_bug_report.yml index 6054aa2a21..006279bb5d 100644 --- a/.github/ISSUE_TEMPLATE/0_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/0_bug_report.yml @@ -6,8 +6,8 @@ body: - type: markdown attributes: value: | - Thank you for taking the time to fill out this bug report! - Before submitting this issue, please make sure that you have understood the [FAQ](https://docs.cherry-ai.com/question-contact/questions) and [Knowledge Science](https://docs.cherry-ai.com/question-contact/knowledge) + Thank you for taking the time to fill out this bug report! + Before submitting this issue, please make sure that you have understood the [FAQ](https://docs.cherry-ai.com/question-contact/questions) and [Knowledge Science](https://docs.cherry-ai.com/question-contact/knowledge) - type: checkboxes id: checklist diff --git a/.yarn/releases/yarn-4.6.0.cjs b/.yarn/releases/yarn-4.6.0.cjs index fe63e51e6b..3e7773b1ed 100755 Binary files a/.yarn/releases/yarn-4.6.0.cjs and b/.yarn/releases/yarn-4.6.0.cjs differ diff --git a/README.md b/README.md index 5335146c9c..bcb34205a8 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ https://docs.cherry-ai.com # 🌈 Theme -- Theme Gallery: https://cherrycss.com +- Theme Gallery: https://cherrycss.com - Aero Theme: https://github.com/hakadao/CherryStudio-Aero - PaperMaterial Theme: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial diff --git a/package.json b/package.json index c4a683230a..e0f9353cb1 100644 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "@types/react-infinite-scroll-component": "^5.0.0", "@xyflow/react": "^12.4.4", "adm-zip": "^0.5.16", + "diff": "^7.0.0", "docx": "^9.0.2", "electron-log": "^5.1.5", "electron-store": "^8.2.0", @@ -79,10 +80,14 @@ "fast-xml-parser": "^5.0.9", "fetch-socks": "^1.3.2", "fs-extra": "^11.2.0", + "got-scraping": "^4.1.1", + "jsdom": "^26.0.0", "markdown-it": "^14.1.0", "officeparser": "^4.1.1", "proxy-agent": "^6.5.0", "tar": "^7.4.3", + "turndown": "^7.2.0", + "turndown-plugin-gfm": "^1.0.2", "undici": "^7.4.0", "webdav": "^5.8.0", "zipread": "^1.3.3" @@ -109,6 +114,7 @@ "@tavily/core": "patch:@tavily/core@npm%3A0.3.1#~/.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch", "@tryfabric/martian": "^1.2.4", "@types/adm-zip": "^0", + "@types/diff": "^7", "@types/fs-extra": "^11", "@types/lodash": "^4.17.5", "@types/markdown-it": "^14", diff --git a/resources/cherry-studio/license.html b/resources/cherry-studio/license.html index 3cf4361262..38df70a9f7 100644 --- a/resources/cherry-studio/license.html +++ b/resources/cherry-studio/license.html @@ -1,118 +1,111 @@ +
+ + +- 本软件采用 Apache License 2.0 许可。除 Apache License 2.0 规定的条款外,您在使用 Cherry - Studio 时还应遵守以下附加条款: -
-如有任何问题或需申请商业授权,请联系 Cherry Studio 开发团队。
-- 除上述特定条件外,其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息,请访问 - http://www.apache.org/licenses/LICENSE-2.0 -
+ ++ 本软件采用 Apache License 2.0 许可。除 Apache License 2.0 规定的条款外,您在使用 Cherry + Studio 时还应遵守以下附加条款: +
+如有任何问题或需申请商业授权,请联系 Cherry Studio 开发团队。
++ 除上述特定条件外,其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息,请访问 + http://www.apache.org/licenses/LICENSE-2.0 +
++ This software is licensed under the Apache License 2.0. In addition to the terms of the + Apache License 2.0, the following additional terms apply to the use of Cherry Studio: +
++ For any questions or to request a commercial license, please contact the Cherry Studio development team. +
++ Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache + License 2.0. Detailed information about the Apache License 2.0 can be found at + http://www.apache.org/licenses/LICENSE-2.0 +
+- This software is licensed under the Apache License 2.0. In addition to the terms of the - Apache License 2.0, the following additional terms apply to the use of Cherry Studio: -
-- For any questions or to request a commercial license, please contact the Cherry Studio development team. -
-- Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache - License 2.0. Detailed information about the Apache License 2.0 can be found at - http://www.apache.org/licenses/LICENSE-2.0 -
-