ChatGPT-Next-Web/app
sijinhui a70f984b0f Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/auth.ts
#	app/api/common.ts
#	app/azure.ts
#	app/client/api.ts
#	app/client/platforms/openai.ts
#	app/components/chat.tsx
#	app/components/settings.tsx
#	app/constant.ts
#	app/layout.tsx
#	app/masks/index.ts
#	app/store/chat.ts
#	app/store/config.ts
#	app/utils/hooks.ts
#	app/utils/model.ts
#	package.json
#	yarn.lock
2024-07-11 10:58:00 +08:00
..
api Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
app 微调样式 2024-05-26 13:17:35 +08:00
client Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
components Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
config Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
icons add claude icon 2024-06-24 23:41:46 +08:00
locales Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
masks Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
store Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
styles 微调样式 2024-05-26 13:17:35 +08:00
utils Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
azure.ts Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
command.ts feat: close #2447 pre-fill key/code/url 2023-07-20 23:17:58 +08:00
constant.ts Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
global.d.ts Merge remote-tracking branch 'upstream/main' into dev 2024-03-09 11:45:30 +08:00
layout.tsx Merge remote-tracking branch 'upstream/main' 2024-07-11 10:58:00 +08:00
page.tsx fix debug 2024-04-07 22:26:18 +08:00
polyfill.ts fix: #397 #373 Array.prototype.at polyfill errors 2023-04-03 13:29:37 +08:00
providers.tsx init 2023-12-16 23:05:14 +08:00
typing.ts feat: dev done 2024-04-07 11:32:57 +08:00
utils.ts merge 2024-05-17 10:22:36 +08:00