Commit Graph

1550 Commits

Author SHA1 Message Date
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
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
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
Dogtiti
fd441d9303 feat: discovery icon 2024-07-24 20:41:41 +08:00
Dogtiti
2a1c05a028 fix: bugs 2024-07-24 20:04:22 +08:00
sijinhui
37767cdbcf 增加全球部署模型看看效果 2024-07-24 13:03:23 +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
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
lloydzhou
ac470a6d07 Merge remote-tracking branch 'connectai/feature-cache-storage' into feature-cache-storage 2024-07-19 15:39:51 +08:00
Dogtiti
7237d33be3 fix: ts type 2024-07-19 14:55:47 +08:00
lloydzhou
1610b480af remove console.log 2024-07-19 13:54:33 +08:00
lloydzhou
287fa0a39c feat: 1. using cache storage store image data; 2. get base64image before chat to api #5013 2024-07-19 13:50:10 +08:00
sijinhui
69c434c047 merge 并添加新模型mini 2024-07-19 13:03:36 +08:00
sijinhui
35532f8781 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/google/[...path]/route.ts
#	app/client/platforms/google.ts
#	app/constant.ts
#	app/store/prompt.ts
#	app/utils/hooks.ts
#	public/prompts.json
2024-07-19 12:56:46 +08:00
Dogtiti
a280e25ee7
Merge pull request #5046 from PeterDaveHello/Add-zh-tw-prompts
Add Traditional Chinese prompts converted from Simplified Chinese version
2024-07-19 10:54:54 +08:00
Dogtiti
8464ca8931
Merge pull request #5045 from ConnectAI-E/fix/google
refactor: google
2024-07-19 10:19:04 +08:00
Peter Dave Hello
9caf820758 Add GPT-4o mini support
Reference:
- https://platform.openai.com/docs/models/gpt-4o-mini
- https://openai.com/index/gpt-4o-mini-advancing-cost-efficient-intelligence/
2024-07-19 03:21:40 +08:00
YeungYeah
26c2598f56 fix: fix bug in generating wrong gemini request url 2024-07-18 23:41:20 +08:00
Lloyd Zhou
ca51c2e93d
Merge pull request #5035 from DDDDD12138/code-cleanup
chore: remove unused imports and correct typos
2024-07-18 21:05:52 +08:00