Commit Graph

2067 Commits

Author SHA1 Message Date
sijinhui
7acc2d5e28 little fix 2024-03-28 19:53:21 +08:00
sijinhui
ad0a2d2016 little fix 2024-03-28 19:52:50 +08:00
sijinhui
496a3f32eb build error 2024-03-28 19:34:05 +08:00
sijinhui
868cf96cc8 修复语音识别小bug 2024-03-28 19:25:51 +08:00
sijinhui
24eb62f5e9 temp 2024-03-28 18:07:21 +08:00
sijinhui
e6912f5be8 Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	app/api/common.ts
2024-03-28 16:07:23 +08:00
sijinhui
f2fe5ad4c1 修复语音的token获取问题 2024-03-28 15:27:32 +08:00
DeanYao
e38b527ac2
Merge pull request #3205 from H0llyW00dzZ/summarizelogic
Refactor Summarize Logic
2024-03-28 15:19:32 +08:00
sijinhui
eb7a09c6f0 修复语音的token获取问题 2024-03-28 15:14:10 +08:00
DeanYao
113d9612db
Merge pull request #3280 from surkaa/patch-1
Update .env.template 更正单词
2024-03-28 13:40:17 +08:00
DeanYao
6b3daec23f
Merge pull request #3314 from H0llyW00dzZ/text-moderation-azure
Feat ChatGPT LLM Api [Console Log] [Text Moderation] [Azure]
2024-03-28 13:38:56 +08:00
DeanYao
e056a1d46d
Merge pull request #3405 from Yuliang-Lee/fix/MessageSelectorWarning
fix: MessageSelectorWarning
2024-03-28 11:38:45 +08:00
DeanYao
57026f6262
Merge pull request #3424 from H0llyW00dzZ/serverrside
Refactor Api Common [Server Side] [Console Log]
2024-03-28 11:29:48 +08:00
DeanYao
8ef77f50c3
Merge branch 'main' into serverrside 2024-03-28 11:20:52 +08:00
DeanYao
93e21515e5
Merge pull request #4408 from hmhuming/main
fix docker
2024-03-28 10:28:11 +08:00
hmhuming
24caa3b97b Merge branch 'main' of https://github.com/hmhuming/ChatGPT-Next-Web 2024-03-28 09:18:51 +08:00
sijinhui
f4652d1fed 修复配置文件导致打包错误 2024-03-28 00:56:07 +08:00
sijinhui
bc948b4248
Merge pull request #38 from sijinhui/voice
Voice
2024-03-28 00:52:56 +08:00
sijinhui
8513c459b1 增加语音功能 2024-03-28 00:51:45 +08:00
sijinhui
8620df325d 增加语音输入 2024-03-28 00:48:40 +08:00
sijinhui
7ffabb77f9 test 2024-03-27 20:03:13 +08:00
DeanYao
c93b36fe79
Merge pull request #3508 from reece00/Mask-language
The language filtering option of the mask is stored
2024-03-27 19:58:30 +08:00
DeanYao
0de9242a26
Merge pull request #3529 from erich2s/chat-item-selected-border
fix(chat-item): selected ChatItem showing border in other pages
2024-03-27 19:00:16 +08:00
hmhuming
53fb52c6c0 fix docker 2024-03-27 17:58:55 +08:00
DeanYao
afaa529ba6
Merge pull request #3870 from Dup4/fix-webdav-check
fix: webdav check httpcode list
2024-03-27 14:04:15 +08:00
sijinhui
ab42aaa563 merge 2024-03-27 11:21:44 +08:00
sijinhui
0b24508e3e Merge remote-tracking branch 'upstream/main'
# Conflicts:
#	.dockerignore
#	package.json
#	yarn.lock
2024-03-27 11:08:52 +08:00
sijinhui
417f2d19fb
Merge pull request #37 from sijinhui/users
用户信息api添加管理员授权
2024-03-27 00:03:45 +08:00
sijinhui
72d1330fc2 用户信息api添加管理员授权 2024-03-27 00:02:50 +08:00
sijinhui
016a68b69b
Merge pull request #36 from sijinhui/users
用户管理表初步成型
2024-03-26 23:26:10 +08:00
sijinhui
45fa760db1 用户管理表初步成型 2024-03-26 23:23:03 +08:00
sijinhui
c8b6c31357 暂存 2024-03-26 21:18:43 +08:00
DeanYao
43824bd621
Merge pull request #4193 from MrrDrr/env_bug_fix
Update README.md
2024-03-26 17:53:57 +08:00
DeanYao
3c97a4f5a1
Merge pull request #4091 from H0llyW00dzZ/docker-ignore
Update Docker Ignore
2024-03-26 17:44:52 +08:00
DeanYao
711bf190d4
Merge pull request #4264 from ChatGPTNextWeb/dependabot/npm_and_yarn/tauri-apps/cli-1.5.11
chore(deps-dev): bump @tauri-apps/cli from 1.5.7 to 1.5.11
2024-03-26 17:32:01 +08:00
DeanYao
1049006cf9
Merge pull request #4366 from Essmatiko123/dependabot/npm_and_yarn/eslint-plugin-prettier-5.1.3
chore(deps-dev): bump eslint-plugin-prettier from 4.2.1 to 5.1.3
2024-03-26 13:57:50 +08:00
dependabot[bot]
76603d108d
chore(deps-dev): bump @tauri-apps/cli from 1.5.7 to 1.5.11
Bumps [@tauri-apps/cli](https://github.com/tauri-apps/tauri) from 1.5.7 to 1.5.11.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.5.7...@tauri-apps/cli-v1.5.11)

---
updated-dependencies:
- dependency-name: "@tauri-apps/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-26 05:42:55 +00:00
DeanYao
5bc3930230
Merge pull request #4389 from ChatGPTNextWeb/dependabot/npm_and_yarn/types/react-18.2.70
chore(deps-dev): bump @types/react from 18.2.14 to 18.2.70
2024-03-26 13:41:13 +08:00
DeanYao
e5edd851b3
Merge pull request #4390 from ChatGPTNextWeb/dependabot/npm_and_yarn/emoji-picker-react-4.9.2
chore(deps): bump emoji-picker-react from 4.5.15 to 4.9.2
2024-03-26 13:35:03 +08:00
dependabot[bot]
dcad400758
chore(deps-dev): bump @types/react from 18.2.14 to 18.2.70
Bumps [@types/react](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react) from 18.2.14 to 18.2.70.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react)

---
updated-dependencies:
- dependency-name: "@types/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-26 05:26:51 +00:00
DeanYao
a1aaea9c55
Merge pull request #4391 from ChatGPTNextWeb/dependabot/npm_and_yarn/types/node-20.11.30
chore(deps-dev): bump @types/node from 20.9.0 to 20.11.30
2024-03-26 13:24:24 +08:00
sijinhui
32ab9af2a2
Merge pull request #35 from sijinhui/users
Users
2024-03-26 10:00:57 +08:00
sijinhui
f91f4085bc 用户管理页面优化 2024-03-26 10:00:06 +08:00
sijinhui
532ace669e 用户管理页面优化 2024-03-26 08:56:42 +08:00
sijinhui
7c9c7f511c
Merge pull request #34 from sijinhui/users
添加用户管理页面
2024-03-26 00:35:37 +08:00
sijinhui
aa8859b186 添加用户管理页 2024-03-26 00:34:03 +08:00
sijinhui
fc351f8734 添加用户管理页 2024-03-26 00:32:46 +08:00
DeanYao
a4e4286e04
Merge pull request #4186 from MrrDrr/formula_rendering
support \(...\) and \[...\] style math formula
2024-03-25 19:55:57 +08:00
dependabot[bot]
6dd7a6a171
chore(deps-dev): bump @types/node from 20.9.0 to 20.11.30
Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.9.0 to 20.11.30.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-25 10:47:55 +00:00
dependabot[bot]
8e554a87b0
chore(deps): bump emoji-picker-react from 4.5.15 to 4.9.2
Bumps [emoji-picker-react](https://github.com/ealush/emoji-picker-react) from 4.5.15 to 4.9.2.
- [Release notes](https://github.com/ealush/emoji-picker-react/releases)
- [Commits](https://github.com/ealush/emoji-picker-react/commits)

---
updated-dependencies:
- dependency-name: emoji-picker-react
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-03-25 10:46:24 +00:00