Commit Graph

646 Commits

Author SHA1 Message Date
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
ac04a1cac8 resolve conflicts 2024-07-20 14:41:42 +08:00
lloydzhou
87a286ef07 refactor setting page 2024-07-20 14:36:47 +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
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
YeungYeah
ee22fba448
Merge branch 'main' into main 2024-07-17 22:16:30 +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
jiangying
74a0810bbb fix typo 2024-07-17 12:49:11 +08:00
jiangying
47d27c1f41 fix typo 2024-07-16 14:35:06 +08:00
lloydzhou
53c1176cbf update labels in setting page 2024-07-12 23:06:37 +08:00
sijinhui
04ceade37a merge 2024-07-12 11:37:33 +08:00
sijinhui
37392d068c 修复模型选择继承的小bug 2024-07-12 11:28:32 +08:00
sijinhui
4733de20b2 注释一堆注释 2024-07-12 00:33:13 +08:00
sijinhui
578f0b883c 修复错误 2024-07-12 00:21:14 +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
Lloyd Zhou
844025ec14
Merge pull request #4942 from ConnectAI-E/feature/alibaba
feat: qwen
2024-07-09 21:51:16 +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
e3b3a4fefa add custom settings 2024-07-09 20:09:03 +08:00
lloydzhou
7573a19dc9 add custom settings 2024-07-09 20:01:58 +08:00
lloydzhou
82be426f78 fix eslint error 2024-07-09 18:19:34 +08:00
lloydzhou
9d7e19cebf display doubao model name when select model 2024-07-09 18:05:23 +08:00
Dogtiti
9f7d137b05 Merge branch 'main' of https://github.com/ConnectAI-E/ChatGPT-Next-Web into feat-baidu 2024-07-06 21:11:50 +08:00
Dogtiti
785d3748e1 feat: support baidu model 2024-07-06 13:05:09 +08:00
Dogtiti
5e0657ce55 feat: add getClientApi method 2024-07-06 11:27:53 +08:00
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
sijinhui
10badbdd5e add claude icon 2024-06-24 23:41:46 +08:00
sijinhui
007c004a44 修改最大限制 2024-06-24 18:09:58 +08:00
YeungYeah
74986803db feat: add google api safety setting 2024-06-15 12:09:58 +08:00
sijinhui
d2a8586ee2 发送消息时也结束语音识别 2024-05-28 08:37:08 +08:00
sijinhui
e58deec255 调整语音为点按结束 2024-05-27 23:11:01 +08:00
sijinhui
ac6b02f678 调整语音为点按结束 2024-05-27 23:09:08 +08:00
sijinhui
cce6bcbbc8 微调样式 2024-05-26 13:19:12 +08:00
sijinhui
b7a216c35b 微调样式 2024-05-26 13:17:35 +08:00
sijinhui
a697822445 限制每天使用量 2024-05-25 21:14:21 +08:00
DeanYao
d89a12aa05
Revert "Chat gpt" 2024-05-20 19:02:46 +08:00
sijinhui
941f40afb5 优化新建窗口可以继承模型配置 2024-05-17 13:15:22 +08:00
sijinhui
aac77eb980 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/store/config.ts
#	app/utils.ts
#	yarn.lock
2024-05-17 09:59:38 +08:00
Kivi1998
7f3516f44f
Merge branch 'main' into chatGPT 2024-05-16 15:14:43 +08:00
Hao Jia
bfdb47a7ed ChatGPT Logo 2024-05-16 15:03:14 +08:00
sijinhui
424199a697 优化模型选择ui 2024-05-15 17:31:57 +08:00
sijinhui
15ddb5fe8c 优化模型选择ui 2024-05-15 17:21:01 +08:00
sijinhui
e098bd6f6a 优化模型选择ui 2024-05-15 15:23:48 +08:00
sijinhui
71176bcc74 update ui 2024-05-15 00:39:45 +08:00
sijinhui
c2f563677e 暂存 2024-05-14 17:56:00 +08:00
sijinhui
ebbf9e4f7c 暂存 2024-05-14 17:28:09 +08:00
Dean-YZG
c10447df79 feat: 1)upload image with type 'heic' 2)change the empty message to ';' for models 3) 2024-05-13 16:24:15 +08:00