Commit Graph

284 Commits

Author SHA1 Message Date
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
Dogtiti
9bdd37bb63 feat: qwen 2024-07-07 21:59:56 +08:00
Dogtiti
2ec8b7a804 Merge branch 'main' of https://github.com/ConnectAI-E/ChatGPT-Next-Web into feature/ByteDance 2024-07-06 21:14:07 +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
9b3b4494ba wip: doubao 2024-07-06 14:59:37 +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
lloydzhou
a68341eae6 include providerId in fullName 2024-07-04 16:11:37 +08:00
lloydzhou
aa08183439 hotfix 2024-07-04 16:03:35 +08:00
lloydzhou
14f2a8f370 merge model with modelName and providerName 2024-07-04 15:32:08 +08:00
sijinhui
9bab4b736f 禁止管理员外用户使用某些模型 2024-07-01 17:53:59 +08:00
sijinhui
10cc788a49 添加模型 2024-06-24 23:26:14 +08:00
sijinhui
007c004a44 修改最大限制 2024-06-24 18:09:58 +08:00
sijinhui
ef4927a2ab 修改openai模型 2024-06-07 17:10:12 +08:00
sijinhui
a697822445 限制每天使用量 2024-05-25 21:14:21 +08:00
sijinhui
402d6b9664 删除掉没用的模型 2024-05-23 13:38:17 +08:00
sijinhui
4b1fcdac0d 添加微软gpt-4o 2024-05-23 13:29:32 +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
Hao Jia
01c9dbc1fd Merge remote-tracking branch 'origin/main' into gpt-4o
# Conflicts:
#	public/apple-touch-icon.png
2024-05-16 14:43:10 +08:00
Dean-YZG
0aa807df19 feat: remove empty memoryPrompt in ChatMessages 2024-05-16 14:41:18 +08:00
sijinhui
cb62fa7634 add gpt-4o 2024-05-14 13:48:12 +08:00
Dean-YZG
fffbee80e8 Merge remote-tracking branch 'origin/main' into chore-fix 2024-05-13 17:58:28 +08:00
Dean-YZG
9d7ce207b6 feat: support env var DEFAULT_INPUT_TEMPLATE to custom default template for preprocessing user inputs 2024-05-13 17:11:35 +08:00
Dean-YZG
2d1f0c9f57 feat: support env var DEFAULT_INPUT_TEMPLATE to custom default template for preprocessing user inputs 2024-05-13 17:11:11 +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
e1de919769
Merge pull request #92 from ChatGPTNextWeb/main
merge
2024-05-13 13:40:56 +08:00
DeanYao
212ae76d76
Merge pull request #4610 from rooben-me/fix-sync
Fix Sync Issue with Upstash
2024-05-13 11:28:29 +08:00
sijinhui
b449d87252 opt cdn 2024-05-09 11:23:47 +08:00
sijinhui
0914682095 change model 2024-05-08 23:39:49 +08:00
sijinhui
4fc3de5c55 package 2024-05-08 11:37:50 +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
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
ruban
8ef2617eec
Removed spaces 2024-05-02 23:24:41 -07:00
ruban
1da7d81122
Fix cloud data sync issue with Upstash (#4563) 2024-05-02 23:22:32 -07:00
ruban
a103582346
fix 2024-05-02 23:10:10 -07:00
ruban
7b61d05e88
new fix 2024-05-02 23:08:17 -07:00
ruban
6fc7c50f19
this 2024-05-02 22:55:41 -07:00
ruban
9d728ec3c5
this is ti 2024-05-02 22:50:35 -07:00
ruban
9cd3358e4e
this is the fix 2024-05-02 22:40:52 -07:00
ruban
4cd94370e8 fix i think 2024-05-03 05:25:11 +00:00
sijinhui
35e7f12d88 add model 2024-04-28 14:34:58 +08:00