Commit Graph

3303 Commits

Author SHA1 Message Date
sijinhui
8a732bae87 Merge remote-tracking branch 'upstream/main' 2024-09-29 10:04:17 +08:00
Dogtiti
f9d6f4f9da
Merge pull request #5553 from ConnectAI-E/fix/default-model
fix: default model
2024-09-27 21:13:26 +08:00
Lloyd Zhou
a13bd624e8
Merge pull request #5552 from joetsuihk/hotfix/upstream-sync-doc
docs: Hotfix/upstream sync doc update
2024-09-27 20:36:16 +08:00
Joe
8fb019b2e2
revert, leave sync.yml untouched
revert commit 19c4ed4463
2024-09-27 17:34:38 +08:00
Joe
2f3457e73d
Update correct links to manualy code update section (JP) 2024-09-27 17:33:02 +08:00
Dogtiti
c6ebd6e73c fix: default model 2024-09-27 17:00:24 +08:00
Joe
2333a47c55
Update links in doc to manual code update section (CN) 2024-09-27 16:50:51 +08:00
Joe
b35895b551
Update correct links to manualy code update section 2024-09-27 16:49:08 +08:00
Joe
19c4ed4463
docs links updated sync.yml
https://github.com/Yidadaa/ChatGPT-Next-Web is renamed to https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/
2024-09-27 16:43:50 +08:00
sijinhui
9347933774 修改小提示 2024-09-27 13:51:25 +08:00
sijinhui
0a6c36441c
Merge pull request #178 from sijinhui/dev
merge
2024-09-27 13:10:53 +08:00
sijinhui
3a6dfff835 Merge remote-tracking branch 'upstream/main' into dev 2024-09-27 13:06:06 +08:00
sijinhui
f8cac63d1e Merge remote-tracking branch 'origin/main' into dev 2024-09-27 13:05:38 +08:00
sijinhui
785fa4ed76 修改o1模型调用 2024-09-27 11:58:15 +08:00
Dogtiti
870ad913cc
Merge pull request #5545 from ConnectAI-E/hotfix/google-auth-header
fix: build error
2024-09-27 11:43:43 +08:00
Dogtiti
3fb389551b fix: build error 2024-09-27 11:42:16 +08:00
Dogtiti
d12a4adfb5
Merge pull request #5541 from ConnectAI-E/hotfix/google-auth-header
google api using `x-google-api-key` header
2024-09-27 11:04:10 +08:00
lloydzhou
702e17c96b google api using x-google-api-key header 2024-09-26 23:21:42 +08:00
sijinhui
f1dde29cbd
Merge pull request #177 from sijinhui/dongxiao-240924
尝试提高build速度
2024-09-26 18:57:00 +08:00
sijinhui
569a731ee8 尝试优化构建结构 2024-09-26 18:52:42 +08:00
sijinhui
ad45a8195f 尝试优化构建结构 2024-09-26 18:47:24 +08:00
sijinhui
a0e720e5ee 尝试优化构建结构 2024-09-26 18:42:51 +08:00
sijinhui
50f9a28c4a
Merge pull request #176 from sijinhui/dongxiao-240924
加快一点动画速度
2024-09-26 18:22:54 +08:00
sijinhui
06a8c01f12 加快一点动画速度 2024-09-26 18:22:12 +08:00
sijinhui
8f799ddf2f
Merge pull request #175 from sijinhui/dongxiao-240924
fix mobile bug
2024-09-26 16:41:30 +08:00
sijinhui
e1ad7c5234 fix mobile bug 2024-09-26 16:40:29 +08:00
sijinhui
96b273f9d8
Merge pull request #174 from sijinhui/dongxiao-240924
fix add ele
2024-09-26 13:49:34 +08:00
sijinhui
ac9e66bff7 fix add ele 2024-09-26 13:48:53 +08:00
sijinhui
aa474d279b enable pm2 start 2024-09-26 10:44:11 +08:00
sijinhui
e22c50ff1a enable pm2 start 2024-09-26 10:07:26 +08:00
sijinhui
de7d1b2e22 enable start script 2024-09-25 19:01:48 +08:00
sijinhui
8c4ee10281
Merge pull request #173 from sijinhui/dev
fix merge bug
2024-09-25 18:44:53 +08:00
sijinhui
1ab9efdf07 fix merge bug 2024-09-25 18:44:07 +08:00
sijinhui
5a72dcd181
Merge pull request #172 from sijinhui/dev
merge
2024-09-25 18:38:52 +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
4ac2e9f0e2
Merge pull request #171 from sijinhui/dev
临时修复压缩消息所用提供商错误bug
2024-09-25 15:51:22 +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
c835e8108d
Merge pull request #170 from sijinhui/dev
Dev
2024-09-25 13:52:42 +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