Commit Graph

2155 Commits

Author SHA1 Message Date
sijinhui
fd4f05aa39 fix merge 2024-04-11 10:18:01 +08:00
sijinhui
a927024312 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/constant.ts
2024-04-11 10:07:03 +08:00
sijinhui
0bb7dc4f37 fix env 2024-04-11 10:03:52 +08:00
sijinhui
5c657c216e fix env 2024-04-11 09:57:32 +08:00
DeanYao
55a93e7b47
Merge pull request #4487 from leo4life2/main
Support `gpt-4-turbo` and `gpt-4-turbo-2024-04-09`
2024-04-11 09:26:08 +08:00
sijinhui
198f9be5e5 fix deploy 2024-04-10 23:33:26 +08:00
sijinhui
40c6225c23 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/constant.ts
#	app/store/chat.ts
#	app/utils/model.ts
2024-04-10 23:23:17 +08:00
sijinhui
cd6d07d7ec fix env 2024-04-10 19:02:27 +08:00
Leo Li
f101ee3c4f
support new vision models 2024-04-10 05:33:54 -04:00
Leo Li
6319f41b2c
add new turbo 2024-04-10 05:18:39 -04:00
Leo Li
6c718ada1b
Merge branch 'main' of github.com:ChatGPTNextWeb/ChatGPT-Next-Web 2024-04-10 05:14:44 -04:00
sijinhui
8e805b574f test pack 2024-04-10 17:08:05 +08:00
sijinhui
963f60ab94 test pack 2024-04-10 17:07:39 +08:00
sijinhui
f5db5a79a1 test pack 2024-04-10 17:00:59 +08:00
DeanYao
67acc38a1f
Merge pull request #4480 from ChatGPTNextWeb/chore-fix
feat: Solve the problem of using openai interface protocol for user-d…
2024-04-10 09:26:21 +08:00
DeanYao
dd1d8509f0
Merge pull request #4476 from dlb-data/dlb-data-patch-1
Update layout.tsx
2024-04-10 09:13:22 +08:00
sijinhui
4bb1559cc1 merge 2024-04-10 08:46:11 +08:00
sijinhui
4e4aeb5d02 Merge remote-tracking branch 'upstream/main' into dev 2024-04-10 08:44:52 +08:00
butterfly
79f342439a feat: Solve the problem of using openai interface protocol for user-defined claude model & add some famous webdav endpoints 2024-04-09 20:49:51 +08:00
DeanYao
13db64f0ec
Merge pull request #4479 from ChatGPTNextWeb/chore-fix
feat: white webdav server domain
2024-04-09 18:34:28 +08:00
butterfly
908ce3bbd9 feat: Optimize document 2024-04-09 18:25:51 +08:00
butterfly
df3313971d feat: Optimize code 2024-04-09 18:24:22 +08:00
butterfly
b175132854 feat: Optimize var names 2024-04-09 18:23:52 +08:00
butterfly
4cb0655192 feat: Optimize document 2024-04-09 18:17:00 +08:00
butterfly
8b191bd2f7 feat: white webdav server domain 2024-04-09 18:05:56 +08:00
sijinhui
2941d1afb0 Merge remote-tracking branch 'upstream/main' into dev 2024-04-09 16:57:43 +08:00
sijinhui
f80d19e305 fix midjouney to 100% error 2024-04-09 16:56:50 +08:00
DeanYao
f3106e3bbb
Merge pull request #4477 from ChatGPTNextWeb/chore-fix
feat: 补充文档
2024-04-09 16:50:47 +08:00
butterfly
7fcfbc3729 feat: 补充文档 2024-04-09 16:49:51 +08:00
dlb-data
598468c2b7
Update layout.tsx 2024-04-09 16:34:21 +08:00
dlb-data
84681d3878
Update layout.tsx 2024-04-09 16:24:03 +08:00
sijinhui
9d306118b3 merge upstream 2024-04-09 12:52:27 +08:00
DeanYao
c7b14cba4d
Merge pull request #4470 from ChatGPTNextWeb/chore-fix
feat: fix system prompt
2024-04-09 10:45:55 +08:00
butterfly
d508127452 feat: fix system prompt 2024-04-09 10:45:09 +08:00
sijinhui
a83d79a9f4 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/auth.ts
#	app/client/platforms/openai.ts
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/locales/pt.ts
#	app/locales/sk.ts
#	app/locales/tw.ts
#	app/store/chat.ts
2024-04-09 10:39:16 +08:00
DeanYao
984c79e2d2
Merge pull request #4469 from ChatGPTNextWeb/chore-fix
feat: remove debug code
2024-04-09 09:13:07 +08:00
butterfly
6cb296f952 feat: remove debug code 2024-04-09 09:12:18 +08:00
DeanYao
db533fc166
Merge pull request #4466 from ChatGPTNextWeb/chore-fix
feat: modify some propmt in DEFAULT_INPUT_TEMPLATE about expressing l…
2024-04-08 19:33:27 +08:00
butterfly
02b0e79ba3 feat: modify some propmt in DEFAULT_INPUT_TEMPLATE about expressing latex 2024-04-08 19:27:22 +08:00
DeanYao
1b83dd0a8a
Merge pull request #4462 from ChatGPTNextWeb/chore-fix
feat: fix no max_tokens in payload when calling openai vision model
2024-04-08 18:31:52 +08:00
butterfly
9b982b408d feat: fix no max_tokens in payload when calling openai vision model 2024-04-08 18:29:08 +08:00
DeanYao
9b03ab830d
Merge pull request #4461 from ChatGPTNextWeb/chore-fix
feat: remove duplicate Input Template
2024-04-08 18:08:48 +08:00
butterfly
264da6798c feat: remove duplicate Input Template 2024-04-08 18:06:17 +08:00
DeanYao
f68b8afa8d
Merge pull request #4457 from ChatGPTNextWeb/feat-multi-models
Feat multi models
2024-04-08 17:10:29 +08:00
butterfly
63f9063255 feat: call claude api not in credential 'include' mode 2024-04-08 15:33:27 +08:00
butterfly
6dad353e1c feat: call claude api not in credential 'include' mode 2024-04-08 15:33:02 +08:00
butterfly
5446d8d4a2 feat: fix illegal exports in app/api/anthropic/[...path]/route.ts 2024-04-08 13:59:55 +08:00
butterfly
ef7617d545 feat: configs about app client 2024-04-08 13:41:02 +08:00
sijinhui
d2b9200bc0 fix bug cache 2024-04-08 10:25:43 +08:00
sijinhui
bb1ed984d6 Little fix 2024-04-08 08:49:17 +08:00