kangfenmao a50da9fc80 Merge branch 'main' into v2 ... # Conflicts: # CLAUDE.md # package.json # packages/ui/src/components/primitives/toast.ts # src/main/services/AppMenuService.ts # src/renderer/src/assets/styles/tailwind.css # src/renderer/src/components/Avatar/EmojiAvatarWithPicker.tsx # src/renderer/src/components/Buttons/ActionIconButton.tsx # src/renderer/src/components/ConfirmDialog.tsx # src/renderer/src/components/ErrorBoundary.tsx # src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx # src/renderer/src/components/Popups/agent/AgentModal.tsx # src/renderer/src/components/Popups/agent/SessionModal.tsx # src/renderer/src/components/TopView/index.tsx # src/renderer/src/components/UpdateDialog.tsx # src/renderer/src/context/HeroUIProvider.tsx # src/renderer/src/env.d.ts # src/renderer/src/hero.ts # src/renderer/src/hooks/useUserTheme.ts # src/renderer/src/pages/home/Chat.tsx # src/renderer/src/pages/home/Inputbar/AgentSessionInputbar.tsx # src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx # src/renderer/src/pages/home/Messages/Message.tsx # src/renderer/src/pages/home/Messages/Tools/ToolPermissionRequestCard.tsx # src/renderer/src/pages/home/Tabs/AssistantsTab.tsx # src/renderer/src/pages/home/Tabs/SessionSettingsTab.tsx # src/renderer/src/pages/home/Tabs/components/AddButton.tsx # src/renderer/src/pages/home/Tabs/components/AgentItem.tsx # src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx # src/renderer/src/pages/home/Tabs/components/SessionItem.tsx # src/renderer/src/pages/home/Tabs/components/Sessions.tsx # src/renderer/src/pages/home/Tabs/components/TagGroup.tsx # src/renderer/src/pages/home/Tabs/components/Topics.tsx # src/renderer/src/pages/home/Tabs/components/UnifiedAddButton.tsx # src/renderer/src/pages/home/Tabs/index.tsx # src/renderer/src/pages/home/components/ChatNavbarContent.tsx # src/renderer/src/pages/home/components/SelectAgentBaseModelButton.tsx # src/renderer/src/pages/home/components/UpdateAppButton.tsx # src/renderer/src/pages/minapps/components/WebviewSearch.tsx # src/renderer/src/pages/notes/HeaderNavbar.tsx # src/renderer/src/pages/settings/AboutSettings.tsx # src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx # src/renderer/src/pages/settings/AgentSettings/components/InstalledPluginsList.tsx # src/renderer/src/pages/settings/AgentSettings/components/PluginBrowser.tsx # src/renderer/src/pages/settings/AgentSettings/components/PluginCard.tsx # src/renderer/src/pages/settings/DataSettings/DataSettings.tsx # src/renderer/src/pages/settings/ToolSettings/ApiServerSettings/ApiServerSettings.tsx # src/renderer/src/pages/translate/TranslateSettings.tsx # src/renderer/src/services/ApiService.ts # src/renderer/src/store/runtime.ts # src/renderer/src/windows/mini/MiniWindowApp.tsx # src/renderer/src/windows/selection/action/entryPoint.tsx # yarn.lock		2025-11-06 19:53:09 +08:00
..
ISSUE_TEMPLATE	chore: update issue template names by removing language specification	2025-10-31 21:29:29 +08:00
workflows	Merge branch 'main' into v2	2025-11-06 19:53:09 +08:00
CODEOWNERS	Merge branch 'main' of github.com:CherryHQ/cherry-studio into v2	2025-10-28 09:02:09 +08:00
dependabot.yml	chore: remove dependency updates (#7743)	2025-07-03 14:05:35 +08:00
pull_request_template.md	docs: update PR template and README with feature PR restrictions (#10955)	2025-10-26 00:14:27 +08:00