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.

Sign up for GitHub

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

merge #3943

Closed
wants to merge 229 commits into from
Closed

merge #3943

Changes from all commits
Commits
Show all changes
229 commits
Select commit Hold shift + click to select a range
c9c6bb1
update japanese translate
zyfy29 Jul 1, 2023
bbdf682
fix: #2208 use global settings button dose not work
Yidadaa Jul 1, 2023
ac7ac37
fix: #2195 correct macos icon size
Yidadaa Jul 1, 2023
d50f18a
feat: close #2194 add macos arm support
Yidadaa Jul 1, 2023
dbfac02
fix: action ubuntu version
Yidadaa Jul 1, 2023
4be23e1
feat: build universal app darwin bundle
Yidadaa Jul 1, 2023
5969018
Revert "feat: build universal app darwin bundle"
Yidadaa Jul 1, 2023
512aa37
chore(deps-dev): bump prettier from 2.8.7 to 2.8.8
dependabot[bot] Jul 3, 2023
0b16723
chore(deps): bump rehype-katex from 6.0.2 to 6.0.3
dependabot[bot] Jul 3, 2023
2309333
chore(deps): bump @hello-pangea/dnd from 16.2.0 to 16.3.0
dependabot[bot] Jul 3, 2023
6ea560c
chore(deps-dev): bump @types/node from 20.3.1 to 20.3.3
dependabot[bot] Jul 3, 2023
074531d
fix: #2230 hide chat actions for context prompts
Yidadaa Jul 3, 2023
45587b6
fix: #2221 user prompts in front of all prompts
Yidadaa Jul 3, 2023
3a3b5bc
feat: add top p config
Yidadaa Jul 3, 2023
f54b3b2
fixup
Yidadaa Jul 3, 2023
bae9c06
Update tauri.conf.json
Yidadaa Jul 3, 2023
9c05aa9
fix: temperature -> top_p
PaRaD1SE98 Jul 3, 2023
c9f2588
refactor: improve modal ux
Yidadaa Jul 4, 2023
751aef6
feat: close #2192 use /list/models to get model ids
Yidadaa Jul 4, 2023
b0c10a6
feat: add setting to hide builtin masks
marcusschiesser Jul 4, 2023
f8db55e
fix summarize don't send
Jul 5, 2023
df29adf
refactor: #2256 hide builtin masks
Yidadaa Jul 5, 2023
666b574
fix: #2261 default enable gpt-4 models
Yidadaa Jul 5, 2023
57aafd5
fix: #2252 polyfill composing for old safari browsers
Yidadaa Jul 5, 2023
0a7328d
feat: close #1072 share mask as link
Yidadaa Jul 5, 2023
a81edb6
feat: add max icon for modals
Yidadaa Jul 5, 2023
c5535b3
feat: close #2267 display a modal to export image
Yidadaa Jul 5, 2023
f5a8c28
Added support for Bangla language
Jul 5, 2023
8e91a1d
feat: improve svg viewer
Yidadaa Jul 5, 2023
3e49c57
Added support for Bangla language
Jul 5, 2023
f133080
Added support for Bangla language
Jul 5, 2023
253d529
Added support for Bangla language
Jul 5, 2023
4f47310
Added support for Bangla language
Jul 5, 2023
7b00c75
feat: close #2266 use modal to switch model
Yidadaa Jul 5, 2023
0d5843b
fixup
Yidadaa Jul 5, 2023
c8d73e3
fixup
Yidadaa Jul 5, 2023
5466dfd
Update tauri.conf.json
Yidadaa Jul 6, 2023
d26f968
perf: models接口返回数据的容错处理
Saber-Kurama Jul 6, 2023
7d32e4f
fix: selector z-index bug
PaRaD1SE98 Jul 6, 2023
71be63d
Update README.md
Yidadaa Jul 7, 2023
39cbca6
chore(fr.ts): update French translations for improved user experience…
Jul 8, 2023
62d32d4
fix: #2308 improve chat actions
Yidadaa Jul 9, 2023
e5ea478
feat: close #2294 add documents for adding a new translation
Yidadaa Jul 9, 2023
7847f98
chore: update readme
Yidadaa Jul 9, 2023
ffcfa41
fix: #2295 use correct methods to migrate state
Yidadaa Jul 9, 2023
9de8291
feat: #2308 improve chat actions ux
Yidadaa Jul 9, 2023
d012495
fix: #2280 auto-detect models from 'list/models'
Yidadaa Jul 9, 2023
4c6f181
feat: close #2303 add custom model name config
Yidadaa Jul 9, 2023
b5f18a4
feat: #920 migrate id to nanoid
Yidadaa Jul 9, 2023
d10950d
fix: #2303 should select custom models
Yidadaa Jul 9, 2023
78fdfb2
feat: improve model selector ui
Yidadaa Jul 9, 2023
1c069ca
fixup
Yidadaa Jul 9, 2023
b91af71
chore: suppress module not found warning
Yidadaa Jul 9, 2023
caf324e
fix: typos
yanCode Jul 10, 2023
bc7e188
Update tauri.conf.json
Yidadaa Jul 10, 2023
f17d090
Update common.ts
fyl080801 Jul 10, 2023
0ecb25d
chore(deps): bump react-router-dom from 6.10.0 to 6.14.1
dependabot[bot] Jul 10, 2023
03a92ee
chore(deps-dev): bump eslint from 8.37.0 to 8.44.0
dependabot[bot] Jul 10, 2023
3b63f2c
chore(deps-dev): bump @types/react from 18.2.12 to 18.2.14
dependabot[bot] Jul 10, 2023
fcfe333
chore(deps-dev): bump @tauri-apps/cli from 1.3.1 to 1.4.0
dependabot[bot] Jul 10, 2023
cf530ba
chore(deps): bump next from 13.4.6 to 13.4.9
dependabot[bot] Jul 10, 2023
15ea63e
dev: 增加模型设置项：是否启用注入全局 System Prompt 功能
imldy Jul 10, 2023
75b4870
fix: 修改是否应该注入System Prompt的判断规则为根据设置项
imldy Jul 10, 2023
dfcbb35
fix: 修改InjectSystemPrompts.SubTitle使其更符合系统行为
imldy Jul 10, 2023
b2b18dd
feat: 翻译InjectSystemPrompts配置项为其他语言
imldy Jul 10, 2023
aba20f5
fix: #2336 resending message should delete origional messages
Yidadaa Jul 10, 2023
232d7f0
feat: #2330 disable /list/models
Yidadaa Jul 10, 2023
817445c
fixup
Yidadaa Jul 10, 2023
8558e1b
Update common.ts
fyl080801 Jul 11, 2023
f754143
fix: migrated mask object key
imldy Jul 11, 2023
36cdc11
fix: sharegpt roles
Yidadaa Jul 12, 2023
2442117
chore(deps): bump semver from 6.3.0 to 6.3.1
dependabot[bot] Jul 13, 2023
f537c0d
feat: drag and drop in contextual prompts
yikayiyo Jul 14, 2023
19a2090
fixed openai base url if empty
MarkShawn2020 Jul 14, 2023
a04f07d
fixed react key
MarkShawn2020 Jul 14, 2023
dd14577
fix: enable `enableInjectSystemPrompts` attribute for old sessions
imldy Jul 14, 2023
19449da
dev: use current inject configuration
imldy Jul 14, 2023
12417c1
Update README.md
Yidadaa Jul 16, 2023
eec9025
feat: improve dnd icon
Yidadaa Jul 16, 2023
9f04ddb
fix: #2367 do not copy in async callback after sharing to ShareGPT
Yidadaa Jul 16, 2023
b5e2a11
feat: close #2376 add babel polyfill
Yidadaa Jul 16, 2023
5d783ef
feat: add typings for metadata
Lantianyou Jul 16, 2023
64fd7b9
feat: add type for import
Lantianyou Jul 16, 2023
f4496b3
Update mask.tsx
Yidadaa Jul 17, 2023
8f97d5a
Update home.tsx
Yidadaa Jul 17, 2023
b7ffa4f
Update tauri.conf.json
Yidadaa Jul 18, 2023
bac47c0
fix: useAccessStore filter spaces
Jul 18, 2023
6cc230e
feat: close #2445 switch to mit license
Yidadaa Jul 20, 2023
2335ec8
feat: close #2447 pre-fill key/code/url
Yidadaa Jul 20, 2023
c732967
feat: close #2449 edit / insert / delete messages modal
Yidadaa Jul 20, 2023
c2bdde4
Update tauri.conf.json
Yidadaa Jul 20, 2023
ad66e55
chore(deps-dev): bump @types/react-dom from 18.0.11 to 18.2.7
dependabot[bot] Jul 24, 2023
ccd2ebd
fix: #2393 try to fix chat list lag
Yidadaa Jul 25, 2023
e3ab670
fix(typo): ngnix -> nginx
fernandoxu Jul 26, 2023
15c68e7
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Jul 30, 2023
25cd861
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 1, 2023
faba2a3
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 2, 2023
f5f6180
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 3, 2023
4819aa9
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 4, 2023
32132c6
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 5, 2023
07a0a7d
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 9, 2023
d339ed2
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 10, 2023
3268eb5
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 11, 2023
46d131e
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 13, 2023
1dc9501
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 15, 2023
9665d26
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 16, 2023
e0287bd
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 17, 2023
795f62a
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 19, 2023
2d06be6
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 20, 2023
0edbce7
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 22, 2023
ea8c065
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 23, 2023
b22869f
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 24, 2023
313a618
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 25, 2023
9d5e178
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 27, 2023
5d6085b
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 28, 2023
8b46d98
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Aug 29, 2023
c8cdd0f
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 5, 2023
efaa960
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 8, 2023
4c93f4d
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 11, 2023
5f97edc
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 12, 2023
68695c5
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 13, 2023
824052a
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 14, 2023
7bef375
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 15, 2023
7858e87
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 16, 2023
7321585
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 19, 2023
9b252f0
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 20, 2023
cd3707d
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 21, 2023
817e24d
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 27, 2023
a0e6759
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Sep 28, 2023
2ce3f1b
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 8, 2023
0818838
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 10, 2023
91f93c8
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 11, 2023
8968e3c
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 12, 2023
e460f5f
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 13, 2023
2009293
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 16, 2023
5ec2d2d
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 17, 2023
79307a5
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 24, 2023
36473bf
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Oct 27, 2023
5e53224
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 8, 2023
1719f95
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 9, 2023
0899d13
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 10, 2023
ded5df2
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 11, 2023
9e5d9ae
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 12, 2023
462fa88
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 13, 2023
30a7212
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 14, 2023
bc2e270
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 15, 2023
ed4a18a
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 16, 2023
585c50e
config: exclude hkg1 from the deployment regions of the edge function
Eric-2369 Nov 16, 2023
33222a1
Update tauri.conf.json
Yidadaa Nov 17, 2023
68d3bf7
chore: update gh actions nodejs version to 18
Yidadaa Nov 17, 2023
d7fe8d4
config: disable ip forward in vercel json config
Yidadaa Nov 17, 2023
5eddef1
Update vercel.json
Yidadaa Nov 17, 2023
9db577b
Update vercel.json
Yidadaa Nov 17, 2023
71a0e2e
Translation of the application into Brazilian Portuguese
yuri-filipe Nov 18, 2023
dd95b72
Update vercel.json
Yidadaa Nov 18, 2023
779f802
feat: animate streaming response to make more smooth
Yidadaa Nov 19, 2023
b78b78d
feat: close #3301 enable or diable default models with -all / +all
Yidadaa Nov 19, 2023
7ab92e8
feat: close #3304 use `=` instead of `:` to map model name in CUSTOM_…
Yidadaa Nov 19, 2023
d99ab58
feat: close #3300 support multiple api keys
Yidadaa Nov 19, 2023
8025768
feat: better animation speed
Yidadaa Nov 19, 2023
17b4aaa
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 19, 2023
0480c0e
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 25, 2023
55d9e40
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 28, 2023
b00b458
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Nov 30, 2023
0111b33
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Dec 7, 2023
8929bc1
Merge branch 'main' of https://github.com/Yidadaa/ChatGPT-Next-Web
actions-user Dec 12, 2023
2bcce02
chore(deps): bump @babel/traverse from 7.21.3 to 7.23.2
dependabot[bot] Oct 18, 2023
6505254
fix: remove the content-encoding header
akira-cn Nov 10, 2023
040dcfb
fix: remove the content-encoding header
akira-cn Nov 10, 2023
3a753e6
ci: add .dockerignore to exclude env files
KevenLi8888 Dec 12, 2023
de067ba
Update emoji.tsx
Yidadaa Dec 15, 2023
e332569
Update README_CN.md
Yidadaa Dec 15, 2023
018f7a3
fix sync.yml
MCheping8108 Dec 15, 2023
6e621d8
Update README.md
RoboticsAndCloud Dec 18, 2023
3800838
chore(deps): bump @hello-pangea/dnd from 16.3.0 to 16.5.0
dependabot[bot] Dec 18, 2023
b586f90
chore(deps-dev): bump @tauri-apps/cli from 1.4.0 to 1.5.8
dependabot[bot] Dec 18, 2023
d21cdb2
chore(deps): bump fuse.js from 6.6.2 to 7.0.0
dependabot[bot] Dec 18, 2023
cdd4f5d
Update api.ts to set proper header "Accept"
Rocky0102 Dec 18, 2023
d9ea556
Update README.md
RoboticsAndCloud Dec 19, 2023
6ab362e
Update README.md
pdx-xf Dec 20, 2023
063439a
Update README.md
pdx-xf Dec 20, 2023
e87b900
docs: Add deploy to Zeabur button in README
MichaelYuhe Dec 22, 2023
d320f65
docs: Add deploy to Zeabur button in REAME for Chinese
MichaelYuhe Dec 22, 2023
2a03694
refactor: update product name
fredliang44 Dec 23, 2023
06aab92
chore: append previous name
fredliang44 Dec 23, 2023
add779c
chore: resolve conflict
fredliang44 Dec 23, 2023
59db687
fix: fix llm models field
fredliang44 Dec 23, 2023
3c08351
fix: fix type errors
fredliang44 Dec 23, 2023
5a94669
fix: fix add api auth
fredliang44 Dec 23, 2023
66afc52
feat: support set api key from client side
fredliang44 Dec 23, 2023
9f43dd4
fix: fix server token fetch policy
fredliang44 Dec 23, 2023
43b1f46
chroe: update model name
fredliang44 Dec 23, 2023
275dceb
chroe: update prompts
fredliang44 Dec 23, 2023
de26372
chroe: support error reason for gemini pro
fredliang44 Dec 23, 2023
a0c49d7
feat: support custom gemini pro params
fredliang44 Dec 24, 2023
7d9144f
chore: remove openai log from google api handler
fredliang44 Dec 24, 2023
5b153b8
chore: update README for google gemini pro model
fredliang44 Dec 24, 2023
8683938
chore: update docs for gemini pro
fredliang44 Dec 24, 2023
02a6fe6
Fix & Feat [Auth] Api Key Variable
H0llyW00dzZ Dec 24, 2023
c265a8a
Feat [Server Side] Google Api Configuration
H0llyW00dzZ Dec 24, 2023
2f4a21f
Fix [TypesScript] [LLM Api] Chaining Model
H0llyW00dzZ Dec 24, 2023
9b4ba1b
Refactor [Model] [LLM Api] Chaining Model
H0llyW00dzZ Dec 24, 2023
2755550
Revert "Fix [TypesScript] [LLM Api] Chaining Model"
H0llyW00dzZ Dec 24, 2023
85cf0c5
chore: update how to identify google model
fredliang44 Dec 24, 2023
19b570c
fix: fix issue https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web/iss…
fredliang44 Dec 24, 2023
e4e9bbe
chore: remove console log
fredliang44 Dec 24, 2023
8b137b6
chore: auto concat messages
fredliang44 Dec 24, 2023
4b4f5ca
fix: fix using different model
fredliang44 Dec 24, 2023
0fce7fc
fix: fix removing bearer header
fredliang44 Dec 24, 2023
fc4e6c4
fix: return bearer header when using openai
fredliang44 Dec 25, 2023
badc2fc
chore: update auth value logic (#3630)
fredliang44 Dec 25, 2023
7d3bc60
Fix [UI/UX] [Emoji] emoji URL (#3647)
H0llyW00dzZ Dec 25, 2023
fe2910e
Update Web App link in README.md
Dec 26, 2023
c4ecffd
Update CN web app link in README.md
Dec 26, 2023
88e6806
Chore [Package] Downgrade Tauri Builder Version (#3656)
H0llyW00dzZ Dec 27, 2023
2292fd6
Release 2.10.1: Support Google Gemini Pro model (#3668)
fredliang44 Dec 27, 2023
6c8e534
chore(docs): update readme for Gemini Pro (#3685)
fredliang44 Dec 28, 2023
a34607c
feat: support vercel speed insight (#3686)
fredliang44 Dec 28, 2023
9613a22
Non -GPT model disable system prompt (#3684)
reece00 Dec 28, 2023
91b656d
feat: support streaming for Gemini Pro (#3688)
fredliang44 Dec 28, 2023
e66f50a
update readme (#3715)
tashviks Dec 30, 2023
13dc11b
feat: update new logo & cover image (#3716)
fredliang44 Dec 31, 2023
1a00f76
fix: update google url description (#3719)
fredliang44 Dec 31, 2023
e154a93
fix: fix gemini pro streaming api duplicated issue (#3721)
fredliang44 Dec 31, 2023
ab004d7
chore: low the google safety setting to avoid unexpected blocking
fredliang44 Dec 31, 2023
fe24bdb
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 3, 2024
ee4c776
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 6, 2024
f01e19d
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 11, 2024
6633add
Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…
actions-user Jan 23, 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

These merge commits were added into this branch cleanly.

There are no new changes to show.