Commit Graph

141 Commits

Author SHA1 Message Date
sijinhui
5d6d676b87 merge 2024-09-19 00:07:37 +08:00
DDMeaqua
3ae8ec1af6 feat: tts 2024-09-18 11:24:25 +08:00
DDMeaqua
2f410fc09f feat: add tts stt 2024-08-27 16:21:02 +08:00
sijinhui
9ccf8550b0 123 2024-08-21 23:36:30 +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
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
14ff46b5cd 解决按钮无障碍 2024-08-07 13:01:08 +08:00
webws
b2c1644d69 feat: add support for iFLYTEK Spark API (接入讯飞星火模型) 2024-08-06 17:54:30 +08:00
sijinhui
86e8303104 优化字体 2024-08-03 21:30:32 +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
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
e1d6131f13 update 2024-08-01 16:49:55 +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
966db1e4be add moonshot settings 2024-08-01 12:03:22 +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
Dogtiti
3935c725c9 feat: sd setting 2024-07-23 22:44:09 +08:00
sijinhui
932c1103f2 merge 2024-07-21 08:37:28 +08:00
sijinhui
c8f2d8029b Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/constant.ts
#	app/store/chat.ts
2024-07-21 07:25:36 +08:00
lloydzhou
ac04a1cac8 resolve conflicts 2024-07-20 14:41:42 +08:00
lloydzhou
87a286ef07 refactor setting page 2024-07-20 14:36:47 +08:00
YeungYeah
ee22fba448
Merge branch 'main' into main 2024-07-17 22:16:30 +08:00
sijinhui
c53ee2f065 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/api/common.ts
#	app/components/settings.tsx
#	app/store/access.ts
2024-07-17 12:58:32 +08:00
lloydzhou
53c1176cbf update labels in setting page 2024-07-12 23:06:37 +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
Lloyd Zhou
844025ec14
Merge pull request #4942 from ConnectAI-E/feature/alibaba
feat: qwen
2024-07-09 21:51:16 +08:00
lloydzhou
044c16da4c update 2024-07-09 21:17:32 +08:00
lloydzhou
cd4784c54a update 2024-07-09 21:14:38 +08:00
lloydzhou
e3b3a4fefa add custom settings 2024-07-09 20:09:03 +08:00
lloydzhou
7573a19dc9 add custom settings 2024-07-09 20:01:58 +08:00
Dogtiti
785d3748e1 feat: support baidu model 2024-07-06 13:05:09 +08:00
YeungYeah
74986803db feat: add google api safety setting 2024-06-15 12:09:58 +08:00
sijinhui
b7a216c35b 微调样式 2024-05-26 13:17:35 +08:00
DeanYao
d89a12aa05
Revert "Chat gpt" 2024-05-20 19:02:46 +08:00
Hao Jia
bfdb47a7ed ChatGPT Logo 2024-05-16 15:03:14 +08:00
sijinhui
d6e758269d optimize prompt 2024-04-13 00:08:31 +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
6a5989a440 Merge remote-tracking branch 'upstream/main' into dev 2024-03-13 15:17:01 +08:00
fengzai6
5348d57057 Fix EmojiPicker mobile width adaptation and update avatar clicking behavior 2024-03-07 15:36:19 +08:00
sijinhui
cc87bb04e8 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
2024-02-15 09:26:08 +08:00
H0llyW00dzZ
1d6ee64e1d
[Cherry Pick] Fix [UI/UX] [Front End] Settings Page (#4032)
* Fix [UI/UX] [Locales] Correct Spelling

- [+] fix(locales): correct spelling and improve wording in cn.ts and en.ts locale files

* Fix [UI/UX] [Front End] Settings Page

- [+] fix(settings.tsx): correct typo in ApiVerion to ApiVersion
- [+] refactor(settings.tsx): switch Azure.ApiKey to Google.ApiKey in ListItem title and subTitle

* Fix [UI/UX] [Locales] [SK] Correct Typo

- [+] fix(sk.ts): correct typo in ApiVersion key in Slovak locale file
2024-02-12 20:36:52 +08:00
sijinhui
830f98f335 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/constant.ts
2024-02-05 17:20:46 +08:00
Duplicate4
b25a0545f5
fix: typo (#3871)
Signed-off-by: Dup4 <lyuzhi.pan@gmail.com>
2024-02-03 01:20:10 +08:00
sijinhui
19f4ef9194 merge upstream 2023-12-27 22:47:01 +08:00
Fred Liang
45798f993d
fix: fix type errors 2023-12-24 02:39:13 +08:00
Fred Liang
778e88cb56
chore: resolve conflict 2023-12-24 02:15:30 +08:00
sijinhui
b43c0b0109 init 2023-12-16 23:05:14 +08:00