xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-05 01:26:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3,217 Commits 41 Branches 79 Tags 136 MiB
5e844077e1
Commit Graph

1862 Commits

Author SHA1 Message Date
Dogtiti
7b6fe66f2a feat: try catch indexedDB error 2024-08-27 10:05:37 +08:00
Dogtiti
c2fc0b4979 feat: try catch indexedDB error 2024-08-27 09:57:07 +08:00
Dogtiti
0b758941a4 feat: clear indexDB 2024-08-26 21:23:21 +08:00
Dogtiti
492b55c893 feat: add indexDB 2024-08-26 21:20:07 +08:00
Dogtiti
4060e367ad feat: add indexDB 2024-08-26 21:13:35 +08:00
sijinhui
e36f5d4a70 fix error 2024-08-22 11:13:27 +08:00
sijinhui
82645cfd46 fix error 2024-08-22 11:12:55 +08:00
sijinhui
9ccf8550b0 123 2024-08-21 23:36:30 +08:00
sijinhui
dd884acab3 Merge remote-tracking branch 'upstream/main' into merge 
# Conflicts:
#	app/constant.ts
#	app/locales/ar.ts
#	app/locales/bn.ts
#	app/locales/cs.ts
#	app/locales/de.ts
#	app/locales/es.ts
#	app/locales/fr.ts
#	app/locales/id.ts
#	app/locales/it.ts
#	app/locales/jp.ts
#	app/locales/ko.ts
#	app/locales/no.ts
#	app/locales/pt.ts
#	app/locales/ru.ts
#	app/locales/sk.ts
#	app/locales/tr.ts
#	app/locales/vi.ts
 2024-08-21 22:58:14 +08:00
mayfwl
4ec6b067e7
fix: artifact render error (#5306) 
fix: artifact render error
 2024-08-21 18:48:44 +08:00
mayfwl
95332e50ed
Merge branch 'main' into Modifylang 2024-08-21 15:45:04 +08:00
lyf
8496980cf9 Modify View All Languages 2024-08-21 14:28:39 +08:00
lloydzhou
3d5b21154b update 2024-08-21 12:05:03 +08:00
lloydzhou
4b9697e336 fix: typescript error 2024-08-21 11:54:48 +08:00
lloydzhou
b0e9a542ba frat: add reload button 2024-08-21 11:17:00 +08:00
lloydzhou
8b67536c23 fix: 修复多余的查看全部 2024-08-21 10:28:34 +08:00
lloydzhou
cd49c12181 fix: 修复查看全部按钮导致artifacts失效 2024-08-21 10:27:37 +08:00
heweikang
e275abdb9c match the origin format 2024-08-20 19:49:47 +08:00
heweikang
6649fbdfd0 remove an empty line 2024-08-20 19:47:36 +08:00
heweikang
64a0ffee7b Merge branch 'main' into feat/search-history 2024-08-20 19:47:03 +08:00
heweikang
39d7d9f13a migrate the search button to plugins discovery 2024-08-20 19:44:22 +08:00
heweikang
fcd55df969 wrap doSearch with useCallback 2024-08-20 09:45:34 +08:00
zhangjian10
1102ef6e6b
fix: Determine if Tencent is authorized 2024-08-18 23:47:23 +08:00
sijinhui
0d363e8aa2 merge 2024-08-18 20:44:47 +08:00
sijinhui
9c68cea749 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/markdown.tsx
#	app/locales/ar.ts
#	app/locales/bn.ts
#	app/locales/cs.ts
#	app/locales/de.ts
#	app/locales/es.ts
#	app/locales/fr.ts
#	app/locales/id.ts
#	app/locales/it.ts
#	app/locales/jp.ts
#	app/locales/ko.ts
#	app/locales/no.ts
#	app/locales/ru.ts
#	app/locales/tr.ts
#	app/locales/vi.ts
 2024-08-18 20:32:25 +08:00
heweikang
7ce2e8f4c4 resolve a warning 2024-08-17 11:26:38 +08:00
heweikang
fd1c656bdd add all translations for SearchChat 2024-08-17 11:08:38 +08:00
heweikang
82298a760a Merge branch 'main' into feat/search-history 2024-08-17 10:15:49 +08:00
heweikang
b84bb72e07 add null check for search content 2024-08-17 10:06:56 +08:00
Lloyd Zhou
e210db7bd9
Merge pull request #5235 from ConnectAI-E/feature/access 
代码折叠
 2024-08-16 16:34:13 +08:00
Lloyd Zhou
e033bef544
Merge branch 'main' into feat-i18n 2024-08-16 16:13:13 +08:00
DDMeaqua
d88cc575e5 chore: update 2024-08-16 16:10:31 +08:00
heweikang
e3f499be0c hide search button text 2024-08-16 10:23:27 +08:00
heweikang
98093a1f31 make search result item easier to click 2024-08-15 17:21:39 +08:00
heweikang
3da5284a07 优化搜索算法，更新图标 2024-08-15 12:38:20 +08:00
heweikang
cd920364f8 Add page to search chat history 2024-08-14 22:28:05 +08:00
DDMeaqua
fb5fc13f72 feat: add model name 2024-08-13 19:58:44 +08:00
sijinhui
0b930db371 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/settings.tsx
#	app/components/sidebar.tsx
 2024-08-13 18:24:57 +08:00
lyf
1980f43b9f feat(auth): xg feature 2024-08-12 16:31:12 +08:00
lyf
c3c3dd5154 feature add zhedie 2024-08-12 14:06:21 +08:00
lyf
356155fd30 feature add zhedie 2024-08-12 13:58:53 +08:00
sijinhui
1bc010fb37 没啥变化 2024-08-10 22:16:11 +08:00
lyf
6f75ef8f0a addcd 2024-08-10 12:45:50 +08:00
l.tingting
ca865a80dc dall-e-3 adds 'quality' and 'style' options 2024-08-10 11:09:07 +08:00
lyf
8f759d1c3e 代码折叠 2024-08-09 14:55:25 +08:00
lyf
44787637f2 tj 2024-08-08 21:07:03 +08:00
lyf
d948be2372 Merge branch 'feature/bangpt' of ssh://github.com/ConnectAI-E/ChatGPT-Next-Web into feature/bangpt 2024-08-08 16:25:49 +08:00
lyf
cc28aef625 add gpt-4o-2024-08-06 2024-08-08 16:23:40 +08:00
Dogtiti
036358de7c
Merge pull request #5219 from ConnectAI-E/feature/access 
修复ChatGPTNextWeb页面的无障碍问题
 2024-08-08 13:59:16 +08:00
lyf
0958b9ee12 tsxiugai 2024-08-08 13:08:56 +08:00
sijinhui
96e6719fb1 123 2024-08-08 00:15:50 +08:00
sijinhui
53f1782c7c Merge remote-tracking branch 'upstream/main' into dev 2024-08-07 23:43:27 +08:00
sijinhui
4b97e374e7 fix little bug 2024-08-07 23:42:03 +08:00
sijinhui
6d01e6fb93 fix sd 2024-08-07 23:26:20 +08:00
sijinhui
b874a82fab Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/client/api.ts
#	app/components/settings.tsx
#	app/constant.ts
#	src-tauri/tauri.conf.json
 2024-08-07 21:11:58 +08:00
lzz
42fdbd9bb8
Fix spelling errors 2024-08-07 17:22:32 +08:00
lyf
034c82e514 修改设置的无障碍 2024-08-07 13:39:23 +08:00
lyf
14ff46b5cd 解决按钮无障碍 2024-08-07 13:01:08 +08:00
lyf
c9099ca0a5 无障碍按钮和链接 2024-08-07 10:55:02 +08:00
lyf
af21c57e77 ban gpt4 2024-08-07 10:15:39 +08:00
Dogtiti
9bbb4f396b
Merge pull request #5181 from webws/feature/support-iflytek-spark 
Feature/support iflytek spark
 2024-08-06 19:32:43 +08:00
webws
b2c1644d69 feat: add support for iFLYTEK Spark API (接入讯飞星火模型) 2024-08-06 17:54:30 +08:00
Lloyd Zhou
5629f842da
Merge pull request #5174 from ahzmr/main 
style: Fixed an issue where the sample of the reply content was displayed out of order
 2024-08-06 16:52:43 +08:00
HyiKi
f900283b09 fix: tencent InvalidParameter error 
fix "Messages 中 system 角色必须位于列表的最开始"
 2024-08-06 15:50:12 +08:00
HyiKi
b667eff6bd fix: baidu error_code 336006 
change the summary role from system to user
 2024-08-06 15:50:12 +08:00
HyiKi
54fdf40f5a fix: baidu error_code 336006 2024-08-06 15:50:12 +08:00
sijinhui
f06ae4f62b Merge remote-tracking branch 'upstream/main' into dev 2024-08-06 14:06:50 +08:00
Lloyd Zhou
690542145d
Merge pull request #5194 from HyiKi/main 
fix: baidu error_code 336006
 2024-08-06 13:56:44 +08:00
sijinhui
6daa6e3b17 merge 2024-08-06 13:48:12 +08:00
sijinhui
e0799f8f48 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/client/platforms/openai.ts
#	app/constant.ts
#	app/utils/model.ts
 2024-08-06 13:08:13 +08:00
Dogtiti
3da717d9fc fix: azure summary 2024-08-06 11:20:03 +08:00
HyiKi
0902efc719 Merge branch 'fix-role-error' 2024-08-06 10:53:32 +08:00
HyiKi
d7e2ee63d8 fix: tencent InvalidParameter error 
fix "Messages 中 system 角色必须位于列表的最开始"
 2024-08-06 10:45:25 +08:00
GH Action - Upstream Sync
7deb36ee1f Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-06 01:33:38 +00:00
GH Action - Upstream Sync
bfe4e88246 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-06 01:00:29 +00:00
HyiKi
9ab45c3969 fix: baidu error_code 336006 
change the summary role from system to user
 2024-08-05 20:50:36 +08:00
Dogtiti
fec80c6c51
Merge pull request #5173 from ConnectAI-E/feature/dalle 
add dalle3 model
 2024-08-05 20:49:37 +08:00
Dogtiti
a6b7432358
Merge pull request #5180 from frostime/contrib-modellist 
✨ feat: 调整模型列表，将自定义模型放在前面显示
 2024-08-05 20:49:07 +08:00
frostime
3486954e07 🐛 fix(openai): 上次 commit 后 openai.ts 文件中出现类型不匹配的 bug 2024-08-05 20:26:48 +08:00
frostime
150fc84b9b ✨ feat(model): 增加 sorted 字段，并使用该字段对模型列表进行排序 
1. 在 Model 和 Provider 类型中增加 sorted 字段(api.ts)
2. 默认模型在初始化的时候，自动设置默认 sorted 字段，从 1000 开始自增长(constant.ts)
3. 自定义模型更新的时候，自动分配 sorted 字段(model.ts)
 2024-08-05 19:43:32 +08:00
sijinhui
fce3c65e41 merge 2024-08-05 17:21:37 +08:00
frostime
b023a00445 🔨 refactor(model): 更改原先的实现方法，在 collect table 函数后面增加额外的 sort 处理 2024-08-05 16:37:22 +08:00
HyiKi
d0e296adf8 fix: baidu error_code 336006 2024-08-05 15:41:13 +08:00
sijinhui
5f5c2164f8 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/api/alibaba.ts
#	app/api/anthropic.ts
#	app/api/azure.ts
#	app/api/baidu.ts
#	app/api/bytedance.ts
#	app/api/openai.ts
#	yarn.lock
 2024-08-05 14:44:13 +08:00
lloydzhou
141ce2c99a reduce cloudflare functions build size 2024-08-05 12:59:27 +08:00
lloydzhou
4a95dcb6e9 hotfix get wrong llm 2024-08-05 12:45:25 +08:00
lloydzhou
1610675c8f remove hash.js 2024-08-05 11:36:35 +08:00
GH Action - Upstream Sync
724c814bfe Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-04 01:04:56 +00:00
sijinhui
86e8303104 优化字体 2024-08-03 21:30:32 +08:00
sijinhui
f80054e82b merge and change model 2024-08-03 18:45:55 +08:00
sijinhui
c60fa3cda6 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	package.json
#	yarn.lock
 2024-08-03 17:55:28 +08:00
frostime
8a4b8a84d6 ✨ feat: 调整模型列表，将自定义模型放在前面显示 2024-08-03 17:16:05 +08:00
frostime
8ec6acc55a 🎨 i18n: add locale about "font family config" 
Note: The language is translated by GPT
 2024-08-03 16:24:51 +08:00
frostime
b6a022b0ef ✨ feat(config): Set markdown's font-family 2024-08-03 16:04:20 +08:00
李超
716899c030 fix: Fixed the issue that WebDAV synchronization could not check the status and failed during the first backup 2024-08-03 12:40:48 +08:00
frostime
deb140de73 ✨ feat: 为命令前缀（ : ）支持中文符号 ： 2024-08-02 22:38:31 +08:00
织梦人
3c1e5e7978
Merge branch 'ChatGPTNextWeb:main' into main 2024-08-02 22:26:28 +08:00
Dogtiti
4a8e85c28a fix: empty response 2024-08-02 22:16:08 +08:00
李超
8498cadae8 fix: Fixed an issue where the sample of the reply content was displayed out of order 2024-08-02 21:06:03 +08:00
lloydzhou
8c83fe23a1 using b64_json for dall-e-3 2024-08-02 20:58:21 +08:00
Lloyd Zhou
324d30bef9
Merge pull request #5136 from frostime/contrib-txtcode 
✨ feat(markdown): 对纯文本的代码块内容进行折行处理
 2024-08-02 19:22:13 +08:00
lloydzhou
46cb48023e fix typescript error 2024-08-02 18:50:48 +08:00
lloydzhou
1c24ca58c7 add dalle3 model 2024-08-02 18:03:19 +08:00
Lloyd Zhou
9193a9a0e0
Merge pull request #5147 from ConnectAI-E/fix-locales 
fix: locales => Locale
 2024-08-02 18:02:13 +08:00
Lloyd Zhou
957244ba2e
Merge pull request #5154 from ConnectAI-E/fix-sidebar-style 
fix: sidebar title style
 2024-08-02 18:01:51 +08:00
lloydzhou
ac599aa47c add dalle3 model 2024-08-02 18:00:42 +08:00
sijinhui
8a0f998f69 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	package.json
#	yarn.lock
 2024-08-02 17:14:45 +08:00
lloydzhou
feaa6f9bf0 Merge remote-tracking branch 'connectai/feature/tencent' into feature/tencent 2024-08-02 15:56:25 +08:00
lloydzhou
753bf3b924 hotfix for cf deploy error #5168 2024-08-02 15:55:26 +08:00
Dogtiti
a17df037af feat: add lodash-es 2024-08-01 23:54:14 +08:00
lloydzhou
dfc36e5210 update 2024-08-01 19:02:40 +08:00
lloydzhou
c359b92ddc update 2024-08-01 18:58:07 +08:00
lloydzhou
e1d6131f13 update 2024-08-01 16:49:55 +08:00
sijinhui
f1bd456a41 merge 2024-08-01 16:31:11 +08:00
lloydzhou
6a0bda00f5 merge main 2024-08-01 15:39:54 +08:00
lloydzhou
f85ec95877 hotfix for tencent sign 2024-08-01 15:33:48 +08:00
lloydzhou
fd9e94e078 merge main 2024-08-01 13:18:33 +08:00
lloydzhou
966db1e4be add moonshot settings 2024-08-01 12:03:22 +08:00
lloydzhou
b8bbc37b8e merge main 2024-08-01 11:57:23 +08:00
lloydzhou
40cbabc330 add moonshot api 2024-08-01 11:55:22 +08:00
Dogtiti
99f3160aa2 fix: sidebar title style 2024-07-31 22:10:24 +08:00
Dogtiti
8cb72d8452 fix: locales => Locale 2024-07-30 21:25:33 +08:00
Dogtiti
c9eb9f3eda
Merge pull request #5141 from ConnectAI-E/hotfix-google-api-in-app 
hotfix for using google api in app
 2024-07-30 15:42:30 +08:00
lloydzhou
64c3dcd732 hotfix for using google api in app 2024-07-30 12:03:06 +08:00
frostime
d49ececcc5 ✨ feat(markdown): wrap the plain text code block 2024-07-29 19:10:00 +08:00
sijinhui
6483c86280 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/chat.tsx
#	app/components/ui-lib.tsx
#	app/constant.ts
#	app/store/mask.ts
 2024-07-27 21:59:52 +08:00
sijinhui
3e0b191491 修改提示 2024-07-27 21:57:21 +08:00
Lloyd Zhou
35c5518668
Merge pull request #5110 from ConnectAI-E/fix/owner 
chore: update owner
 2024-07-26 19:28:45 +08:00
ElricLiu
b27f394995
Merge pull request #5092 from ConnectAI-E/feature-artifacts 
[Artifacts] add preview html code
 2024-07-26 17:28:49 +08:00
Dogtiti
3f9f556e1c fix: iframe bg 2024-07-26 17:06:10 +08:00
Dogtiti
1772d5c4b6 chore: update owner 2024-07-26 16:00:25 +08:00
Dogtiti
715d1dc02f fix: default enable artifacts 2024-07-26 15:55:01 +08:00
Dogtiti
6737f016f5 chore: artifact => artifacts 2024-07-26 15:50:26 +08:00
Dogtiti
f2d2622172 fix: uploading loading 2024-07-26 13:49:15 +08:00
Dogtiti
72d6f97024 fix: ts error 2024-07-26 11:21:51 +08:00
Dogtiti
c27ef6ffbf feat: artifacts style 2024-07-25 23:29:29 +08:00
sijinhui
a277c1aed1 隐藏小警告 2024-07-25 22:14:38 +08:00
sijinhui
2588bcd465 merge 2024-07-25 21:42:20 +08:00
sijinhui
7e1cdbec80 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/chat.tsx
#	app/components/home.tsx
#	app/components/settings.tsx
#	app/components/sidebar.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/layout.tsx
#	app/store/access.ts
#	app/utils/model.ts
 2024-07-25 21:22:36 +08:00
Lloyd Zhou
f5499ff699
Merge pull request #5071 from ZTH7/main 
Fix defaultModel undefined error
 2024-07-25 21:02:39 +08:00
Mr. Z
c4334d4e5f
Update model.ts 2024-07-25 20:03:54 +08:00
Dogtiti
51e8f0440d Merge branch 'feature-artifacts' of https://github.com/ConnectAI-E/ChatGPT-Next-Web into feature/artifacts-style 2024-07-25 19:43:20 +08:00
lloydzhou
5ec0311f84 fix typescript error 2024-07-25 19:38:18 +08:00
lloydzhou
556d563ba0 update 2024-07-25 19:31:16 +08:00
lloydzhou
6a083b24c4 fix typescript error 2024-07-25 19:22:18 +08:00
lloydzhou
825929fdc8 merge main 2024-07-25 19:18:45 +08:00
Lloyd Zhou
941a03ed6c
Merge pull request #4983 from OpenAI-Next/dev-sd 
[Feature] Stable Diffusion
 2024-07-25 19:13:37 +08:00
Mr. Z
5c04d3c5ea
Change method 2024-07-25 17:59:15 +08:00
Mr. Z
46a47db2d8
Merge branch 'ChatGPTNextWeb:main' into main 2024-07-25 17:55:53 +08:00
Dogtiti
21ef9a4567 feat: artifacts style 2024-07-25 17:37:21 +08:00
lloydzhou
d8afd1af88 add expiration_ttl for kv storage 2024-07-25 16:56:08 +08:00
lloydzhou
7c1bc1f1a1 hotfix: auto set height 2024-07-25 15:27:44 +08:00
lloydzhou
763fc89b29 add fullscreen button on artifact component 2024-07-25 15:10:17 +08:00
lloydzhou
47b33f2b17 hotfix: auto set height 2024-07-25 14:15:16 +08:00
lloydzhou
9f0e16b045 hotfix: ts check 2024-07-25 13:48:21 +08:00
lloydzhou
2efedb1736 update 2024-07-25 13:34:59 +08:00
lloydzhou
044116c14c add plugin selector on chat 2024-07-25 13:29:39 +08:00
lloydzhou
b4bf11d648 add loading icon when upload artifact content 2024-07-25 12:49:19 +08:00
lloydzhou
6cc0a5a1a4 remove code 2024-07-25 12:36:48 +08:00
lloydzhou
8f14de5108 hotfix: ts check 2024-07-25 12:34:35 +08:00
lloydzhou
8f6e5d73a2 hotfix: can send sd task in client 2024-07-25 12:31:30 +08:00
lloydzhou
ab9f5382b2 fix typescript 2024-07-24 20:51:33 +08:00
Dogtiti
fd441d9303 feat: discovery icon 2024-07-24 20:41:41 +08:00
lloydzhou
e31bec3aff save artifact content to cloudflare workers kv 2024-07-24 20:36:11 +08:00
Dogtiti
2a1c05a028 fix: bugs 2024-07-24 20:04:22 +08:00
lloydzhou
421bf33c0e save artifact content to cloudflare workers kv 2024-07-24 20:02:37 +08:00
sijinhui
37767cdbcf 增加全球部署模型看看效果 2024-07-24 13:03:23 +08:00
DDMeaqua
9c7bacc65e chore: update 2024-07-24 10:45:17 +08:00
Dogtiti
3935c725c9 feat: sd setting 2024-07-23 22:44:09 +08:00
Dogtiti
908ee0060f chore: remove sd new 2024-07-23 22:23:34 +08:00
Dogtiti
82e6fd7bb5 feat: move sd config to store 2024-07-23 21:43:55 +08:00
Dogtiti
6b98b14179 fix: sd mobile 2024-07-23 20:24:56 +08:00
lloydzhou
1ecefd88f7 hotfix 2024-07-23 17:57:41 +08:00
lloydzhou
2e9e20ce7c auto height for html preview 2024-07-23 17:54:07 +08:00
lloydzhou
fb60fbb217 auto height for html preview 2024-07-23 17:51:44 +08:00
lloydzhou
4199e17da0 auto height for html preview 2024-07-23 17:44:15 +08:00
DDMeaqua
86b8bfcb1f feat: update i18n 2024-07-23 15:21:38 +08:00
lloydzhou
dfd089132d add preview html code 2024-07-23 14:39:31 +08:00
lloydzhou
3a10f58b28 add preview html code 2024-07-23 14:33:41 +08:00
sijinhui
e9fa29f63a Merge remote-tracking branch 'upstream/main' into dev 2024-07-23 12:59:26 +08:00
Dogtiti
9d55adbaf2 refator: sd 2024-07-23 00:51:58 +08:00
Lloyd Zhou
5b126c7e52
Revert "feat: improve components structure" 2024-07-22 22:18:51 +08:00
Lloyd Zhou
1943f3b53f
Merge pull request #5080 from ConnectAI-E/refactor-components 
feat: improve components structure
 2024-07-22 19:08:02 +08:00
consistent-k
dfd2a53129 chore: Remove useless judgment conditions 2024-07-22 08:50:15 +00:00
Mr. Z
aa4e855012
Compatibility changes 2024-07-22 16:41:11 +08:00
Dogtiti
038e6df8f0 feat: improve components structure 2024-07-22 16:02:45 +08:00
Mr. Z
2fd68bcac3
Fix defaultModel undefined error 2024-07-21 16:42:34 +08:00
sijinhui
932c1103f2 merge 2024-07-21 08:37:28 +08:00
sijinhui
c8f2d8029b Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/settings.tsx
#	app/constant.ts
#	app/store/chat.ts
 2024-07-21 07:25:36 +08:00
lloydzhou
e468fecf12 update 2024-07-20 20:44:19 +08:00
lloydzhou
fc31d8e5d1 merge origin/main 2024-07-20 15:15:46 +08:00
lloydzhou
ac04a1cac8 resolve conflicts 2024-07-20 14:41:42 +08:00
lloydzhou
87a286ef07 refactor setting page 2024-07-20 14:36:47 +08:00
Dogtiti
622d8a4edb
Merge pull request #5063 from ChenglongWang/summary_model 
Change gpt summary model to gpt-4o-mini
 2024-07-19 23:53:00 +08:00
Chenglong Wang
0236e13187
Change gpt summary model to gpt-4o-mini. 2024-07-19 23:36:57 +08:00
YeungYeah
a3d4a7253f Merge remote-tracking branch 'source/main' 2024-07-19 21:38:25 +08:00
sijinhui
1bc6a79d6a Merge remote-tracking branch 'upstream/main' into dev 2024-07-19 18:06:31 +08:00
sijinhui
60813d448f 修改消息压缩使用的模型url 2024-07-19 18:03:38 +08:00
lloydzhou
862c2e8810 hotfix for code review 2024-07-19 17:22:54 +08:00
lloydzhou
052004d70e using compressImage when serviceWorker register error 2024-07-19 16:03:22 +08:00