Commit Graph

3226 Commits

Author SHA1 Message Date
suyao 4e03c489b0 chore: enhance canvas rebuild steps for Windows in release workflow
- Updated the canvas rebuild step to specify architecture for Windows x64 and added a new step for Windows ARM64.
- Ensures compatibility with both x64 and ARM64 architectures during the build process.
2025-06-15 04:37:05 +08:00
suyao 574975f32d chore: add canvas rebuild step for Windows in release workflow
- Introduced a new step to rebuild the canvas module for Windows to ensure compatibility during the build process.
- This step is conditionally executed based on the operating system in the workflow.
2025-06-15 03:59:27 +08:00
suyao dc3e28b414 chore: add Windows dependencies installation step in release workflow
- Introduced a new step to install necessary dependencies for Windows, including GTK and libjpeg-turbo.
- Updated the release workflow to ensure compatibility with Windows builds.
2025-06-15 03:26:12 +08:00
suyao ba35ec1b4c chore: update app-builder-lib patch and enhance installAppDependencies method
- Updated the resolution and checksum for the app-builder-lib patch in yarn.lock.
- Modified installAppDependencies method to accept excludeReBuildModules parameter.
- Adjusted platformPackager to pass excludeReBuildModules during dependency installation.
- Updated yarn.js to correctly reference excludeReBuildModules from options.
2025-06-15 02:50:47 +08:00
suyao 9329eeb2c3 chore: remove Windows dependencies from release workflow 2025-06-14 21:11:29 +08:00
suyao 8b1743419d Merge branch 'feat-knowlege-ocr' of https://github.com/CherryHQ/cherry-studio into feat/ocr 2025-06-14 21:10:20 +08:00
suyao a9b251e11b chore: add brew update step for macOS dependencies installation in release workflow 2025-06-14 21:09:29 +08:00
suyao a05b0502bb chore: update dependencies installation for macOS and Ubuntu in release workflow 2025-06-14 20:47:42 +08:00
suyao 58dc927347 chore: add excludeReBuildModules for Windows build configuration 2025-06-14 20:35:17 +08:00
eeee0717 63718b7405 fix: remove windows dependencies 2025-06-14 20:10:22 +08:00
eeee0717 f5dfe3c7c0 Merge remote-tracking branch 'origin/feat-knowlege-ocr' into feat-knowlege-ocr 2025-06-14 19:57:25 +08:00
suyao e318f8023a chore: remove duplicate pdfjs-dist entry from dependencies 2025-06-14 19:44:59 +08:00
suyao d0a9a47d31 Merge branch 'main' into feat/ocr 2025-06-14 19:41:44 +08:00
beyondkmp fd9ff4a432 fix: update app-builder-lib patch and adjust minimumSystemVersion handling (#7197)
- Updated the resolution and checksum for the app-builder-lib patch in yarn.lock.
- Modified macPackager.js and updateInfoBuilder.js to correctly reference LSMinimumSystemVersion.
- Enhanced ArchiveTarget.js and NsisTarget.js to include minimumSystemVersion in updateInfo if specified.
2025-06-14 19:39:28 +08:00
eeee0717 2db480f97a fix: add windows dependencies 2025-06-14 18:45:31 +08:00
eeee0717 e7531a26bf fix: move pdfjs-dist to dependencies 2025-06-14 18:08:57 +08:00
eeee0717 f03b7e1eff fix: knowledge citation display 2025-06-14 18:02:51 +08:00
suyao fcd999e3b4 Merge branch 'feat-knowlege-ocr' of https://github.com/eeee0717/cherry-studio into feat/ocr 2025-06-14 17:21:53 +08:00
suyao 62251f456b chore: remove macOS-only OCR package from build configuration and scripts 2025-06-14 17:19:48 +08:00
eeee0717 0d4ee05d13 fix: use MAIN_VITE_MINERU_API_KEY 2025-06-14 17:17:01 +08:00
eeee0717 a2172a1d6b fix: use MAIN_VITE_MINERU_API_KEY and ocr only use in macos 2025-06-14 17:07:57 +08:00
eeee0717 1d626af789 chore: change VITE_MINERU_API_KEY to RENDERER_VITE_MINERU_API_KEY 2025-06-14 16:39:13 +08:00
eeee0717 262173774e fix 2025-06-14 16:25:38 +08:00
eeee0717 43f2237cb9 Merge remote-tracking branch 'origin/feat-knowlege-ocr' into feat-knowlege-ocr 2025-06-14 16:21:34 +08:00
suyao 8bb6cb2074 chore: exclude 'pdfjs-dist' and 'canvas' from rebuild modules in electron-builder configuration 2025-06-14 16:20:21 +08:00
eeee0717 bf44d283c6 fix: release.yml 2025-06-14 16:17:08 +08:00
suyao 3abc11a29b Merge remote-tracking branch 'origin/main' into feat/ocr 2025-06-14 16:07:51 +08:00
eeee0717 5cf2b5f9ee typo: excludeReBuildModules 2025-06-14 16:04:37 +08:00
eeee0717 91b012a2cc fix: skip canvas rebuild 2025-06-14 15:59:53 +08:00
eeee0717 e4a546a776 Merge remote-tracking branch 'upstream/main' into feat-knowlege-ocr 2025-06-14 15:57:54 +08:00
beyondkmp cab975f88b fix: update app-builder-lib patch and add excludeReBuildModules option (#7193) 2025-06-14 15:57:39 +08:00
eeee0717 5b8644db50 fix: gtk url 2025-06-14 15:28:19 +08:00
eeee0717 b3354dfc27 fix: add windows dependencies 2025-06-14 15:24:12 +08:00
eeee0717 d0fb21aab3 fix: add canvas dependencies in linux 2025-06-14 15:01:24 +08:00
Wang Jiyuan c644e4afa8 feat: add prompt variables docs on topic naming modal popup (#7175) 2025-06-14 14:59:29 +08:00
Wang Jiyuan 0a498460d6 fix: remove margin-bottom for loading animation (#7191)
* fix: remove margin-bottom for loading animation

* fix: just need to remove the margin-bottom of the last block
2025-06-14 14:57:31 +08:00
eeee0717 d3fe587b6e fix; move pdfjs to dependencies 2025-06-14 14:48:05 +08:00
eeee0717 c597905b78 fix 2025-06-14 14:45:03 +08:00
eeee0717 7739e67140 fix: add mineru key 2025-06-14 14:39:29 +08:00
eeee0717 d676dd349b fix: pdfjs-dist only use in macos 2025-06-14 14:34:49 +08:00
eeee0717 1115c54460 fix: pdf-dist 2025-06-14 14:25:11 +08:00
Wang Jiyuan bd4333ab9a fix: transparent background on translate dropdown (#7189) 2025-06-14 14:18:25 +08:00
Wang Jiyuan 9138aecdf0 fix: missing topic prompt on resend/regenerate and duplicate prevention (#7173)
* fix: completion doesn't include topic prompt

* fix: Multiple additions of topic prompts

* fix: improve logic

* fix: improve logic
2025-06-14 13:37:48 +08:00
Wang Jiyuan e4e4dcbd1e fix: model_name prompt var always use default model (#7178)
* fix: model_name prompt var always use default mode

* fix: incorrect model name
2025-06-14 13:35:32 +08:00
kangfenmao 3f2140807f Merge branch 'main' into feat-knowlege-ocr 2025-06-14 13:19:13 +08:00
kangfenmao 2a0484ede2 chore(release): update fetch depth in GitHub Actions workflow
- Changed the fetch depth to 0 in the release workflow to ensure all history is available for tagging. This adjustment improves the accuracy of the release process.
2025-06-14 13:18:59 +08:00
Wang Jiyuan c9f12c2e49 feat: add prompt variable "username" (#7174) 2025-06-14 13:08:32 +08:00
eeee0717 beec45b373 Merge remote-tracking branch 'origin/feat-knowlege-ocr' into feat-knowlege-ocr 2025-06-14 12:32:48 +08:00
suyao 71ef510ac0 refactor(FilesPage): remove unused imports and simplify provider handling
- Eliminated unused imports including FilePdfOutlined and useProviders hook.
- Removed mapping of mistralProviders from the file type options, streamlining the component's logic.
2025-06-14 12:31:38 +08:00
suyao 8992c2788b chore(package.json): reorder and reintroduce embedjs dependencies for consistency 2025-06-14 12:29:28 +08:00