Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from ChatGPTNextWeb:main #52

Merged
merged 89 commits into from
Mar 13, 2024
Merged
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
5a7b9ab
Fix: Routes `/api/cors/[...path]` was not configured to run with the …
wyxogo Jan 8, 2024
a06a298
Merge branch 'ChatGPTNextWeb:main' into upstream
wyxogo Jan 11, 2024
7ec29c2
add workflows/deploy preview
Jan 24, 2024
bdc25ad
add delete preview scripts
Jan 24, 2024
3bc771a
add workflow_dispatch
Jan 24, 2024
998c95d
test pr deploy
Jan 24, 2024
04fe9fa
add workflows/deploy preview
Jan 24, 2024
8fb3446
add delete preview scripts
Jan 24, 2024
0739ced
add workflow_dispatch
Jan 24, 2024
2f11e7c
test pr deploy
Jan 25, 2024
94f534f
fix vercel alias domains
Jan 25, 2024
628f3ba
Merge branch 'ChatGPTNextWeb:sgm/cicd' into sgm/cicd
sungaomeng Jan 25, 2024
6206ceb
fix: cicd , add pull_request_target
Jan 25, 2024
04855de
Merge pull request #3789 from wyxogo/upstream
fred-bf Jan 25, 2024
43631a3
fix: cicd, vercel domain suffix secret
Jan 25, 2024
f619e9d
chore: change default submit key
fred-bf Jan 25, 2024
a4c1f1a
Merge branch 'main' into sgm/cicd
sungaomeng Jan 25, 2024
1132816
Merge pull request #2 from sungaomeng/sgm/cicd
sungaomeng Jan 25, 2024
5ce1a55
Merge pull request #3909 from sungaomeng/main
fred-bf Jan 25, 2024
fae82a3
fix: cicd, delete vercel pre
Jan 25, 2024
ba3e7e7
fix: cicd, vercel alias domain
Jan 25, 2024
32bcdb8
fix: cicd, delete vercel pre (#3910)
sungaomeng Jan 25, 2024
b2f7bdc
Merge branch 'ChatGPTNextWeb:main' into main
sungaomeng Jan 25, 2024
15d25df
fix: cicd, delete velcel pre
Jan 25, 2024
ecbab75
fix: cicd, alias domain env name
Jan 25, 2024
ca08062
Merge pull request #3913 from sungaomeng/main
sungaomeng Jan 25, 2024
148c32a
fix: cicd, remove workflow_dispatch
Jan 25, 2024
1c73c6c
Merge pull request #3917 from sungaomeng/main
fred-bf Jan 25, 2024
3fa55f9
fix: cicd, checkout sha
Jan 25, 2024
118e8f5
fix: cicd, checkout sha Merge pull request #3920 from sungaomeng/main
sungaomeng Jan 25, 2024
981a362
Add gpt-4-0125-preview (#3924)
leo4life2 Jan 26, 2024
f6cdda9
update google api region (#3934)
NieXi Jan 27, 2024
91a5f4a
Feat Models [GPT-4-turbo] (#3932)
H0llyW00dzZ Jan 27, 2024
eacc911
Add Japanese translations for ChatGPT messages (#3936)
p0x0q Jan 29, 2024
e1b065c
[ImgBot] Optimize images (#3941)
YangguangZhou Jan 29, 2024
bf711f2
修复导出json和markdown时中文及其他utf8字符乱码问题
greenjerry Feb 2, 2024
1a97bd5
Feat [OpenAI] [Models] gpt-3.5-turbo-0125 (#3971)
H0llyW00dzZ Feb 2, 2024
b25a054
fix: typo (#3871)
Dup4 Feb 2, 2024
4511aa4
Fix [UI/UX] [Emoji] Update CDN (#3966)
H0llyW00dzZ Feb 2, 2024
a5517a1
Improve Default System Template (#3996)
H0llyW00dzZ Feb 5, 2024
bb26c03
Feat [UI/UX] [Constants] [Models] gemini-pro KnowledgeCutOffDate (#3997)
H0llyW00dzZ Feb 5, 2024
deea432
ci: build universal binary for macos (#3711)
shirok1 Feb 6, 2024
d0463b2
feat(mac): add sign config, fix arm64 build (#4008)
viseator Feb 6, 2024
887bec0
feat: bump version (#4009)
fred-bf Feb 6, 2024
462a88a
Fix [CI/CD] [Vercel] Deploy Preview (#4005)
H0llyW00dzZ Feb 6, 2024
9d5801f
fix: avoiding not operation for custom models (#4010)
fred-bf Feb 7, 2024
bca7424
fix: fix gemini issue when using app (#4013)
fred-bf Feb 7, 2024
0869455
feat: bump version (#4015)
fred-bf Feb 7, 2024
b8f0822
fix: support custom api endpoint (#4016)
fred-bf Feb 7, 2024
d74f636
Fix/gemini app endpoint (#4017)
fred-bf Feb 7, 2024
47ae874
fix: add support to http scheme. (#3985)
Anivie Feb 7, 2024
bfefb99
chore: update tauri dependencies (#4018)
fred-bf Feb 7, 2024
1d6ee64
[Cherry Pick] Fix [UI/UX] [Front End] Settings Page (#4032)
H0llyW00dzZ Feb 12, 2024
05b6d98
chore: fix typo in next.config.mjs (#4072)
eltociear Feb 20, 2024
e2da340
Add vision support (#4076)
TheRamU Feb 20, 2024
fd67f98
Fix temperature range (#4083)
WqyJh Feb 20, 2024
e756506
[Cherry Pick] Improve Github Issue Template (#4041)
H0llyW00dzZ Feb 20, 2024
22baeba
[Cherry Pick] Fix [Utils] Regex trimTopic
H0llyW00dzZ Feb 20, 2024
ff166f7
chore: adjust for ollama support (#4129)
fred-bf Feb 26, 2024
aacd26c
feat: bump version
fred-bf Feb 26, 2024
bc1794f
feat: bump version (#4133)
fred-bf Feb 26, 2024
f22e36e
feat(tw.ts): added new translations (#4142)
chunkiuu Feb 26, 2024
069766d
Correct cutoff dates (#4118)
Algorithm5838 Feb 27, 2024
410a22d
feat: auto detach scrolling
fred-bf Feb 27, 2024
e3b3ae9
chore: clear scroll info
fred-bf Feb 27, 2024
44a5127
Merge pull request #4149 from fred-bf/feat/auto-detach-scrolling
fred-bf Feb 27, 2024
c197962
fix: No history message attached when for gemini-pro-vision
fengzai6 Feb 27, 2024
08fa227
fix: add max_tokens when using vision model (#4157)
fred-bf Feb 27, 2024
43e5dc2
fix: fix the method to detect vision model
fred-bf Feb 28, 2024
8b821ac
Merge pull request #4162 from fred-bf/fix/identify-vision-model
fred-bf Feb 28, 2024
bd19e97
add_image_pasting
KSnow616 Feb 28, 2024
e705135
vision_model_only
KSnow616 Feb 28, 2024
9775660
Update chat.tsx
KSnow616 Feb 28, 2024
1294817
Merge pull request #4089 from H0llyW00dzZ/cherry-pick
fred-bf Feb 29, 2024
99fb9dc
Merge pull request #4164 from KSnow616/main
fred-bf Feb 29, 2024
86ae4b2
slightly polishes the tw text.
aliceric27 Mar 2, 2024
e106643
fix some text
aliceric27 Mar 2, 2024
98aa023
Merge pull request #4195 from aliceric27/main
fred-bf Mar 4, 2024
e71094d
chore: update GTM_ID definition, close #4217
fred-bf Mar 5, 2024
5529ece
Merge pull request #4218 from ChatGPTNextWeb/fred-bf-patch-1
fred-bf Mar 5, 2024
052524d
Merge remote-tracking branch 'upstream/main'
fengzai6 Mar 7, 2024
5348d57
Fix EmojiPicker mobile width adaptation and update avatar clicking be…
fengzai6 Mar 7, 2024
c22153a
Revert "fix: No history message attached when for gemini-pro-vision"
fengzai6 Mar 7, 2024
ad10a11
Add z-index to avatar
fengzai6 Mar 7, 2024
2bf6111
Merge branch 'main' into fix-export-garbled
fred-bf Mar 7, 2024
ff9f0e6
Merge pull request #3972 from greenjerry/fix-export-garbled
fred-bf Mar 7, 2024
a15c4d9
Merge pull request #4234 from fengzai6/main
fred-bf Mar 11, 2024
844c2a2
chore: specify yarn 1 in package.json
SukkaW Mar 13, 2024
61ce386
Merge pull request #4279 from SukkaW/package-json-corepack
fred-bf Mar 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: update GTM_ID definition, close ChatGPTNextWeb#4217
fred-bf authored Mar 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e71094d4a8f3650265789c580b301218c4ade7d3
3 changes: 3 additions & 0 deletions app/config/server.ts
Original file line number Diff line number Diff line change
@@ -30,6 +30,9 @@ declare global {
// google only
GOOGLE_API_KEY?: string;
GOOGLE_URL?: string;

// google tag manager
GTM_ID?: string;
}
}
}