xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-10-01 23:56:39 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
2,844 Commits 41 Branches 79 Tags 135 MiB
8a0f998f69
Commit Graph

2844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sijinhui
8a0f998f69 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	package.json
#	yarn.lock
 2024-08-02 17:14:45 +08:00
Dogtiti
67a90ffb76
Merge pull request #5171 from ConnectAI-E/feature/tencent 
Feature/tencent
 2024-08-02 16:43:00 +08:00
lloydzhou
feaa6f9bf0 Merge remote-tracking branch 'connectai/feature/tencent' into feature/tencent 2024-08-02 15:56:25 +08:00
lloydzhou
753bf3b924 hotfix for cf deploy error #5168 2024-08-02 15:55:26 +08:00
Dogtiti
b3219f57c8
Merge pull request #5157 from ConnectAI-E/feature/tencent 
Feature/tencent
 2024-08-01 23:56:27 +08:00
Dogtiti
a17df037af feat: add lodash-es 2024-08-01 23:54:14 +08:00
lloydzhou
dfc36e5210 update 2024-08-01 19:02:40 +08:00
lloydzhou
c359b92ddc update 2024-08-01 18:58:07 +08:00
sijinhui
d0bdce1b5f
Merge pull request #136 from sijinhui/dev 
修改部署机器
 2024-08-01 16:51:36 +08:00
sijinhui
04949fda59 修改部署机器 2024-08-01 16:51:02 +08:00
lloydzhou
e1d6131f13 update 2024-08-01 16:49:55 +08:00
sijinhui
00afc3e6c2
Merge pull request #135 from sijinhui/dev 
Dev
 2024-08-01 16:31:56 +08:00
sijinhui
f1bd456a41 merge 2024-08-01 16:31:11 +08:00
lloydzhou
6a0bda00f5 merge main 2024-08-01 15:39:54 +08:00
lloydzhou
f85ec95877 hotfix for tencent sign 2024-08-01 15:33:48 +08:00
lloydzhou
a024980c03 revert package.json 2024-08-01 13:21:36 +08:00
lloydzhou
fd9e94e078 merge main 2024-08-01 13:18:33 +08:00
Dogtiti
f6a6c51d15
Merge pull request #5156 from ConnectAI-E/feature/moonshot 
add moonshot api
 2024-08-01 12:28:10 +08:00
lloydzhou
966db1e4be add moonshot settings 2024-08-01 12:03:22 +08:00
lloydzhou
b8bbc37b8e merge main 2024-08-01 11:57:23 +08:00
lloydzhou
40cbabc330 add moonshot api 2024-08-01 11:55:22 +08:00
Dogtiti
c9eb9f3eda
Merge pull request #5141 from ConnectAI-E/hotfix-google-api-in-app 
hotfix for using google api in app
 2024-07-30 15:42:30 +08:00
sijinhui
8105d6a463
Merge pull request #134 from ChatGPTNextWeb/main 
merge
 2024-07-30 12:38:07 +08:00
lloydzhou
64c3dcd732 hotfix for using google api in app 2024-07-30 12:03:06 +08:00
Lloyd Zhou
90e1fadb1e
Merge pull request #5124 from ElricLiu/main 
Update README.md
 2024-07-29 14:58:07 +08:00
ElricLiu
071391ddff
Update README.md 2024-07-29 14:57:46 +08:00
ElricLiu
d70d46b4d5
Update README.md 2024-07-29 14:56:39 +08:00
ElricLiu
3ef596b215
Update README.md 
Update redame，add Artifacts & SD
 2024-07-29 14:42:30 +08:00
sijinhui
ca83896805 Merge remote-tracking branch 'origin/dev' 
# Conflicts:
#	app/components/chat.tsx
 2024-07-27 22:02:51 +08:00
sijinhui
6483c86280 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/chat.tsx
#	app/components/ui-lib.tsx
#	app/constant.ts
#	app/store/mask.ts
 2024-07-27 21:59:52 +08:00
sijinhui
3e0b191491 修改提示 2024-07-27 21:57:21 +08:00
Lloyd Zhou
35c5518668
Merge pull request #5110 from ConnectAI-E/fix/owner 
chore: update owner
 2024-07-26 19:28:45 +08:00
lloydzhou
8b513537b7 release v2.14.0 2024-07-26 19:24:16 +08:00
sijinhui
bf2caeea31
Merge pull request #133 from sijinhui/dev 
Dev
 2024-07-26 18:36:21 +08:00
sijinhui
bd0b01e5cc Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/chat.tsx
#	app/components/ui-lib.tsx
#	app/constant.ts
#	app/store/mask.ts
 2024-07-26 18:34:12 +08:00
ElricLiu
b27f394995
Merge pull request #5092 from ConnectAI-E/feature-artifacts 
[Artifacts] add preview html code
 2024-07-26 17:28:49 +08:00
Dogtiti
3f9f556e1c fix: iframe bg 2024-07-26 17:06:10 +08:00
Dogtiti
1772d5c4b6 chore: update owner 2024-07-26 16:00:25 +08:00
Dogtiti
715d1dc02f fix: default enable artifacts 2024-07-26 15:55:01 +08:00
Dogtiti
6737f016f5 chore: artifact => artifacts 2024-07-26 15:50:26 +08:00
Dogtiti
f2d2622172 fix: uploading loading 2024-07-26 13:49:15 +08:00
Dogtiti
72d6f97024 fix: ts error 2024-07-26 11:21:51 +08:00
Lloyd Zhou
a0f0b4ff9e
Merge pull request #5 from ConnectAI-E/feature/artifacts-style 
Feature/artifacts style
 2024-07-25 23:36:34 +08:00
Dogtiti
c27ef6ffbf feat: artifacts style 2024-07-25 23:29:29 +08:00
sijinhui
a277c1aed1 隐藏小警告 2024-07-25 22:14:38 +08:00
sijinhui
071dcaaf43
Merge pull request #132 from sijinhui/dev 
Dev
 2024-07-25 21:43:02 +08:00
sijinhui
2588bcd465 merge 2024-07-25 21:42:20 +08:00
sijinhui
7e1cdbec80 Merge remote-tracking branch 'upstream/main' into dev 
# Conflicts:
#	app/components/chat.tsx
#	app/components/home.tsx
#	app/components/settings.tsx
#	app/components/sidebar.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/layout.tsx
#	app/store/access.ts
#	app/utils/model.ts
 2024-07-25 21:22:36 +08:00
Lloyd Zhou
f5499ff699
Merge pull request #5071 from ZTH7/main 
Fix defaultModel undefined error
 2024-07-25 21:02:39 +08:00
Mr. Z
c4334d4e5f
Update model.ts 2024-07-25 20:03:54 +08:00