Commit Graph

1497 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
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
1bc6a79d6a Merge remote-tracking branch 'upstream/main' into dev 2024-07-19 18:06:31 +08:00
sijinhui
60813d448f 修改消息压缩使用的模型url 2024-07-19 18:03:38 +08:00
lloydzhou
862c2e8810 hotfix for code review 2024-07-19 17:22:54 +08:00
lloydzhou
052004d70e using compressImage when serviceWorker register error 2024-07-19 16:03:22 +08:00
lloydzhou
ac470a6d07 Merge remote-tracking branch 'connectai/feature-cache-storage' into feature-cache-storage 2024-07-19 15:39:51 +08:00
Dogtiti
7237d33be3 fix: ts type 2024-07-19 14:55:47 +08:00
lloydzhou
1610b480af remove console.log 2024-07-19 13:54:33 +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
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
Dogtiti
8464ca8931
Merge pull request #5045 from ConnectAI-E/fix/google
refactor: google
2024-07-19 10:19:04 +08:00
Peter Dave Hello
9caf820758 Add GPT-4o mini support
Reference:
- https://platform.openai.com/docs/models/gpt-4o-mini
- https://openai.com/index/gpt-4o-mini-advancing-cost-efficient-intelligence/
2024-07-19 03:21:40 +08:00
YeungYeah
26c2598f56 fix: fix bug in generating wrong gemini request url 2024-07-18 23:41:20 +08:00
Lloyd Zhou
ca51c2e93d
Merge pull request #5035 from DDDDD12138/code-cleanup
chore: remove unused imports and correct typos
2024-07-18 21:05:52 +08:00
sijinhui
fc94142267
Merge pull request #126 from ChatGPTNextWeb/main
merge
2024-07-18 13:46:37 +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
Dogtiti
f8a2a28bff
Merge pull request #5041 from DDMeaqua/feat-scrollbar-css
scrollbar width change
2024-07-17 20:09:43 +08:00
Dogtiti
b3cfaf1420 refator: google 2024-07-17 20:05:34 +08:00
consistent-k
9aabc4ad6a update constant for baidu add ernie-tiny model 2024-07-17 10:41:31 +00:00
consistent-k
5dc731bc77 update constant for baidu add ernie-speed model 2024-07-17 09:29:43 +00:00
DDMeaqua
32d05c9855 feat: scrollbar width change 2024-07-17 17:01:50 +08:00
consistent-k
5a0d0c0b75 update constant for baidu add ernie-speed model 2024-07-17 08:54:53 +00: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
jiangying
74a0810bbb fix typo 2024-07-17 12:49:11 +08:00
lloydzhou
9d5e2e6a80 update labels in setting page 2024-07-17 12:49:10 +08:00
lloydzhou
065f91d8dd hotfix: bytedance custom models 2024-07-17 12:48:59 +08:00
lloydzhou
7102bed959 update 2024-07-17 12:48:59 +08:00
lloydzhou
32a5523aa7 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
2cfdf34163 hotfix: using custom models, create custom provider 2024-07-17 12:48:59 +08:00
lloydzhou
ffddf93a8f support cloudflare ai gateway 2024-07-17 12:48:57 +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
jiangying
47d27c1f41 fix typo 2024-07-16 14:35:06 +08:00
LiuElric
8e4d26163a
Merge pull request #4989 from ConnectAI-E/hotfix/cf-ai-gateway
update custom bytedance models, and update labels in setting page
2024-07-12 23:10:25 +08:00
lloydzhou
53c1176cbf update labels in setting page 2024-07-12 23:06:37 +08:00