Commit Graph

1858 Commits

Author SHA1 Message Date
GH Action - Upstream Sync
a32d602e4c Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2023-12-19 00:42:34 +00:00
Yifei Zhang
a454c39ca0
Merge pull request #3511 from KevenLi8888/add-dockerignore
ci: add .dockerignore to exclude env files to prevent potential key leakages 避免潜在的密钥泄漏
2023-12-18 15:26:32 +08:00
Yifei Zhang
6938910f08
Merge pull request #3559 from RoboticsAndCloud/patch-1
Update README.md
2023-12-18 15:25:49 +08:00
DirkSchlossmacher
ba7bca93c5
Merge branch 'ChatGPTNextWeb:main' into main 2023-12-18 07:59:00 +01:00
Fei
2c63dde6c5
Update README.md 2023-12-17 21:24:36 -06:00
Yifei Zhang
e69d20a209
Merge pull request #3538 from MCheping8108/main
fix sync.yml
2023-12-18 01:16:54 +08:00
和平peaceful
0b731edd21
fix sync.yml 2023-12-15 21:24:37 +08:00
Yifei Zhang
efdd61595e
Merge pull request #3535 from ChatGPTNextWeb/Yidadaa-patch-1
Update README_CN.md
2023-12-15 17:47:47 +08:00
Yifei Zhang
d676f88fed
Update README_CN.md 2023-12-15 17:47:36 +08:00
Yifei Zhang
07f2cf7ad0
Merge pull request #3532 from ChatGPTNextWebTeam/update-emoji-url
fix: update emoji url
2023-12-15 15:20:15 +08:00
Yifei Zhang
bcb520ed3b
Update emoji.tsx 2023-12-15 15:18:02 +08:00
Qian (Keven) Li
93cee18300 ci: add .dockerignore to exclude env files 2023-12-12 02:26:49 -05:00
GH Action - Upstream Sync
c52bbb587f Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-12-12 00:40:14 +00:00
Yifei Zhang
cae4655785
Update tauri.conf.json 2023-12-11 15:59:37 +08:00
GH Action - Upstream Sync
4e18035276 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-12-07 00:39:42 +00:00
Yifei Zhang
28c12606a4
Merge pull request #3455 from H0llyW00dzZ/trimtopic 2023-12-06 18:58:38 +08:00
DirkSchlossmacher
d142eaaef7 { last_sessionInc: timeValue } 2023-12-05 14:31:28 +01:00
DirkSchlossmacher
d8d4253c06 last_sessionInc 2023-12-05 14:26:33 +01:00
H0llyW00dzZ
54df355014
Fix Trim Topic in Indonesia Language
- [+] fix(utils.ts): fix trimTopic function to remove double quotes from the start and end of the string, and remove specified punctuation from the end of the string
2023-12-05 07:26:11 +07:00
GH Action - Upstream Sync
bfe7c5b2fe Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-30 00:39:28 +00:00
Yifei Zhang
cf50299b14
Update README_CN.md 2023-11-29 11:39:21 +08:00
GH Action - Upstream Sync
76df875392 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-28 00:40:02 +00:00
Yifei Zhang
2c12be62c4
Merge pull request #3383 from H0llyW00dzZ/auth 2023-11-27 15:51:27 +08:00
Yifei Zhang
4636a75b5e
Merge pull request #3382 from H0llyW00dzZ/docs 2023-11-27 15:47:39 +08:00
Yifei Zhang
03756e364a
Merge pull request #3372 from H0llyW00dzZ/fixserverside 2023-11-27 15:47:24 +08:00
Yifei Zhang
ce1715c79e
Merge pull request #3369 from H0llyW00dzZ/chatz 2023-11-27 15:47:01 +08:00
Yifei Zhang
a62ab3c649
Merge pull request #3354 from AnYiEE/fix-type 2023-11-27 15:45:42 +08:00
Yifei Zhang
bfb7b988f4
Merge pull request #3356 from durianice/pr_merge 2023-11-27 15:44:03 +08:00
Yifei Zhang
84f41262f5
Update README.md 2023-11-27 15:28:34 +08:00
H0llyW00dzZ
dda40e29f4
Fix & Refactor UI/UX Page [Settings]
- [+] fix(settings.tsx): fix conditional rendering of ListItem based on clientConfig.isApp
- [+] refactor(settings.tsx): improve readability of conditional rendering code
2023-11-27 08:07:53 +07:00
H0llyW00dzZ
7df868e22a
Revert "Fix & Refactor UI/UX Page [Auth]"
This reverts commit d76e744eab.

Reason: Move to commits bf5e7aaa48
2023-11-27 07:12:57 +07:00
H0llyW00dzZ
bf5e7aaa48
Feat UI/UX Page [Settings]
- [+] feat(settings.tsx): set useCustomConfig to true if clientConfig.isApp is truthy
2023-11-27 07:03:41 +07:00
H0llyW00dzZ
d76e744eab
Fix & Refactor UI/UX Page [Auth]
- [+] fix(auth.tsx): fix condition to set custom endpoint to true if it's app
- [+] refactor(auth.tsx): update accessStore to set useCustomConfig to true
2023-11-27 05:44:26 +07:00
H0llyW00dzZ
6f5699fe09
Chore Docs (README.md)
- [+] chore(README.md): add support for Korean and Indonesian languages
2023-11-27 04:49:15 +07:00
H0llyW00dzZ
f9d916925e
Fixup Api Common [Server Side] [Console Log]
- [+] fix(common.ts): fix condition to check if serverConfig.openaiOrgId is not undefined
2023-11-25 10:23:16 +07:00
H0llyW00dzZ
f9258878db
Fix Api Common [Server Side] [Console Log]
- [+] fix(common.ts): fix console.log statement for [Org ID] to handle undefined value
2023-11-25 10:10:06 +07:00
GH Action - Upstream Sync
d104afdff3 Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web 2023-11-25 00:37:25 +00:00
H0llyW00dzZ
ef9e86b50d
Fix UI/UX Page Chats [Memory Prompt] [Stored Local Storage]
- [+] fix(chat.ts): update the memory prompt in onFinish callback
- [+] feat(chat.ts): update the current session with lastSummarizeIndex and memoryPrompt
2023-11-25 05:03:34 +07:00
DirkSchlossmacher
2d4544ec4b modelsToReplace 2023-11-24 16:20:18 +01:00
Yifei Zhang
b21931c667
Update README.md 2023-11-24 11:36:14 +08:00
Yifei Zhang
06de3f5e69
Update README.md 2023-11-24 10:33:33 +08:00
DirkSchlossmacher
bf334d93fe no model tracking in redis 2023-11-23 15:19:55 +01:00
DirkSchlossmacher
d0a8be1f26 rollback 2023-11-23 14:54:45 +01:00
DirkSchlossmacher
9f68da3afc getMyServerSession 2023-11-23 14:37:56 +01:00
DirkSchlossmacher
ee042d9dbe no req 2023-11-23 14:37:21 +01:00
DirkSchlossmacher
d86b7ddd50 getServerAuthSession 2023-11-23 14:22:51 +01:00
DirkSchlossmacher
edaa25d1d5 const modelIdentifier = modelConfig.model; 2023-11-23 13:56:19 +01:00
DirkSchlossmacher
04ed030276 session or email is not available 2023-11-23 13:51:49 +01:00
DirkSchlossmacher
4b66ba8821 userEmail 2023-11-23 13:45:12 +01:00
DirkSchlossmacher
fda1afdebd modelConfig.model 2023-11-23 13:32:16 +01:00