Commit Graph

555 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
1cd8b888f3 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-18 12:20:32 +00:00
fuhl
7b7aa8fc70 调整一下顺序 2023-04-18 19:35:22 +08:00
fuhl
5d04ceecbc Merge remote-tracking branch 'origin/main' 2023-04-18 19:19:47 +08:00
fuhl
a7063f2d5e 封装为函数 2023-04-18 19:19:00 +08:00
Yifei Zhang
e68f17b463
Merge pull request #902 from ClarenceYk/for_test
Update app/components/chat.tsx
2023-04-18 19:10:30 +08:00
Ma Yuke
dfcae92ae0 Update app/components/chat.tsx
fix: chat-body flickers when click-and-hold the scroll bar using mouse
2023-04-18 18:01:09 +08:00
GH Action - Upstream Sync
8fbb29a85d Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-18 09:10:47 +00:00
Yifei Zhang
1ec228e46c
Merge pull request #900 from aooyoo/main
fix user prompt translation
2023-04-18 16:59:03 +08:00
aooyoo
d1653ded9a fix user prompt translation 2023-04-18 08:13:32 +00:00
fuhl
1c1c6870a8 广告位v1.0 2023-04-18 15:37:52 +08:00
GH Action - Upstream Sync
58f9012b0c Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-18 04:12:26 +00:00
Yifei Zhang
8da581695f
Merge pull request #893 from L1468999760/add_alpha
fix:delete user.svg
2023-04-18 11:55:28 +08:00
Yifei Zhang
9e46ca31dd
Merge pull request #892 from Yidadaa/improve-memory
feat: close #864 improve long term history
2023-04-18 11:54:24 +08:00
Yidadaa
ad1c8ffe21 fixup 2023-04-18 11:44:15 +08:00
Yifei Zhang
6b30e2beb0
Merge pull request #891 from jtung4/pr
Optimize topic and summary prompts in tw.ts
2023-04-18 11:42:57 +08:00
Yifei Zhang
d75b7d49b8
feat: close #864 improve long term history 2023-04-18 11:42:08 +08:00
jtung4
53173d9053
Optimize topic and summary prompts in tw.ts 2023-04-18 11:38:26 +08:00
L1468999760
e68207be2c fix:delete user.svg 2023-04-18 11:34:33 +08:00
GH Action - Upstream Sync
e9e1cdced8 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-18 03:10:55 +00:00
Yifei Zhang
146ef1bf49
Merge pull request #885 from Chandler-Lu/patch-1
fix: typo
2023-04-18 10:41:31 +08:00
yesRabbit
bd85d9a36a
fix: typo 2023-04-18 08:55:24 +08:00
GH Action - Upstream Sync
7dc1a57603 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-17 18:13:16 +00:00
Yifei Zhang
c03b4adec0
Update README.md 2023-04-18 01:48:07 +08:00
Yifei Zhang
b7b16aa33b
Merge pull request #882 from Yidadaa/bugfix-0417
feat: user prompts
2023-04-18 01:40:38 +08:00
Yidadaa
789a779775 feat: user prompts 2023-04-18 01:34:12 +08:00
Yidadaa
fdc8278b90 feat: check usage throttle 2023-04-17 23:12:27 +08:00
Yidadaa
525a2ff9a7 fix: #866 remove unused retry messages 2023-04-17 22:51:14 +08:00
fuhl
fe367633d9 Merge remote-tracking branch 'origin/main' 2023-04-17 21:11:40 +08:00
fuhl
e7b28625e7 test 2023-04-17 21:06:44 +08:00
fuhl
26e8df4a52 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	yarn.lock
2023-04-17 20:38:33 +08:00
fuhl
aa8f7a5ebc test 2023-04-17 20:37:25 +08:00
fuhl
9d398c8972 test 2023-04-17 20:35:00 +08:00
GH Action - Upstream Sync
800d8a9f22 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-17 09:11:12 +00:00
fuhl
62d07a19b7 修改按键 2023-04-17 17:10:02 +08:00
fuhl
0e95504a1d 1 2023-04-17 16:56:59 +08:00
fuhl
fb2de933ca 1 2023-04-17 16:50:13 +08:00
Yifei Zhang
78c9e66c1f
Merge pull request #870 from jaw52/fix/windows_error
fix: error in windows
2023-04-17 16:38:55 +08:00
jaw
3038dfdb27 fix: error in windows 2023-04-17 15:37:03 +08:00
GH Action - Upstream Sync
ac372d9ccf Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-17 05:10:29 +00:00
Yifei Zhang
7cd9f644ee
Merge pull request #861 from ClarenceYk/for_test
Update app/requests.ts
2023-04-17 13:00:06 +08:00
GH Action - Upstream Sync
09e2bfd5fb Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-17 04:12:46 +00:00
Ma Yuke
64e78329ec Update app/requests.ts
fix: displaying the number of subscription beyond two decimal places.
2023-04-17 11:53:09 +08:00
Yifei Zhang
e49acda806
Merge pull request #859 from Yidadaa/Yidadaa-patch-1
fix: #853 fetch duplex errors
2023-04-17 11:41:47 +08:00
Yifei Zhang
b79845fcaa
fixup 2023-04-17 11:36:32 +08:00
Yifei Zhang
76ef5ef9a9
fixup 2023-04-17 11:34:33 +08:00
Yifei Zhang
cc053b148d
fix: #853 fetch duplex errors 2023-04-17 11:27:31 +08:00
Yifei Zhang
2979df1d82
Update README.md 2023-04-17 11:17:05 +08:00
GH Action - Upstream Sync
1bc865f880 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-04-16 11:07:58 +00:00
Yifei Zhang
c305ba3c92
Merge pull request #839 from Yidadaa/bugfix-0416
feat: close #813 log user ip time
2023-04-16 18:57:59 +08:00
Yidadaa
12d4081311 feat: close #539 add delete message button 2023-04-16 18:55:29 +08:00