Commit Graph

3390 Commits

Author SHA1 Message Date
sijinhui
c9a438c2ab merge 2024-10-09 18:09:36 +08:00
sijinhui
6cb317e00d Merge remote-tracking branch 'upstream/main' into merge
# Conflicts:
#	app/api/openai.ts
#	app/client/platforms/openai.ts
#	app/store/chat.ts
#	app/store/config.ts
2024-10-09 17:57:25 +08:00
Lloyd Zhou
96273fd75e
Merge pull request #5611 from ConnectAI-E/feature/tauri-fetch-update
make sure get request_id before body chunk
2024-10-09 16:18:37 +08:00
lloydzhou
3e63d405c1 update 2024-10-09 16:12:01 +08:00
Lloyd Zhou
19b42aac5d
Merge pull request #5608 from ConnectAI-E/fix-readme
fix: [#5574] readme
2024-10-09 14:49:34 +08:00
Lloyd Zhou
b67a23200e
Merge pull request #5610 from ChatGPTNextWeb/lloydzhou-patch-1
Update README.md
2024-10-09 14:48:55 +08:00
Lloyd Zhou
1dac02e4d6
Update README.md 2024-10-09 14:48:43 +08:00
Lloyd Zhou
acad5b1d08
Merge pull request #5609 from ElricLiu/main
Update README.md
2024-10-09 14:45:27 +08:00
ElricLiu
4e9bb51d2f
Update README.md 2024-10-09 14:43:49 +08:00
DDMeaqua
c0c8cdbbf3 fix: [#5574] 文档错误 2024-10-09 14:36:58 +08:00
Lloyd Zhou
cbdc611b54
Merge pull request #5607 from ConnectAI-E/hotfix/summarize-model
fix compressModel, related #5426, fix #5606 #5603 #5575
2024-10-09 14:08:13 +08:00
lloydzhou
93ca303b6c fix ts error 2024-10-09 13:49:33 +08:00
lloydzhou
a925b424a8 fix compressModel, related #5426, fix #5606 #5603 #5575 2024-10-09 13:42:25 +08:00
Lloyd Zhou
5b4d423b58
Merge pull request #5565 from ConnectAI-E/feature/using-tauri-fetch
Feat: using tauri fetch api in App
2024-10-09 13:03:01 +08:00
lloydzhou
6c1cbe120c update 2024-10-09 11:46:49 +08:00
Dogtiti
8ad63a6c25
Merge pull request #5586 from little-huang/patch-1
fix: correct typo in variable name from ALLOWD_PATH to ALLOWED_PATH
2024-10-08 15:26:41 +08:00
sijinhui
ed6c69bdc8
Merge pull request #184 from ChatGPTNextWeb/main
123
2024-10-07 20:39:59 +08:00
little_huang
cd75461f9e
fix: correct typo in variable name from ALLOWD_PATH to ALLOWED_PATH 2024-10-07 10:30:25 +08:00
Dogtiti
2bac174e6f
Merge pull request #4393 from ChatGPTNextWeb/dean-delete-escapeDollarNumber
bugfix: Delete the escapeDollarNumber function, which causes errors i…
2024-10-06 12:41:03 +08:00
sijinhui
cf340a15bf 增加非流式响应提示 2024-10-06 11:46:29 +08:00
sijinhui
2feb0e96d0 change o1 model 2024-10-05 12:29:34 +08:00
sijinhui
54a1f6b077 Merge remote-tracking branch 'upstream/main' 2024-10-05 12:29:08 +08:00
Lloyd Zhou
65f80f81ad
Merge branch 'main' into dean-delete-escapeDollarNumber 2024-10-04 14:31:00 +08:00
sijinhui
d6dfd7f12a
Merge pull request #183 from sijinhui/add-google-auth
1
2024-10-04 12:56:54 +08:00
sijinhui
f870b85c4a 1 2024-10-04 12:55:44 +08:00
Lloyd Zhou
05e6e4bffb
Merge pull request #5578 from code-october/fix/safe-equal
use safe equal operation
2024-10-03 10:59:32 +08:00
code-october
fbb66a4a5d use safe equal operation 2024-10-03 02:08:10 +00:00
sijinhui
246645dd1f
Merge pull request #182 from sijinhui/add-google-auth
fix build bug
2024-10-03 01:59:10 +08:00
sijinhui
7ccdd4e07d fix build bug 2024-10-03 01:58:07 +08:00
sijinhui
f2b91092b8
Merge pull request #181 from sijinhui/add-google-auth
修复样式
2024-10-03 01:49:32 +08:00
sijinhui
b61a4550c3 修复样式 2024-10-03 01:48:51 +08:00
sijinhui
4c89e12b4c
Merge pull request #180 from sijinhui/add-google-auth
fix build error
2024-10-03 00:15:38 +08:00
sijinhui
0922a7fe76 fix build error 2024-10-03 00:14:44 +08:00
sijinhui
429434de49
Merge pull request #179 from sijinhui/add-google-auth
增加谷歌登录
2024-10-02 23:49:43 +08:00
sijinhui
d86d5a1951 增加谷歌登录 2024-10-02 23:43:30 +08:00
sijinhui
47c72bf010 禁用了点击输入框就跳转 2024-10-01 23:26:06 +08:00
sijinhui
1d9a2b5315 nginx 2024-10-01 21:42:55 +08:00
lloydzhou
d51d31a559 update 2024-10-01 14:40:23 +08:00
lloydzhou
919ee51dca hover show errorMsg when plugin run error 2024-10-01 13:58:50 +08:00
lloydzhou
9c577ad9d5 hotfix for plugin runtime 2024-10-01 12:55:57 +08:00
lloydzhou
953114041b add connect timeout 2024-10-01 12:02:29 +08:00
sijinhui
c7f8930215 Merge branch 'main' of github.com:sijinhui/ChatGPT-Next-Web 2024-10-01 09:17:58 +08:00
sijinhui
63d0d80e0d 123 2024-10-01 09:17:35 +08:00
sijinhui
24504259c2 Merge remote-tracking branch 'upstream/main' 2024-09-30 17:50:25 +08:00
sijinhui
7c7cc91c05 修复一部分类型错误,无影响 2024-09-30 17:48:14 +08:00
lloydzhou
d830c23dab hotfix for run plugin call post api 2024-09-30 15:38:13 +08:00
lloydzhou
fd3568c459 hotfix for run plugin call post api 2024-09-30 15:33:40 +08:00
lloydzhou
3029dcb2f6 hotfix for run plugin call post api 2024-09-30 15:32:47 +08:00
sijinhui
bf457c6853 滚动动画bug修复,及丝滑一点 2024-09-30 14:31:15 +08:00
lloydzhou
35e03e1bca remove code 2024-09-30 13:44:01 +08:00