Commit Graph

215 Commits

Author SHA1 Message Date
jiangying
74a0810bbb fix typo 2024-07-17 12:49:11 +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
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
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
sijinhui
007c004a44 修改最大限制 2024-06-24 18:09:58 +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
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
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
sijinhui
2c488675c6 更新token的计算方式,优化请求逻辑 2024-05-08 22:52:15 +08:00
sijinhui
e214302817 更新token的计算方式 2024-05-08 22:28:55 +08:00
sijinhui
5b1f0355ce Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/config/server.ts
#	app/utils/model.ts
2024-05-07 16:39:45 +08:00
Dean-YZG
a1493bfb4e feat: bugfix 2024-05-06 20:46:53 +08:00
butterfly
b3e856df1d feat: fix 1)the property named 'role' of the first message must be 'user' 2)if default summarize model 'gpt-3.5-turbo' is blocked, use currentModel instead 3)if apiurl&apikey set by location, useCustomConfig would be opened 2024-05-06 19:26:39 +08:00
sijinhui
a1a09c4061 merge 2024-04-26 14:32:44 +08:00
sijinhui
f07a3729b9 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/chat.tsx
#	app/constant.ts
#	app/store/access.ts
#	app/utils/hooks.ts
2024-04-26 14:02:16 +08:00
Wayland Zhan
c96e4b7966 feat: Support a way to define default model by adding DEFAULT_MODEL env. 2024-04-19 06:57:15 +00:00
sijinhui
9afa9057c8 add mask 2024-04-16 13:48:30 +08:00
sijinhui
1579d1003a 暂存 2024-04-16 13:20:42 +08:00
sijinhui
e2f78ede72 optimize mask 2024-04-13 10:44:29 +08:00
sijinhui
8620df325d 增加语音输入 2024-03-28 00:48:40 +08:00
sijinhui
7ffabb77f9 test 2024-03-27 20:03:13 +08:00
sijinhui
f3faa17f9d
Merge branch 'ChatGPTNextWeb:main' into main 2024-03-20 22:52:09 +08:00
Raax
028957fcdc Fix "Enter" bug
Fix Chinese input method "Enter" on Safari
2024-03-16 21:55:16 +08:00
sijinhui
e56ddc69d4 用户页面增加使用token显示 2024-03-01 16:08:16 +08:00
sijinhui
637ea7bc27 Merge remote-tracking branch 'upstream/main' into dev 2024-03-01 15:47:11 +08:00
sijinhui
dd6034de58 用户页面增加使用token显示 2024-03-01 15:45:52 +08:00
sijinhui
ae03aa7a23 用户页面增加使用token显示 2024-03-01 15:45:12 +08:00
Snow Kawashiro
9775660da7
Update chat.tsx 2024-02-28 20:45:42 +08:00
Snow Kawashiro
e7051353eb
vision_model_only 2024-02-28 20:38:00 +08:00
Snow Kawashiro
bd19e97cf8
add_image_pasting 2024-02-28 20:05:13 +08:00
sijinhui
e1644b5203 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/locales/tw.ts
2024-02-27 17:54:35 +08:00
Fred
e3b3ae97bc
chore: clear scroll info 2024-02-27 11:49:44 +08:00
Fred
410a22dc63
feat: auto detach scrolling 2024-02-27 11:43:40 +08:00
sijinhui
747bed9826 重构绘图相关 2024-02-22 00:21:36 +08:00
sijinhui
262164c5ad 修复开发环境反复刷新的问题 2024-02-21 17:23:38 +08:00
sijinhui
948b0ae305 修复merge bug 2024-02-21 14:45:34 +08:00
sijinhui
c42a9554a5 暂存merge 2024-02-21 14:32:47 +08:00
sijinhui
e3b0d909fe 暂存merge 2024-02-21 14:16:58 +08:00