Commit Graph

3268 Commits

Author SHA1 Message Date
sijinhui
1ab9efdf07 fix merge bug 2024-09-25 18:44:07 +08:00
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
Lloyd Zhou
93ff7d26cc
Merge pull request #5529 from Leizhenpeng/support-saas-readme
Support saas version in readme
2024-09-25 16:34:25 +08:00
river
13777786c4 chore: ja 2024-09-25 16:30:26 +08:00
river
6655c64e55 chore: cn 2024-09-25 16:29:59 +08:00
Dogtiti
7f3f6f1aaf
Merge pull request #5528 from ChatGPTNextWeb/add_tip_top
fix url i18
2024-09-25 16:21:33 +08:00
mayfwl
ea04595c5e
Merge branch 'main' into add_tip_top 2024-09-25 16:19:55 +08:00
lyf
13c68bd810 fix url utm 2024-09-25 16:11:57 +08:00
lyf
1d2f44fba8 fix url 2024-09-25 16:00:48 +08:00
sijinhui
8aee62a382 临时修复压缩消息所用提供商错误bug 2024-09-25 15:49:25 +08:00
lloydzhou
68702bfb1f update version 2024-09-25 15:49:20 +08:00
lyf
e83f61e74d fix 2024-09-25 15:21:17 +08:00
lyf
10d472e79e fix 2024-09-25 14:41:41 +08:00
lyf
a6b920d9af fix 2024-09-25 14:35:09 +08:00
sijinhui
0468ee5849 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	app/components/settings.tsx
#	app/store/plugin.ts
2024-09-25 13:48:42 +08:00
river
b7892b58f5 chore: support saas 2024-09-25 13:34:04 +08:00
lyf
77f037a3c4 add maidian 2024-09-25 13:08:03 +08:00
sijinhui
217b2802e1
Merge pull request #169 from sijinhui/dongxiao-240924
优化效果
2024-09-25 12:49:49 +08:00
sijinhui
4213440c63 优化效果 2024-09-25 12:00:32 +08:00
sijinhui
5e844077e1
Merge pull request #168 from sijinhui/dongxiao-240924
优化效果
2024-09-25 11:33:56 +08:00
sijinhui
3933a2735f 优化效果 2024-09-25 11:31:03 +08:00
lyf
248d27680d fix style 2024-09-25 11:15:00 +08:00
sijinhui
4caefb7b38
Merge pull request #167 from sijinhui/dongxiao-240924
修复build错误
2024-09-25 11:09:37 +08:00
sijinhui
73da4b10ab 基本完成观察效果 2024-09-25 11:08:47 +08:00
sijinhui
e143d54182
Merge pull request #166 from sijinhui/dongxiao-240924
Dongxiao 240924
2024-09-25 11:06:55 +08:00
sijinhui
8664a60e35 基本完成观察效果 2024-09-25 11:06:16 +08:00
Lloyd Zhou
4c84182e7a
Merge pull request #5522 from ConnectAI-E/fix/5494
fix: prevent title update on invalid message response
2024-09-25 10:53:00 +08:00
Dogtiti
e8581c8f3c fix: prevent title update on invalid message response 2024-09-25 00:37:37 +08:00
sijinhui
ae518a2f36 add 2024-09-25 00:03:25 +08:00
sijinhui
1d04796ca0 临时修复 2024-09-24 23:07:25 +08:00
sijinhui
0ff74f01d3 目前有个稳定的拖拽bug 2024-09-24 22:25:37 +08:00
lyf
fe4cba8baf fix style slect button 2024-09-24 22:25:36 +08:00
Dogtiti
9bbd7d3185
Merge pull request #5519 from ConnectAI-E/feature-play-audio-and-video
Feature play audio and video
2024-09-24 22:03:55 +08:00
sijinhui
613fee859a fix 2024-09-24 19:00:39 +08:00
sijinhui
fea8074f6a fix 2024-09-24 18:56:23 +08:00
lloydzhou
dbabb2c403 auto play video/audio 2024-09-24 18:52:54 +08:00
lloydzhou
6c37d04591 auto play video/audio 2024-09-24 18:52:48 +08:00
Dogtiti
649c5be64e
Merge pull request #5508 from ConnectAI-E/feature-buildin-plugin
add buildin plugin
2024-09-24 17:28:48 +08:00
Dogtiti
fc0042a799
Merge pull request #5515 from DDMeaqua/config-artifacts
Config artifacts
2024-09-24 17:27:33 +08:00
DDMeaqua
269d064e0a fix: #5450 2024-09-24 15:21:27 +08:00
DDMeaqua
6c8143b7de feat: 全局设置是否启用artifacts 2024-09-24 15:15:08 +08:00
lloydzhou
f9f99639db update 2024-09-24 12:59:21 +08:00
lyf
6d5bf490ab fix media 2024-09-24 11:36:26 +08:00
Dogtiti
46fc2a5012
Merge pull request #5498 from DDMeaqua/fix-plugin-css
Fix plugin css
2024-09-24 10:23:06 +08:00
lloydzhou
90e7b5aecf try using openai api key for dalle-3 plugin 2024-09-23 20:20:20 +08:00
lloydzhou
ed20fd2962 1. add buildin plugin; 2. remove usingProxy 2024-09-23 20:00:07 +08:00
sijinhui
0f1a4deca3
Merge pull request #165 from sijinhui/dev
change login tip
2024-09-23 18:30:50 +08:00
sijinhui
e5f428dfff merge 2024-09-23 18:29:47 +08:00
sijinhui
4e82a8947d
Merge pull request #164 from sijinhui/dev
Dev
2024-09-23 17:32:22 +08:00
sijinhui
de11c79bf9 Merge remote-tracking branch 'upstream/main' into dev 2024-09-23 17:30:24 +08:00