Commit Graph

76 Commits

Author SHA1 Message Date
sijinhui
f8da04bfef Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/client/platforms/openai.ts
#	app/store/chat.ts
2024-09-08 20:35:45 +08:00
l.tingting
c1b74201e4 add chatgpt-4o-latest 2024-09-07 01:42:56 +08:00
sijinhui
9c68cea749 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/markdown.tsx
#	app/locales/ar.ts
#	app/locales/bn.ts
#	app/locales/cs.ts
#	app/locales/de.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/ru.ts
#	app/locales/tr.ts
#	app/locales/vi.ts
2024-08-18 20:32:25 +08:00
Lloyd Zhou
e033bef544
Merge branch 'main' into feat-i18n 2024-08-16 16:13:13 +08:00
DDMeaqua
d88cc575e5 chore: update 2024-08-16 16:10:31 +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
lyf
af21c57e77 ban gpt4 2024-08-07 10:15:39 +08:00
webws
b2c1644d69 feat: add support for iFLYTEK Spark API (接入讯飞星火模型) 2024-08-06 17:54:30 +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
sijinhui
f1bd456a41 merge 2024-08-01 16:31:11 +08:00
lloydzhou
6a0bda00f5 merge main 2024-08-01 15:39:54 +08:00
lloydzhou
fd9e94e078 merge main 2024-08-01 13:18:33 +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
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
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
lloydzhou
825929fdc8 merge main 2024-07-25 19:18:45 +08:00
lloydzhou
d8afd1af88 add expiration_ttl for kv storage 2024-07-25 16:56:08 +08:00
lloydzhou
421bf33c0e save artifact content to cloudflare workers kv 2024-07-24 20:02:37 +08:00
lloydzhou
fc31d8e5d1 merge origin/main 2024-07-20 15:15:46 +08:00
sijinhui
35532f8781 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/google/[...path]/route.ts
#	app/client/platforms/google.ts
#	app/constant.ts
#	app/store/prompt.ts
#	app/utils/hooks.ts
#	public/prompts.json
2024-07-19 12:56:46 +08:00
DDDDD12138
8edc0989e2 chore: remove unused imports and correct typos 2024-07-18 01:51:56 +08:00
lloydzhou
498d0f0b8b merge main 2024-07-11 15:29:47 +08:00
sijinhui
a70f984b0f Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/auth.ts
#	app/api/common.ts
#	app/azure.ts
#	app/client/api.ts
#	app/client/platforms/openai.ts
#	app/components/chat.tsx
#	app/components/settings.tsx
#	app/constant.ts
#	app/layout.tsx
#	app/masks/index.ts
#	app/store/chat.ts
#	app/store/config.ts
#	app/utils/hooks.ts
#	app/utils/model.ts
#	package.json
#	yarn.lock
2024-07-11 10:58:00 +08:00
lloydzhou
23872086fa merge code 2024-07-09 19:37:47 +08:00
lloydzhou
c229d2c3ce merge main 2024-07-09 16:53:15 +08:00
licoy
2b0153807c feat: Add Stability API server relay sending 2024-07-09 09:50:04 +08:00
Dogtiti
9bdd37bb63 feat: qwen 2024-07-07 21:59:56 +08:00
Dogtiti
d726c71141 wip: tencent 2024-07-07 14:43:28 +08:00
Dogtiti
1caa61f4c0 feat: swap name and displayName for bytedance in custom models 2024-07-06 22:59:20 +08:00
Dogtiti
9b3b4494ba wip: doubao 2024-07-06 14:59:37 +08:00
Dogtiti
785d3748e1 feat: support baidu model 2024-07-06 13:05:09 +08:00
licoy
a16725ac17 feat: Improve SD list data and API integration 2024-07-03 15:37:34 +08:00
sijinhui
aac77eb980 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/store/config.ts
#	app/utils.ts
#	yarn.lock
2024-05-17 09:59:38 +08:00
Dean-YZG
2d1f0c9f57 feat: support env var DEFAULT_INPUT_TEMPLATE to custom default template for preprocessing user inputs 2024-05-13 17:11:11 +08:00
sijinhui
f977c52859 merge 2024-05-07 16:46:38 +08:00
sijinhui
5b1f0355ce Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/config/server.ts
#	app/utils/model.ts
2024-05-07 16:39:45 +08:00
Dean-YZG
864529cbf6 feat: googleApiKey & anthropicApiKey support setting multi-key 2024-05-06 21:14:53 +08:00
butterfly
b3e856df1d feat: fix 1)the property named 'role' of the first message must be 'user' 2)if default summarize model 'gpt-3.5-turbo' is blocked, use currentModel instead 3)if apiurl&apikey set by location, useCustomConfig would be opened 2024-05-06 19:26:39 +08:00
sijinhui
f07a3729b9 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/chat.tsx
#	app/constant.ts
#	app/store/access.ts
#	app/utils/hooks.ts
2024-04-26 14:02:16 +08:00
Wayland Zhan
c96e4b7966 feat: Support a way to define default model by adding DEFAULT_MODEL env. 2024-04-19 06:57:15 +00:00
sijinhui
4e4aeb5d02 Merge remote-tracking branch 'upstream/main' into dev 2024-04-10 08:44:52 +08:00
butterfly
b175132854 feat: Optimize var names 2024-04-09 18:23:52 +08:00
butterfly
8b191bd2f7 feat: white webdav server domain 2024-04-09 18:05:56 +08:00
sijinhui
a83d79a9f4 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/auth.ts
#	app/client/platforms/openai.ts
#	app/components/settings.tsx
#	app/config/server.ts
#	app/constant.ts
#	app/locales/pt.ts
#	app/locales/sk.ts
#	app/locales/tw.ts
#	app/store/chat.ts
2024-04-09 10:39:16 +08:00
butterfly
69b079c86e feat: dev done 2024-04-07 11:32:57 +08:00
sijinhui
8620df325d 增加语音输入 2024-03-28 00:48:40 +08:00
sijinhui
13ed23f1f4 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/locales/tw.ts
2024-03-09 11:45:30 +08:00
fred-bf
e71094d4a8
chore: update GTM_ID definition, close #4217 2024-03-05 17:36:52 +08:00
sijinhui
f23abdea1a 1 2024-01-28 01:19:27 +08:00