Commit Graph

1708 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
7974974fbf Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-12 00:58:29 +00:00
Yifei Zhang
295864d36b
Merge pull request #3231 from Yidadaa/bugfix-1112 2023-11-12 01:23:56 +08:00
Yidadaa
be6d45e49f feat: close #3222 share message list should start from clear context index 2023-11-12 01:21:39 +08:00
Yifei Zhang
22b6987249
Merge pull request #3230 from Yidadaa/bugfix-1112 2023-11-12 00:52:21 +08:00
Yidadaa
64647b0bb3 chore: update doc for mapped CUSTOM_MODELS 2023-11-12 00:49:58 +08:00
Yidadaa
a5a1f2e8ad feat: CUSTOM_MODELS support mapper 2023-11-12 00:46:21 +08:00
Yifei Zhang
8bd39f33e0
Merge pull request #3229 from Yidadaa/bugfix-1112 2023-11-12 00:31:15 +08:00
Yidadaa
be9774943b feat: #3224 auto switch to first avaliable model 2023-11-12 00:29:36 +08:00
DirkSchlossmacher
945160a66f Merge remote-tracking branch 'upstream/main' 2023-11-10 15:29:44 +01:00
DirkSchlossmacher
7a7d82a8a6 clone.ts 2023-11-10 15:16:45 +01:00
DirkSchlossmacher
f26f5e5bb4 gpt-4-1106-preview 2023-11-10 14:13:04 +01:00
DirkSchlossmacher
dc0f4a6327 model clean-up 2023-11-10 14:04:12 +01:00
Yifei Zhang
943214c6a7
Update README_CN.md 2023-11-10 18:21:22 +08:00
Yifei Zhang
ca792669fc
Update constant.ts 2023-11-10 18:20:51 +08:00
Yifei Zhang
78d68a9949
Merge pull request #3214 from Ensteinjun/main 2023-11-10 15:58:28 +08:00
Ensteinjun
6b2db97347 fixbug 2023-11-10 15:44:07 +08:00
Yifei Zhang
2bfb362832
Update tauri.conf.json 2023-11-10 15:19:31 +08:00
Yidadaa
cb140e482f fix: #3207 ensure corner case 2023-11-10 15:15:43 +08:00
DirkSchlossmacher
04e29036e3 full Adx mask 2023-11-10 03:36:52 +01:00
DirkSchlossmacher
aba11530ef duplicates 2023-11-10 03:31:57 +01:00
DirkSchlossmacher
e190621a4e VERCEL?: "1" | undefined; 2023-11-10 03:29:25 +01:00
DirkSchlossmacher
f418ac7d51 PROXY_URL duplicate 2023-11-10 03:12:10 +01:00
DirkSchlossmacher
6e7cede1a0 Squashed commit of the following:
commit e6b72ac1ff
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Fri Nov 10 02:59:47 2023 +0800

    Update README.md

commit 8032e6d68d
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Fri Nov 10 02:59:30 2023 +0800

    Update README.md

commit c7e0a6f37f
Author: Yidadaa <yidadaa@qq.com>
Date:   Fri Nov 10 02:57:40 2023 +0800

    doc: update azure env vars

commit 1141cd2e6e
Merge: fd2f441 c9dd953
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Fri Nov 10 02:55:12 2023 +0800

    Merge pull request #3206 from Yidadaa/azure

commit c9dd953817
Author: Yidadaa <yidadaa@qq.com>
Date:   Fri Nov 10 02:50:50 2023 +0800

    fixup

commit b7ffca031e
Author: Yidadaa <yidadaa@qq.com>
Date:   Fri Nov 10 02:43:30 2023 +0800

    feat: close #935 add azure support

commit fd2f441e02
Author: Yifei Zhang <yidadaa@qq.com>
Date:   Thu Nov 9 20:45:25 2023 +0800

    feat: wont send max_tokens
2023-11-10 03:06:59 +01:00
Yifei Zhang
e6b72ac1ff
Update README.md 2023-11-10 02:59:47 +08:00
Yifei Zhang
8032e6d68d
Update README.md 2023-11-10 02:59:30 +08:00
Yidadaa
c7e0a6f37f doc: update azure env vars 2023-11-10 02:57:46 +08:00
Yifei Zhang
1141cd2e6e
Merge pull request #3206 from Yidadaa/azure 2023-11-10 02:55:12 +08:00
Yidadaa
c9dd953817 fixup 2023-11-10 02:50:50 +08:00
Yidadaa
b7ffca031e feat: close #935 add azure support 2023-11-10 02:43:37 +08:00
DirkSchlossmacher
459d86b90b AdEx long mask 2023-11-09 18:24:25 +01:00
DirkSchlossmacher
5c35980d9a max token locales 2023-11-09 16:36:01 +01:00
DirkSchlossmacher
a953fab34b GPT-4-1106-preview + 4000 Max Tokens 2023-11-09 16:00:01 +01:00
DirkSchlossmacher
4373e3ed8d max_tokens: 4000, 2023-11-09 14:23:32 +01:00
Yifei Zhang
fd2f441e02
feat: wont send max_tokens 2023-11-09 20:45:25 +08:00
DirkSchlossmacher
c9b62875f1 gpt-4 2023-11-09 12:22:53 +01:00
DirkSchlossmacher
c3175d2124 default model config 2023-11-09 12:08:53 +01:00
DirkSchlossmacher
7038247e13 CloseIcon 2023-11-09 10:49:58 +01:00
DirkSchlossmacher
0656211cf4 from "react"; 2023-11-09 10:27:53 +01:00
DirkSchlossmacher
70c72e1def Merge remote-tracking branch 'upstream/HEAD' 2023-11-09 07:35:07 +01:00
Yifei Zhang
3b3ebda34b
fix: #3196 3.5-turbo-1106 should use old cutoff date 2023-11-09 11:01:41 +08:00
Yifei Zhang
87e3d663a2
fix: #3192 use smaller max_tokens as default 2023-11-09 11:00:09 +08:00
Yidadaa
d0a1d910d4 fix: #3186 enable max_tokens in chat payload 2023-11-09 03:19:13 +08:00
Yifei Zhang
33b97082fa
Merge pull request #3192 from Yidadaa/bugfix-1109 2023-11-09 03:05:41 +08:00
Yidadaa
d93f05f511 feat: close #3187 use CUSTOM_MODELS to control model list 2023-11-09 03:01:29 +08:00
Yifei Zhang
3dc29197e1
Merge pull request #3191 from Yidadaa/bugfix-1109 2023-11-09 02:23:20 +08:00
DirkSchlossmacher
50e0f668fd
Merge branch 'Yidadaa:main' into main 2023-11-08 19:06:00 +01:00
Yidadaa
fbc0236748 fix: #3174 should prompt to confirm to delete chat 2023-11-09 02:03:05 +08:00
Yifei Zhang
1304a3943a
Merge pull request #3190 from Yidadaa/bugfix-1109 2023-11-09 01:54:09 +08:00
Yidadaa
8c0ba1aee2 feat: close #2954 chat summary should be copyable 2023-11-09 01:51:33 +08:00
DirkSchlossmacher
9023486eb9 gpt-4-1106-preview 2023-11-08 17:34:09 +01:00