Commit Graph

2874 Commits

Author SHA1 Message Date
sijinhui
fce3c65e41 merge 2024-08-05 17:21:37 +08:00
sijinhui
5f5c2164f8 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/alibaba.ts
#	app/api/anthropic.ts
#	app/api/azure.ts
#	app/api/baidu.ts
#	app/api/bytedance.ts
#	app/api/openai.ts
#	yarn.lock
2024-08-05 14:44:13 +08:00
Dogtiti
aa40015e9b
Merge pull request #5190 from ConnectAI-E/feaure/hmac
reduce cloudflare functions build size
2024-08-05 14:07:55 +08:00
lloydzhou
141ce2c99a reduce cloudflare functions build size 2024-08-05 12:59:27 +08:00
lloydzhou
4a95dcb6e9 hotfix get wrong llm 2024-08-05 12:45:25 +08:00
lloydzhou
1610675c8f remove hash.js 2024-08-05 11:36:35 +08:00
sijinhui
d1e77ea278
Merge pull request #140 from sijinhui/dev
Dev
2024-08-03 21:31:37 +08:00
sijinhui
86e8303104 优化字体 2024-08-03 21:30:32 +08:00
Dogtiti
764c0cb865
Merge pull request #5179 from frostime/contrib-font
 feat(config): Config the font-family of chat content
2024-08-03 21:04:43 +08:00
sijinhui
0b5aef5411 Merge branch 'main' of github.com:sijinhui/ChatGPT-Next-Web 2024-08-03 18:50:23 +08:00
sijinhui
8922cd78c6 123 2024-08-03 18:50:03 +08:00
sijinhui
7d85850a1c
Merge pull request #139 from sijinhui/dev
merge and change model
2024-08-03 18:47:38 +08:00
sijinhui
f80054e82b merge and change model 2024-08-03 18:45:55 +08:00
sijinhui
c60fa3cda6 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	package.json
#	yarn.lock
2024-08-03 17:55:28 +08:00
frostime
8ec6acc55a 🎨 i18n: add locale about "font family config"
Note: The language is translated by GPT
2024-08-03 16:24:51 +08:00
frostime
b6a022b0ef feat(config): Set markdown's font-family 2024-08-03 16:04:20 +08:00
Dogtiti
d9e407fd2b
Merge pull request #5175 from frostime/upstream-main
 feat: 为命令前缀( `:` )增加对中文符号 `:`的支持
2024-08-03 10:37:51 +08:00
frostime
deb140de73 feat: 为命令前缀( : )支持中文符号 2024-08-02 22:38:31 +08:00
Lloyd Zhou
a8c65e3d27
Merge pull request #5126 from DDDDD12138/fix-watch-mask
fix: replace '&' with concurrently for cross-platform compatibility
2024-08-02 19:22:57 +08:00
Lloyd Zhou
324d30bef9
Merge pull request #5136 from frostime/contrib-txtcode
 feat(markdown): 对纯文本的代码块内容进行折行处理
2024-08-02 19:22:13 +08:00
Lloyd Zhou
9193a9a0e0
Merge pull request #5147 from ConnectAI-E/fix-locales
fix: locales => Locale
2024-08-02 18:02:13 +08:00
Lloyd Zhou
957244ba2e
Merge pull request #5154 from ConnectAI-E/fix-sidebar-style
fix: sidebar title style
2024-08-02 18:01:51 +08:00
sijinhui
f10b51cc4e
Merge pull request #138 from sijinhui/dev
加载env
2024-08-02 17:28:05 +08:00
sijinhui
5d8ca17ad9 加载env 2024-08-02 17:27:10 +08:00
sijinhui
65f424e4b8
Merge pull request #137 from sijinhui/dev
Dev
2024-08-02 17:18:05 +08:00
sijinhui
89f6607e1c merge 2024-08-02 17:17:21 +08:00
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
wuzhiqing
04a4e1b39a fix: replace '&' with concurrently for cross-platform compatibility
- Used `concurrently` to run parallel commands in package.json scripts
- Added `concurrently` as a devDependency in package.json
2024-08-01 10:05:21 +08:00
Dogtiti
99f3160aa2 fix: sidebar title style 2024-07-31 22:10:24 +08:00
Dogtiti
8cb72d8452 fix: locales => Locale 2024-07-30 21:25:33 +08:00