Commit Graph

2775 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
Lloyd Zhou
cf63619182
Merge pull request #5103 from ConnectAI-E/hotfix-cache-upload-image
hotfix cache upload image
2024-07-25 19:01:10 +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
6f0846b2af hotfix cache upload image 2024-07-25 17:26:16 +08:00
lloydzhou
ecd78b3bdd hotfix cache upload image 2024-07-25 17:23:21 +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
30d67cd718 fix build bug 2024-07-24 14:55:13 +08:00
sijinhui
997cec61dd fix build bug 2024-07-24 14:51:51 +08:00
sijinhui
e2b8d56619 保留git仓库文件 2024-07-24 13:54:28 +08:00
sijinhui
4e48d0e9cc 修改部署机器 2024-07-24 13:49:43 +08:00
sijinhui
4ff43aec6d 修改部署机器 2024-07-24 13:46:01 +08:00
sijinhui
95458302f2 修改部署机器 2024-07-24 13:42:43 +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
f201c17f08
Merge pull request #131 from sijinhui/dev
Dev
2024-07-23 13:04:42 +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
00be2be24f
Merge pull request #5088 from ChatGPTNextWeb/revert-5080-refactor-components
Revert "feat: improve components structure"
2024-07-22 22:19:05 +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
Dogtiti
4a0bef9afb
Merge pull request #5081 from consistent-k/main
chore: Remove useless judgment conditions
2024-07-22 17:31:00 +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
d6089e6309 fix: mask json 2024-07-22 16:33:03 +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
42c88cf175
Merge pull request #130 from sijinhui/dev
微调
2024-07-21 08:53:53 +08:00
sijinhui
c91ee5694c 微调 2024-07-21 08:52:02 +08:00
sijinhui
b8a659e13f
Merge pull request #128 from sijinhui/dev
Dev
2024-07-21 08:40:15 +08:00
sijinhui
794c675b66 修复eslint错误 2024-07-21 08:38:03 +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
Dogtiti
115f357a07
Merge pull request #5067 from ConnectAI-E/feature-setting-page
refactor setting page
2024-07-20 14:53:20 +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