Commit Graph

331 Commits

Author SHA1 Message Date
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
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
sijinhui
37767cdbcf 增加全球部署模型看看效果 2024-07-24 13:03:23 +08:00
Dogtiti
3935c725c9 feat: sd setting 2024-07-23 22:44:09 +08:00
Dogtiti
82e6fd7bb5 feat: move sd config to store 2024-07-23 21:43:55 +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
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
60813d448f 修改消息压缩使用的模型url 2024-07-19 18:03:38 +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
DDDDD12138
8edc0989e2 chore: remove unused imports and correct typos 2024-07-18 01:51:56 +08:00
Peter Dave Hello
238d3122c4 Add Traditional Chinese prompts converted from Simplified Chinese version 2024-07-17 22:38:43 +08:00
YeungYeah
ee22fba448
Merge branch 'main' into main 2024-07-17 22:16:30 +08:00
sijinhui
45913941e8 fix little bug 2024-07-17 13:47:09 +08:00
sijinhui
7d9e85b4f4 fix google bug 2024-07-17 13:45:09 +08:00
sijinhui
598018e7b5 fix bug 2024-07-17 12:59:53 +08:00
sijinhui
c53ee2f065 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/common.ts
#	app/components/settings.tsx
#	app/store/access.ts
2024-07-17 12:58:32 +08:00
sijinhui
98a93e0020 fix bug 2024-07-17 12:50:57 +08:00
lloydzhou
7102bed959 update 2024-07-17 12:48:59 +08:00
lloydzhou
c3eaa4762d hotfix: custom comfig for Gemini api. #4944 2024-07-17 12:48:59 +08:00
lloydzhou
49151dabf5 hotfix 2024-07-16 23:18:34 +08:00
lloydzhou
bab3e0bc9b using CacheStorage to store image #5013 2024-07-16 01:19:40 +08:00
lloydzhou
a1117cd4ee save blob to indexeddb instead of base64 image string 2024-07-15 20:47:49 +08:00
lloydzhou
5df09d5e2a move code to utils/file 2024-07-15 20:26:03 +08:00
lloydzhou
33450ce429 move code to utils/file 2024-07-15 20:09:21 +08:00
lloydzhou
e2f0206d88 update using indexdb read sd image data 2024-07-15 19:29:25 +08:00
licoy
3767b2c7f9 test 2024-07-15 15:29:56 +08:00
lloydzhou
476bdac717 update 2024-07-12 21:52:38 +08:00
lloydzhou
9b97dca601 hotfix: custom comfig for Gemini api. #4944 2024-07-12 21:27:30 +08:00
sijinhui
043c6d7efc 更新配置文件自动更新功能 2024-07-12 13:49:35 +08:00
sijinhui
37392d068c 修复模型选择继承的小bug 2024-07-12 11:28:32 +08:00
licoy
d61cb98ac7 Merge remote-tracking branch 'origin/dev-sd' into dev-sd 2024-07-12 10:33:58 +08:00
licoy
74b915a790 fix: sd3 model default select 2024-07-12 10:32:06 +08:00
sijinhui
4733de20b2 注释一堆注释 2024-07-12 00:33:13 +08:00
sijinhui
9066c4eb55 逐步修改url链接 2024-07-12 00:07:32 +08:00
lloydzhou
498d0f0b8b merge main 2024-07-11 15:29:47 +08:00
sijinhui
af741e4dbf merge 2024-07-11 13:09:18 +08:00
sijinhui
a70f984b0f Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/auth.ts
#	app/api/common.ts
#	app/azure.ts
#	app/client/api.ts
#	app/client/platforms/openai.ts
#	app/components/chat.tsx
#	app/components/settings.tsx
#	app/constant.ts
#	app/layout.tsx
#	app/masks/index.ts
#	app/store/chat.ts
#	app/store/config.ts
#	app/utils/hooks.ts
#	app/utils/model.ts
#	package.json
#	yarn.lock
2024-07-11 10:58:00 +08:00
lloydzhou
23872086fa merge code 2024-07-09 19:37:47 +08:00
lloydzhou
c229d2c3ce merge main 2024-07-09 16:53:15 +08:00
lloydzhou
93a03f8fe4 Merge remote-tracking branch 'origin/main' into feat-baidu 2024-07-09 15:06:10 +08:00
lloydzhou
6ac9789a1c hotfix 2024-07-09 12:16:37 +08:00
licoy
2b0153807c feat: Add Stability API server relay sending 2024-07-09 09:50:04 +08:00