Commit Graph

2950 Commits

Author SHA1 Message Date
sijinhui
7b80f23e39 fix build 2024-08-14 17:39:18 +08:00
sijinhui
ffffc151eb fix build 2024-08-14 17:09:51 +08:00
sijinhui
778c5bd4da fix build 2024-08-14 17:05:05 +08:00
sijinhui
0bdabde514 fix build 2024-08-14 17:01:52 +08:00
sijinhui
ed8c18b635 fix build 2024-08-14 17:00:36 +08:00
sijinhui
63f0d53140 fix build 2024-08-14 14:24:48 +08:00
sijinhui
7bfb0035db
Merge pull request #149 from sijinhui/dev
fix tiktoken
2024-08-13 19:01:25 +08:00
sijinhui
1626bd3e4e fix tiktoken 2024-08-13 18:58:13 +08:00
sijinhui
bf99fd25d0
Merge pull request #148 from sijinhui/dev
print ip
2024-08-13 18:39:24 +08:00
sijinhui
d9f324bcf6 print ip 2024-08-13 18:38:34 +08:00
sijinhui
882f686970
Merge pull request #147 from sijinhui/dev
Dev
2024-08-13 18:26:27 +08:00
sijinhui
e73a5c4f4b merge 2024-08-13 18:26:01 +08:00
sijinhui
0b930db371 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/components/sidebar.tsx
2024-08-13 18:24:57 +08:00
Dogtiti
edb92f7bfb
Merge pull request #5245 from MrrDrr/dalle3_add_options
dall-e-3 adds 'quality' and 'style' options
2024-08-13 15:31:18 +08:00
sijinhui
1bc010fb37 没啥变化 2024-08-10 22:16:11 +08:00
l.tingting
ca865a80dc dall-e-3 adds 'quality' and 'style' options 2024-08-10 11:09:07 +08:00
sijinhui
39c96dce59 debug domain 2024-08-09 18:18:34 +08:00
Dogtiti
cf1c8e8f2a
Merge pull request #5233 from ConnectAI-E/feature/bangpt
Feature/bangpt
2024-08-08 17:27:50 +08:00
lyf
d948be2372 Merge branch 'feature/bangpt' of ssh://github.com/ConnectAI-E/ChatGPT-Next-Web into feature/bangpt 2024-08-08 16:25:49 +08:00
lyf
cc28aef625 add gpt-4o-2024-08-06 2024-08-08 16:23:40 +08:00
Dogtiti
036358de7c
Merge pull request #5219 from ConnectAI-E/feature/access
修复ChatGPTNextWeb页面的无障碍问题
2024-08-08 13:59:16 +08:00
lyf
0958b9ee12 tsxiugai 2024-08-08 13:08:56 +08:00
sijinhui
b0a53d9f6c
Merge pull request #146 from sijinhui/dev
123
2024-08-08 00:16:53 +08:00
sijinhui
96e6719fb1 123 2024-08-08 00:15:50 +08:00
sijinhui
0fa78d3c49
Merge pull request #145 from sijinhui/dev
Dev
2024-08-07 23:45:55 +08:00
sijinhui
9776cb5471 merge 2024-08-07 23:45:01 +08:00
sijinhui
53f1782c7c Merge remote-tracking branch 'upstream/main' into dev 2024-08-07 23:43:27 +08:00
sijinhui
4b97e374e7 fix little bug 2024-08-07 23:42:03 +08:00
sijinhui
b0a4b5fc42
Merge pull request #144 from sijinhui/dev
Dev
2024-08-07 23:27:17 +08:00
sijinhui
6d01e6fb93 fix sd 2024-08-07 23:26:20 +08:00
Dogtiti
aff1d7ecd6
Merge pull request #5223 from 122cygf/main
修复拼写错误
2024-08-07 21:29:43 +08:00
sijinhui
b874a82fab Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/api.ts
#	app/components/settings.tsx
#	app/constant.ts
#	src-tauri/tauri.conf.json
2024-08-07 21:11:58 +08:00
lzz
42fdbd9bb8
Fix spelling errors 2024-08-07 17:22:32 +08:00
lyf
034c82e514 修改设置的无障碍 2024-08-07 13:39:23 +08:00
lyf
14ff46b5cd 解决按钮无障碍 2024-08-07 13:01:08 +08:00
lyf
c9099ca0a5 无障碍按钮和链接 2024-08-07 10:55:02 +08:00
Dogtiti
58b144b345
Merge pull request #5218 from ConnectAI-E/feature/bangpt
解决禁止gpt4时禁止gtp4o-mini问题
2024-08-07 10:45:38 +08:00
lyf
af21c57e77 ban gpt4 2024-08-07 10:15:39 +08:00
lloydzhou
624e4dbaaf update version 2024-08-06 22:41:35 +08:00
Dogtiti
9bbb4f396b
Merge pull request #5181 from webws/feature/support-iflytek-spark
Feature/support iflytek spark
2024-08-06 19:32:43 +08:00
webws
b2c1644d69 feat: add support for iFLYTEK Spark API (接入讯飞星火模型) 2024-08-06 17:54:30 +08:00
Lloyd Zhou
5629f842da
Merge pull request #5174 from ahzmr/main
style: Fixed an issue where the sample of the reply content was displayed out of order
2024-08-06 16:52:43 +08:00
HyiKi
f900283b09 fix: tencent InvalidParameter error
fix "Messages 中 system 角色必须位于列表的最开始"
2024-08-06 15:50:12 +08:00
HyiKi
b667eff6bd fix: baidu error_code 336006
change the summary role from system to user
2024-08-06 15:50:12 +08:00
HyiKi
54fdf40f5a fix: baidu error_code 336006 2024-08-06 15:50:12 +08:00
sijinhui
780cdbc152
Merge pull request #143 from sijinhui/dev
Dev
2024-08-06 14:08:25 +08:00
sijinhui
f06ae4f62b Merge remote-tracking branch 'upstream/main' into dev 2024-08-06 14:06:50 +08:00
sijinhui
685f5479a8 change docker image url 2024-08-06 14:06:10 +08:00
Lloyd Zhou
690542145d
Merge pull request #5194 from HyiKi/main
fix: baidu error_code 336006
2024-08-06 13:56:44 +08:00
sijinhui
7486fa8638
Merge pull request #142 from sijinhui/dev
Dev
2024-08-06 13:49:19 +08:00