Commit Graph

2593 Commits

Author SHA1 Message Date
Xiaochen
34ef1efeb6 update macOS icon to be consistent with design in public/macos.png 2024-07-17 12:48:05 +08:00
sijinhui
e94e2b7c96 fix merge bug 2024-07-16 18:42:04 +08:00
sijinhui
946c3b67f6 merge 2024-07-16 18:29:03 +08:00
sijinhui
f7c5f1484f
Merge pull request #121 from sijinhui/dev
Dev
2024-07-12 13:50:41 +08:00
sijinhui
dc92fb3476 自动修复有点毛病 2024-07-12 13:49:51 +08:00
sijinhui
043c6d7efc 更新配置文件自动更新功能 2024-07-12 13:49:35 +08:00
sijinhui
deea545ee4
Merge pull request #120 from sijinhui/dev
Dev
2024-07-12 11:59:58 +08:00
sijinhui
6e4d2c76d8 更新包 2024-07-12 11:58:41 +08:00
sijinhui
44353c2f8b 更新包 2024-07-12 11:53:01 +08:00
sijinhui
ce01618dd5 修复包版本过低,提示会有问题的bug 2024-07-12 11:44:17 +08:00
sijinhui
c0f7bc50fb
Merge pull request #118 from sijinhui/dev
Dev
2024-07-12 11:38:21 +08:00
sijinhui
04ceade37a merge 2024-07-12 11:37:33 +08:00
sijinhui
d3356f692e Merge remote-tracking branch 'upstream/main' into dev 2024-07-12 11:36:21 +08:00
sijinhui
37392d068c 修复模型选择继承的小bug 2024-07-12 11:28:32 +08:00
sijinhui
90bbcc06d6
Merge pull request #117 from sijinhui/dev
注释一堆注释
2024-07-12 00:35:22 +08:00
sijinhui
4733de20b2 注释一堆注释 2024-07-12 00:33:13 +08:00
sijinhui
1c82228ac8
Merge pull request #116 from sijinhui/dev
merge
2024-07-12 00:22:02 +08:00
sijinhui
578f0b883c 修复错误 2024-07-12 00:21:14 +08:00
sijinhui
9066c4eb55 逐步修改url链接 2024-07-12 00:07:32 +08:00
sijinhui
7c63912e85 修复merge bug 2024-07-12 00:01:27 +08:00
Dogtiti
89049e1a22
Merge pull request #4974 from ConnectAI-E/hotfix/bytedance
hotfix: doubao display name
2024-07-11 14:57:21 +08:00
lloydzhou
5e7254e8dc hotfix: doubao display name 2024-07-11 14:46:12 +08:00
sijinhui
cf8f587a56 merge 暂存 2024-07-11 13:15:24 +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
Dogtiti
f8c2732fdc
Merge pull request #4971 from ConnectAI-E/hotfix/alibaba
change build messages for qwen in client
2024-07-11 10:25:39 +08:00
lloydzhou
fec36eb298 hotfix 2024-07-11 10:22:30 +08:00
lloydzhou
2299a4156d change build messages for qwen in client 2024-07-11 00:50:58 +08:00
lloydzhou
32b82b9cb3 change build messages for qwen in client 2024-07-11 00:48:58 +08:00
Lloyd Zhou
ba6039fc8b
Merge pull request #4968 from ConnectAI-E/hotfix/google
hotfix Gemini finish twice. #4955 #4966
2024-07-10 20:19:29 +08:00
lloydzhou
6885812d21 hotfix Gemini finish twice. #4955 #4966 2024-07-10 18:59:44 +08:00
Lloyd Zhou
844025ec14
Merge pull request #4942 from ConnectAI-E/feature/alibaba
feat: qwen
2024-07-09 21:51:16 +08:00
Lloyd Zhou
94bc91c554
Merge pull request #4939 from ConnectAI-E/feature/ByteDance
Feature/byte dance
2024-07-09 21:48:22 +08:00
lloydzhou
044c16da4c update 2024-07-09 21:17:32 +08:00
lloydzhou
cd4784c54a update 2024-07-09 21:14:38 +08:00
lloydzhou
814aaa4a69 update config for alibaba(qwen) 2024-07-09 20:15:20 +08:00
lloydzhou
e3b3a4fefa add custom settings 2024-07-09 20:09:03 +08:00
lloydzhou
3fcbb3010d Merge branch 'feature/ByteDance' into feature/alibaba 2024-07-09 20:04:53 +08:00
lloydzhou
7573a19dc9 add custom settings 2024-07-09 20:01:58 +08:00
lloydzhou
3628d68d9a update 2024-07-09 19:56:52 +08:00
lloydzhou
23872086fa merge code 2024-07-09 19:37:47 +08:00
lloydzhou
bb349a03da fix get headers for bytedance 2024-07-09 19:21:27 +08:00
lloydzhou
82be426f78 fix eslint error 2024-07-09 18:19:34 +08:00
lloydzhou
9d2a633f5e 更新文档支持配置豆包的模型 2024-07-09 18:15:43 +08:00
lloydzhou
1149d45589 remove check vision model 2024-07-09 18:06:59 +08:00
lloydzhou
9d7e19cebf display doubao model name when select model 2024-07-09 18:05:23 +08:00
lloydzhou
b3023543d6 update 2024-07-09 16:55:33 +08:00
lloydzhou
c229d2c3ce merge main 2024-07-09 16:53:15 +08:00
Lloyd Zhou
47ea383ddd
Merge pull request #4936 from ConnectAI-E/feat-baidu
feat: support baidu model
2024-07-09 16:45:46 +08:00
lloydzhou
f2a35f1114 add missing file 2024-07-09 16:38:22 +08:00