Commit Graph

155 Commits

Author SHA1 Message Date
sijinhui
c09aaf0f66 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/components/ui-lib.module.scss
#	app/constant.ts
#	app/locales/ar.ts
#	app/locales/bn.ts
#	app/locales/cn.ts
#	app/locales/cs.ts
#	app/locales/de.ts
#	app/locales/en.ts
#	app/locales/es.ts
#	app/locales/fr.ts
#	app/locales/id.ts
#	app/locales/it.ts
#	app/locales/jp.ts
#	app/locales/ko.ts
#	app/locales/no.ts
#	app/locales/pt.ts
#	app/locales/ru.ts
#	app/locales/sk.ts
#	app/locales/tr.ts
#	app/locales/tw.ts
#	app/locales/vi.ts
2024-09-25 18:37:29 +08:00
lyf
77f037a3c4 add maidian 2024-09-25 13:08:03 +08:00
sijinhui
8fedb17183 123 2024-09-19 22:31:21 +08:00
sijinhui
0c2d4ab056 fix build error 2024-09-19 11:54:27 +08:00
sijinhui
3fd1035bfa fix build error 2024-09-19 11:51:48 +08:00
sijinhui
5d6d676b87 merge 2024-09-19 00:07:37 +08:00
DDMeaqua
dfaafe3adb Merge branch 'main' into tts 2024-09-18 13:48:28 +08:00
DDMeaqua
3ae8ec1af6 feat: tts 2024-09-18 11:24:25 +08:00
DDMeaqua
212605a7e3 Merge branch 'main' into tts-stt 2024-09-18 10:39:56 +08:00
DDDDD12138
63ffd473d5 chore: remove unused imports 2024-09-15 20:17:02 +08:00
sijinhui
bd172064b5 add o1 model 2024-09-14 17:59:11 +08:00
sijinhui
03731c74e3 add o1 model 2024-09-14 17:57:07 +08:00
sijinhui
9142cd3303 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/chat.tsx
2024-09-12 16:35:51 +08:00
Dogtiti
992c3a5d3a fix: safaLocalStorage 2024-09-08 13:23:40 +08:00
sijinhui
69ddeda24b merge and add plugins 2024-09-07 19:58:52 +08:00
sijinhui
df2ebaf970 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/components/chat.module.scss
#	app/components/chat.tsx
#	app/layout.tsx
#	app/store/chat.ts
#	package.json
#	yarn.lock
2024-09-07 19:00:38 +08:00
sijinhui
32b4c3d6d7 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/utils/store.ts
2024-09-07 18:47:02 +08:00
Dogtiti
2bd799fac6
Merge pull request #5331 from ConnectAI-E/feature/plugin
Feature plugin (GPTs like action based on function call)
2024-09-06 20:06:50 +08:00
lloydzhou
7c0acc7b77 hotfix tools empty array 2024-09-05 22:02:06 +08:00
lloydzhou
53dcae9e9c update 2024-09-04 13:00:18 +08:00
Dogtiti
ed9aae531e fix: hydrated 2024-09-03 20:29:01 +08:00
lloydzhou
7180ed9a60 hotfix 2024-09-03 19:56:22 +08:00
lloydzhou
c7bc93b32b Merge remote-tracking branch 'connectai/main' into feature/plugin 2024-09-03 19:02:40 +08:00
Dogtiti
886ffc0af8 fix: hydrated for indexedDB 2024-09-03 17:12:48 +08:00
lloydzhou
801b62543a claude support function call 2024-09-02 21:45:47 +08:00
lloydzhou
b2965e1deb update 2024-08-31 00:16:47 +08:00
lloydzhou
9326ff9d08 ts error 2024-08-30 23:39:08 +08:00
lloydzhou
d2cb984ced add processToolMessage callback 2024-08-29 17:28:15 +08:00
lloydzhou
7fc0d11931 create common function stream for fetchEventSource 2024-08-29 17:14:23 +08:00
sijinhui
6ef4129bba add test model 2024-08-28 18:22:49 +08:00
sijinhui
8deb96985e Merge remote-tracking branch 'upstream/main' into dev 2024-08-28 17:48:54 +08:00
DDMeaqua
2f410fc09f feat: add tts stt 2024-08-27 16:21:02 +08:00
Dogtiti
7b6fe66f2a feat: try catch indexedDB error 2024-08-27 10:05:37 +08:00
Dogtiti
c2fc0b4979 feat: try catch indexedDB error 2024-08-27 09:57:07 +08:00
Dogtiti
0b758941a4 feat: clear indexDB 2024-08-26 21:23:21 +08:00
Dogtiti
4060e367ad feat: add indexDB 2024-08-26 21:13:35 +08:00
sijinhui
4b97e374e7 fix little bug 2024-08-07 23:42:03 +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
sijinhui
e0799f8f48 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/constant.ts
#	app/utils/model.ts
2024-08-06 13:08:13 +08:00
GH Action - Upstream Sync
bfe4e88246 Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-06 01:00:29 +00:00
Dogtiti
a6b7432358
Merge pull request #5180 from frostime/contrib-modellist
 feat: 调整模型列表,将自定义模型放在前面显示
2024-08-05 20:49:07 +08:00
frostime
150fc84b9b feat(model): 增加 sorted 字段,并使用该字段对模型列表进行排序
1. 在 Model 和 Provider 类型中增加 sorted 字段(api.ts)
2. 默认模型在初始化的时候,自动设置默认 sorted 字段,从 1000 开始自增长(constant.ts)
3. 自定义模型更新的时候,自动分配 sorted 字段(model.ts)
2024-08-05 19:43:32 +08:00
frostime
b023a00445 🔨 refactor(model): 更改原先的实现方法,在 collect table 函数后面增加额外的 sort 处理 2024-08-05 16:37:22 +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
lloydzhou
1610675c8f remove hash.js 2024-08-05 11:36:35 +08:00
frostime
8a4b8a84d6 feat: 调整模型列表,将自定义模型放在前面显示 2024-08-03 17:16:05 +08:00
李超
716899c030 fix: Fixed the issue that WebDAV synchronization could not check the status and failed during the first backup 2024-08-03 12:40:48 +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
lloydzhou
753bf3b924 hotfix for cf deploy error #5168 2024-08-02 15:55:26 +08:00
lloydzhou
c359b92ddc update 2024-08-01 18:58:07 +08:00