Commit Graph

246 Commits

Author SHA1 Message Date
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
l.tingting
ca865a80dc dall-e-3 adds 'quality' and 'style' options 2024-08-10 11:09:07 +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
c9099ca0a5 无障碍按钮和链接 2024-08-07 10:55:02 +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
fec80c6c51
Merge pull request #5173 from ConnectAI-E/feature/dalle
add dalle3 model
2024-08-05 20:49:37 +08:00
GH Action - Upstream Sync
724c814bfe Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2024-08-04 01:04:56 +00:00
sijinhui
86e8303104 优化字体 2024-08-03 21:30:32 +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
b6a022b0ef feat(config): Set markdown's font-family 2024-08-03 16:04:20 +08:00
frostime
deb140de73 feat: 为命令前缀( : )支持中文符号 2024-08-02 22:38:31 +08:00
李超
8498cadae8 fix: Fixed an issue where the sample of the reply content was displayed out of order 2024-08-02 21:06:03 +08:00
lloydzhou
46cb48023e fix typescript error 2024-08-02 18:50:48 +08:00
lloydzhou
ac599aa47c add dalle3 model 2024-08-02 18:00:42 +08:00
sijinhui
f1bd456a41 merge 2024-08-01 16:31:11 +08:00
sijinhui
6483c86280 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-27 21:59:52 +08:00
Dogtiti
6737f016f5 chore: artifact => artifacts 2024-07-26 15:50:26 +08:00
Dogtiti
c27ef6ffbf feat: artifacts style 2024-07-25 23:29:29 +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
044116c14c add plugin selector on chat 2024-07-25 13:29:39 +08:00
Dogtiti
fd441d9303 feat: discovery icon 2024-07-24 20:41:41 +08:00
Lloyd Zhou
5b126c7e52
Revert "feat: improve components structure" 2024-07-22 22:18:51 +08:00
Dogtiti
038e6df8f0 feat: improve components structure 2024-07-22 16:02:45 +08:00
lloydzhou
fc31d8e5d1 merge origin/main 2024-07-20 15:15:46 +08:00
sijinhui
1bc6a79d6a Merge remote-tracking branch 'upstream/main' into dev 2024-07-19 18:06:31 +08:00
lloydzhou
287fa0a39c feat: 1. using cache storage store image data; 2. get base64image before chat to api #5013 2024-07-19 13:50:10 +08:00
jiangying
74a0810bbb fix typo 2024-07-17 12:49:11 +08:00
jiangying
47d27c1f41 fix typo 2024-07-16 14:35:06 +08:00
sijinhui
04ceade37a merge 2024-07-12 11:37:33 +08:00
sijinhui
37392d068c 修复模型选择继承的小bug 2024-07-12 11:28:32 +08:00
sijinhui
4733de20b2 注释一堆注释 2024-07-12 00:33:13 +08:00
sijinhui
578f0b883c 修复错误 2024-07-12 00:21:14 +08:00
lloydzhou
498d0f0b8b merge main 2024-07-11 15:29:47 +08:00
sijinhui
af741e4dbf merge 2024-07-11 13:09:18 +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
82be426f78 fix eslint error 2024-07-09 18:19:34 +08:00
lloydzhou
9d7e19cebf display doubao model name when select model 2024-07-09 18:05:23 +08:00
lloydzhou
1c20137b0e support azure deployment name 2024-07-05 19:59:45 +08:00
licoy
a16725ac17 feat: Improve SD list data and API integration 2024-07-03 15:37:34 +08:00
sijinhui
007c004a44 修改最大限制 2024-06-24 18:09:58 +08:00
sijinhui
cce6bcbbc8 微调样式 2024-05-26 13:19:12 +08:00
sijinhui
b7a216c35b 微调样式 2024-05-26 13:17:35 +08:00
sijinhui
a697822445 限制每天使用量 2024-05-25 21:14:21 +08:00
DeanYao
d89a12aa05
Revert "Chat gpt" 2024-05-20 19:02:46 +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
Kivi1998
7f3516f44f
Merge branch 'main' into chatGPT 2024-05-16 15:14:43 +08:00
Hao Jia
bfdb47a7ed ChatGPT Logo 2024-05-16 15:03:14 +08:00
sijinhui
ebbf9e4f7c 暂存 2024-05-14 17:28:09 +08:00