Commit Graph

768 Commits

Author SHA1 Message Date
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
DirkSchlossmacher
9f9b1d273f Merge remote-tracking branch 'upstream/main' 2023-07-18 08:05:32 +02:00
Yifei Zhang
70a4f94c81
Update home.tsx 2023-07-17 11:33:19 +08:00
Yifei Zhang
f7e4b36746
Merge pull request #2412 from Yidadaa/fix-2409
fix: #2409 empty prompt id cause crash
2023-07-17 11:03:33 +08:00
Yifei Zhang
c916cd1a87
Update mask.tsx 2023-07-17 11:00:45 +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
兰天游
442a529a72
feat: add type for import 2023-07-16 21:35:13 +08:00
兰天游
e1243f3d59
feat: add typings for metadata 2023-07-16 21:34:01 +08:00
Yidadaa
af5f67d459 feat: close #2376 add babel polyfill 2023-07-16 16:32:22 +08:00
Yidadaa
30473ec41e fix: #2367 do not copy in async callback after sharing to ShareGPT 2023-07-16 16:14:57 +08:00
Yidadaa
3ddedc903e feat: improve dnd icon 2023-07-16 15:49:15 +08:00
Yifei Zhang
e3c279b8be
Merge pull request #2389 from MarkShawn2020/fix-default-openai-url
fixed openai base url if empty
2023-07-16 15:20:26 +08:00
Yifei Zhang
08a8ac9971
Merge pull request #2388 from yikayiyo/feat-drag-prompts
feat: #2297 drag and drop in contextual prompts
2023-07-16 14:30:49 +08: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
GH Action - Upstream Sync
a5108e5558 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-15 01:23:07 +00: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
markshawn2020
3f8b14f5f8 fixed react key 2023-07-14 21:15:34 +08:00
markshawn2020
1c335a68e0 fixed openai base url if empty 2023-07-14 21:03:32 +08:00
legao
fb98050d9f feat: drag and drop in contextual prompts 2023-07-14 18:08:03 +08:00
Dirk S
f44933eb9d Mask CV Partners Helper (V0.8b) 2023-07-14 07:53:57 +02:00
Dirk S
d04cac1128 masks CV 08 2023-07-14 00:04:18 +02:00
Dirk S
f04049ffcf masks CV 07 2023-07-14 00:03:42 +02:00
Dirk S
af0b80f0f4 masks CV 06 2023-07-13 23:36:13 +02:00
GH Action - Upstream Sync
56434d4e06 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-07-13 01:24:40 +00:00
Yifei Zhang
b51f7f9a25
Merge pull request #2370 from Yidadaa/bugfix-0712
fix: sharegpt roles
2023-07-12 23:21:22 +08:00
Yidadaa
d275e32e70 fix: sharegpt roles 2023-07-12 23:19:46 +08:00
Dirk S
d5320dc9bd masks V05 with CV helper 2023-07-12 12:51:00 +02:00
Dirk S
2039a551ca Merge branch 'main' of https://github.com/DirkSchlossmacher/ChatGPT-Next-Web-AdEx 2023-07-12 12:48:44 +02:00
Dirk S
6cc6acbd8a masks V05 incl CV helper 2023-07-12 12:48:37 +02: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
Yifei Zhang
22cf78d506
Merge pull request #2355 from fyl080801/main
fix: cloudflare headers
2023-07-11 23:57:03 +08:00
imldy
a4d012828c fix: migrated mask object key 2023-07-11 21:02:09 +08:00
yuanliang feng
a832cfb343
Update common.ts 2023-07-11 15:46:40 +08:00
Dirk S
27935e02b9 Merged changes from upstream 2023-07-10 22:09:42 +02:00
yuanliang feng
9ef680db57
Merge pull request #2 from fyl080801/main
update
2023-07-10 23:35:19 +08:00
yuanliang feng
2c09f4ef90
Merge pull request #1 from fyl080801/main
update
2023-07-10 23:23:20 +08:00
Yidadaa
ad1b9b7f6d fixup 2023-07-10 23:21:22 +08: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
f59235bd5a feat: 翻译InjectSystemPrompts配置项为其他语言 2023-07-10 20:14:10 +08:00
imldy
2930ba0457 fix: 修改InjectSystemPrompts.SubTitle使其更符合系统行为 2023-07-10 20:12:51 +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
066cb74bab mask v04 2023-07-10 11:46:18 +02:00
yuanliang feng
7a0b437626
Update common.ts 2023-07-10 17:26:28 +08:00
Dirk S
bcb84f76d2 charting v03 2023-07-10 11:19:37 +02:00
Dirk S
c3c75d7f2b charting mask v02 2023-07-10 10:49:01 +02:00