Commit Graph

175 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
ed179422b0 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-09-13 00:57:06 +00:00
Yidadaa
6f83fbd212 feat: add webdav support 2023-09-13 02:51:02 +08:00
GH Action - Upstream Sync
8e9258010f Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-09-12 00:54:33 +00:00
B0zal
605dd72354
[+] CodeQL Report Fix log injection vulnerability in useSyncStore
Severity : High
Sanitize the 'res' object before logging it in the 'check' method of useSyncStore to prevent log injection attacks.
The 'res' object is now sanitized by extracting only the necessary properties ('status', 'statusText', and 'headers') and logging the sanitized object instead.
This ensures that only safe and expected data is logged, mitigating the risk of log injection vulnerabilities.
2023-09-11 08:49:08 +07:00
GH Action - Upstream Sync
95f26253df Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-09-11 00:56:19 +00:00
Yidadaa
415e9dc913 fixup: minor sync fixup 2023-09-11 00:34:51 +08:00
Yidadaa
c73a91a0f5 fixup: fix type errors 2023-09-11 00:24:05 +08:00
Yidadaa
38f6956e71 feat: close #2754 add import/export to file 2023-09-11 00:20:23 +08:00
DirkSchlossmacher
6abd2518eb Merge remote-tracking branch 'upstream/main' 2023-08-28 08:04:12 +02:00
Yidadaa
3bd76b9156 feat: close #2580 only use 3.5 to summarize when not using custom models 2023-08-28 00:02:52 +08:00
DirkSchlossmacher
5cb2abecaa gpt-3.5-turbo-16k for memoryprompt 2023-08-18 15:26:12 +02:00
DirkSchlossmacher
d29b053ee5 gpt-3.5-turbo-16k for chat summaries 2023-08-18 15:24:04 +02:00
GH Action - Upstream Sync
da30e5c7ff Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-08-15 00:54:51 +00:00
imldy
20a508e2d6 feat: add autoGenerateTitle option
(cherry picked from commit 656ab94a9c4edfee820616b8cfc39f5ee9952a3a)
2023-08-14 20:42:09 +08:00
DirkSchlossmacher
0a64ab922a Merge branch 'main' of https://github.com/DirkSchlossmacher/ChatGPT-Next-Web-AdEx 2023-08-09 09:39:17 +02:00
Yidadaa
4ab9141429 fix: #2564 should not clear message when error 2023-08-08 21:24:45 +08:00
Yidadaa
769c2f9f49 feat: close #2583 do not summarize with gpt-4 2023-08-08 21:22:41 +08:00
GH Action - Upstream Sync
a15c675deb Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-08-03 01:05:43 +00:00
Yidadaa
b5ef552c25 feat: improve auto scroll ux and edit model title 2023-08-02 23:35:51 +08:00
GH Action - Upstream Sync
0214871c55 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-20 01:11:05 +00:00
Hopelwj
b9895ecadd
Merge branch 'Yidadaa:main' into main 2023-07-18 19:39:59 +08:00
liuweijie
322eb66fdf fix: useAccessStore filter spaces 2023-07-18 19:38:16 +08:00
GH Action - Upstream Sync
6cf9c1910b Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-17 01:24:58 +00:00
Yifei Zhang
7073fd2f3b
Merge pull request #2392 from imldy/dev_SetInjectSystemPrompts
fix: enable `enableInjectSystemPrompts` attribute for old sessions
2023-07-16 14:29:50 +08:00
imldy
a9f67a48a1 dev: use current inject configuration 2023-07-15 02:48:47 +08:00
imldy
fd058cc693 fix: enable enableInjectSystemPrompts attribute for old sessions 2023-07-15 01:32:39 +08:00
GH Action - Upstream Sync
e1f99edfb4 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-12 01:21:32 +00:00
imldy
a4d012828c fix: migrated mask object key 2023-07-11 21:02:09 +08:00
Dirk S
27935e02b9 Merged changes from upstream 2023-07-10 22:09:42 +02:00
Yidadaa
15e063e1b5 feat: #2330 disable /list/models 2023-07-10 23:19:43 +08:00
Yidadaa
c00a63e4c3 fix: #2336 resending message should delete origional messages 2023-07-10 22:59:12 +08:00
imldy
1513881eed fix: 修改是否应该注入System Prompt的判断规则为根据设置项 2023-07-10 18:57:54 +08:00
imldy
5e361f6748 dev: 增加模型设置项:是否启用注入全局 System Prompt 功能 2023-07-10 18:56:22 +08:00
Dirk S
f86885e6af Merge remote-tracking branch 'upstream/main' 2023-07-10 07:06:54 +02:00
Yidadaa
a913d9728c fixup 2023-07-09 22:06:41 +08:00
Yidadaa
09b05cde7f fix: #2303 should select custom models 2023-07-09 21:56:49 +08:00
Yidadaa
8e4743e719 feat: #920 migrate id to nanoid 2023-07-09 19:37:42 +08:00
Yidadaa
98ac7ee277 feat: close #2303 add custom model name config 2023-07-09 18:15:52 +08:00
Yidadaa
28c457730a fix: #2280 auto-detect models from 'list/models' 2023-07-09 18:03:06 +08:00
Yidadaa
90d8f3117f fix: #2295 use correct methods to migrate state 2023-07-09 16:28:15 +08:00
GH Action - Upstream Sync
e153cd5020 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-06 01:12:42 +00:00
Yidadaa
54bd07702c refactor: #2256 hide builtin masks 2023-07-05 22:39:25 +08:00
Yifei Zhang
a75e2b0c0e
Merge pull request #2256 from marcusschiesser/main
feat: add setting to hide built-in masks
2023-07-05 22:30:28 +08:00
sunls233
089e3b8946 fix summarize don't send 2023-07-05 14:27:37 +08:00
GH Action - Upstream Sync
3581bc202c Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-05 01:12:35 +00:00
GH Action - Upstream Sync
9c36fcec81 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-05 00:12:23 +00:00
Marcus Schiesser
74fa065266 feat: add setting to hide builtin masks 2023-07-05 00:07:26 +07:00
Yidadaa
4131fccbe0 feat: close #2192 use /list/models to get model ids 2023-07-04 23:16:24 +08:00
Dirk S
5c4837f8e2 Merge remote-tracking branch 'upstream/main' 2023-07-04 07:48:00 +02:00
Yidadaa
823032617d feat: add top p config 2023-07-04 00:39:54 +08:00