Commit Graph

2307 Commits

Author SHA1 Message Date
sijinhui
f977c52859 merge 2024-05-07 16:46:38 +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
DeanYao
3513c6801e
Merge pull request #4626 from ChatGPTNextWeb/chore-fix
feat: googleApiKey & anthropicApiKey support setting multi-key
2024-05-07 15:06:02 +08:00
Dean-YZG
864529cbf6 feat: googleApiKey & anthropicApiKey support setting multi-key 2024-05-06 21:14:53 +08:00
DeanYao
58c0d3e12d
Merge pull request #4625 from ChatGPTNextWeb/chore-fix
feat: fix 1)the property named 'role' of the first message must be 'u…
2024-05-06 20:48:29 +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
377e8d19b6 test pack 2024-05-06 19:11:51 +08:00
sijinhui
f2e2c01787 test pack 2024-05-06 18:59:09 +08:00
sijinhui
d9e0d3b19d test pack 2024-05-06 18:45:03 +08:00
sijinhui
3dce5e2b89 test pack 2024-05-04 19:01:22 +08:00
sijinhui
942b48de69 test pack 2024-05-04 12:41:49 +08:00
sijinhui
14faccb1a6 test pack 2024-05-04 12:39:19 +08:00
sijinhui
6a004421fc test pack 2024-05-04 11:48:16 +08:00
sijinhui
51e1fdf366 fix pack 2024-05-03 17:19:09 +08:00
sijinhui
8496085003 fix pack 2024-05-03 17:13:57 +08:00
sijinhui
ad10f9cfc5 fix ip long 2024-05-03 17:00:12 +08:00
sijinhui
a82a32163c debug log 2024-05-03 16:42:37 +08:00
sijinhui
62e23bc7a5 opt user table 2024-05-03 08:25:37 +08:00
sijinhui
2843e3fab1 opt user table 2024-05-01 17:19:26 +08:00
sijinhui
8a39cd2a87 opt login error 2024-04-30 17:36:30 +08:00
fred-bf
52312dbd23
Merge pull request #4595 from ChatGPTNextWeb/feat/bump-version
feat: bump version code
2024-04-30 13:28:30 +08:00
Fred
b2e8a1eaa2
feat: bump version code 2024-04-30 13:27:07 +08:00
sijinhui
852401d556 fix little bug 2024-04-29 23:11:16 +08:00
sijinhui
48517034f2 fix little bug 2024-04-29 23:09:57 +08:00
sijinhui
a64f52ecbb update user admin 2024-04-29 23:04:59 +08:00
sijinhui
fe48b5acfc 暂存 2024-04-29 18:35:51 +08:00
sijinhui
209f23f2f0 暂存 2024-04-29 18:32:05 +08:00
sijinhui
7611c58527 Initial commit with the content of temp branch 2024-04-29 17:19:44 +08:00
sijinhui
fc39af6dbf Revert "fix build error"
This reverts commit 9017e6a0b7.
2024-04-29 13:51:57 +08:00
sijinhui
9017e6a0b7 fix build error 2024-04-29 13:41:29 +08:00
sijinhui
de704b2d40 opt admin man 2024-04-29 13:21:06 +08:00
sijinhui
81eb6a25bb fix chart bug 2024-04-29 13:05:09 +08:00
sijinhui
c2e385e88d fix logined user issue 2024-04-29 13:01:20 +08:00
sijinhui
ee2e66fc93 Merge branch 'main' into dev 2024-04-29 11:16:23 +08:00
sijinhui
b5e41896bf optimize auth 2024-04-29 08:48:30 +08:00
sijinhui
35e7f12d88 add model 2024-04-28 14:34:58 +08:00
sijinhui
0b713200fd 123 2024-04-26 22:52:35 +08:00
sijinhui
6c6453644e
Merge pull request #73 from sijinhui/dev
Dev
2024-04-26 18:12:44 +08:00
sijinhui
84638d9364 fix log 2024-04-26 18:12:07 +08:00
sijinhui
2100f681df debug log 2024-04-26 18:00:03 +08:00
sijinhui
70ff0ccb9c
Merge pull request #72 from sijinhui/dev
merge Dev
2024-04-26 16:32:13 +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
sijinhui
489222feef 1 2024-04-26 11:11:14 +08:00
sijinhui
19d7ac5862 test loading 2024-04-26 11:03:13 +08:00
DeanYao
506c17a093
Merge pull request #4564 from MrrDrr/gpt4v_remove_max_tokens
remove max_tokens from the official version of gpt4-turbo
2024-04-25 13:01:21 +08:00
DeanYao
69642fba52
Merge pull request #4557 from RoyRao2333/dev/no-fucos-outline
chore: No outline when element is in `:focus-visible` state
2024-04-25 12:58:19 +08:00
DeanYao
7d647c981f
Merge pull request #4535 from RubuJam/main
Refer to OpenAI documentation to delete some models.
2024-04-25 11:44:01 +08:00
DeanYao
9aec3b714e
Merge pull request #4545 from jalr4ever/main-default-model-env
Support a way to define default model by adding DEFAULT_MODEL env.
2024-04-25 10:58:14 +08:00