Commit Graph

2974 Commits

Author SHA1 Message Date
sijinhui
0d363e8aa2 merge 2024-08-18 20:44:47 +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
lloydzhou
495b321d0a Merge remote-tracking branch 'origin/main' 2024-08-16 16:35:31 +08:00
lloydzhou
8a38cdc1d7 update version 2024-08-16 16:35:13 +08:00
Lloyd Zhou
e210db7bd9
Merge pull request #5235 from ConnectAI-E/feature/access
代码折叠
2024-08-16 16:34:13 +08:00
Lloyd Zhou
f64763b74b
Merge pull request #5093 from DDMeaqua/feat-i18n
feat: update i18n
2024-08-16 16:20:31 +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
Dogtiti
87325fad74
Merge pull request #5270 from DDMeaqua/main
feat: add model name to conversation page
2024-08-15 20:12:33 +08:00
Lloyd Zhou
122aa94c9f
Merge pull request #5273 from ElricLiu/main
Update README.md
2024-08-15 14:35:48 +08:00
ElricLiu
e2e8a45104
Update README.md 2024-08-14 20:38:52 +08:00
sijinhui
0fe6f4055c fix build 2024-08-14 18:31:43 +08:00
sijinhui
ef4acbc773 fix build 2024-08-14 17:59:23 +08:00
sijinhui
c8f3e8840d fix build 2024-08-14 17:46:20 +08:00
sijinhui
04d028634f fix build 2024-08-14 17:45:24 +08:00
sijinhui
7b80f23e39 fix build 2024-08-14 17:39:18 +08:00
sijinhui
ffffc151eb fix build 2024-08-14 17:09:51 +08:00
sijinhui
778c5bd4da fix build 2024-08-14 17:05:05 +08:00
sijinhui
0bdabde514 fix build 2024-08-14 17:01:52 +08:00
sijinhui
ed8c18b635 fix build 2024-08-14 17:00:36 +08:00
sijinhui
63f0d53140 fix build 2024-08-14 14:24:48 +08:00
DDMeaqua
fb5fc13f72 feat: add model name 2024-08-13 19:58:44 +08:00
sijinhui
7bfb0035db
Merge pull request #149 from sijinhui/dev
fix tiktoken
2024-08-13 19:01:25 +08:00
sijinhui
1626bd3e4e fix tiktoken 2024-08-13 18:58:13 +08:00
sijinhui
bf99fd25d0
Merge pull request #148 from sijinhui/dev
print ip
2024-08-13 18:39:24 +08:00
sijinhui
d9f324bcf6 print ip 2024-08-13 18:38:34 +08:00
sijinhui
882f686970
Merge pull request #147 from sijinhui/dev
Dev
2024-08-13 18:26:27 +08:00
sijinhui
e73a5c4f4b merge 2024-08-13 18:26:01 +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
Dogtiti
edb92f7bfb
Merge pull request #5245 from MrrDrr/dalle3_add_options
dall-e-3 adds 'quality' and 'style' options
2024-08-13 15:31:18 +08:00
lyf
1980f43b9f feat(auth): xg feature 2024-08-12 16:31:12 +08:00
lyf
c3c3dd5154 feature add zhedie 2024-08-12 14:06:21 +08:00
lyf
356155fd30 feature add zhedie 2024-08-12 13:58:53 +08:00
sijinhui
1bc010fb37 没啥变化 2024-08-10 22:16:11 +08:00
lyf
6f75ef8f0a addcd 2024-08-10 12:45:50 +08:00
l.tingting
ca865a80dc dall-e-3 adds 'quality' and 'style' options 2024-08-10 11:09:07 +08:00
sijinhui
39c96dce59 debug domain 2024-08-09 18:18:34 +08:00
lyf
8f759d1c3e 代码折叠 2024-08-09 14:55:25 +08:00
lyf
44787637f2 tj 2024-08-08 21:07:03 +08:00
Dogtiti
cf1c8e8f2a
Merge pull request #5233 from ConnectAI-E/feature/bangpt
Feature/bangpt
2024-08-08 17:27:50 +08:00
lyf
d948be2372 Merge branch 'feature/bangpt' of ssh://github.com/ConnectAI-E/ChatGPT-Next-Web into feature/bangpt 2024-08-08 16:25:49 +08:00
lyf
cc28aef625 add gpt-4o-2024-08-06 2024-08-08 16:23:40 +08:00
Dogtiti
036358de7c
Merge pull request #5219 from ConnectAI-E/feature/access
修复ChatGPTNextWeb页面的无障碍问题
2024-08-08 13:59:16 +08:00
lyf
0958b9ee12 tsxiugai 2024-08-08 13:08:56 +08:00
sijinhui
b0a53d9f6c
Merge pull request #146 from sijinhui/dev
123
2024-08-08 00:16:53 +08:00
sijinhui
96e6719fb1 123 2024-08-08 00:15:50 +08:00
sijinhui
0fa78d3c49
Merge pull request #145 from sijinhui/dev
Dev
2024-08-07 23:45:55 +08:00
sijinhui
9776cb5471 merge 2024-08-07 23:45:01 +08:00
sijinhui
53f1782c7c Merge remote-tracking branch 'upstream/main' into dev 2024-08-07 23:43:27 +08:00
sijinhui
4b97e374e7 fix little bug 2024-08-07 23:42:03 +08:00