Commit Graph

1642 Commits

Author SHA1 Message Date
sijinhui
eec5418e14 修复tiktoken计算插件打包错误 2023-12-27 22:17:12 +08:00
sijinhui
4383fbc1ef
Merge pull request #3 from sijinhui/dev
修复token查询
2023-12-23 00:14:16 +08:00
sijinhui
3b5d6e089a 修复当前时间查询 2023-12-23 00:12:55 +08:00
sijinhui
b064e16278 优化token计数 2023-12-22 23:18:19 +08:00
sijinhui
07c48ef7fd 加强不可用模型过滤 2023-12-22 21:20:30 +08:00
sijinhui
36d993cc5a 禁用gpt-all 2023-12-22 20:59:07 +08:00
sijinhui
04f20c8cb3
Merge pull request #2 from sijinhui/testcharts
使用echarts显示图表
2023-12-22 16:54:30 +08:00
sijinhui
1227fb1882 替换使用echarts显示图表 2023-12-22 16:53:06 +08:00
sijinhui
d5e05adbe4 解决图表数据传递问题 2023-12-22 16:11:37 +08:00
sijinhui
cca33ae16f 解决图表显示问题 2023-12-22 13:46:40 +08:00
sijinhui
c1ba0be98b 优化布局 2023-12-21 22:49:36 +08:00
sijinhui
e31bb1fcff init 2023-12-21 22:22:31 +08:00
sijinhui
26302aeed6
Merge pull request #1 from sijinhui/dev
添加一个管理页面
2023-12-20 13:53:12 +08:00
sijinhui
bc30d24b4b 修复构建错误 2023-12-20 13:48:52 +08:00
sijinhui
135ded15bf 更新 2023-12-20 13:39:54 +08:00
sijinhui
551ed5f207 Merge remote-tracking branch 'upstream/main' into dev
# Conflicts:
#	package.json
#	yarn.lock
2023-12-20 13:36:58 +08:00
sijinhui
d37e5fb4ac 尝试增加管理页面 2023-12-20 13:33:11 +08:00
sijinhui
ec3c324ef2 还有遗留bug 2023-12-19 23:44:20 +08:00
sijinhui
8d83e8ad16 尝试增加管理页面 2023-12-19 19:03:35 +08:00
Yifei Zhang
ed88619623
Merge pull request #3565 from ChatGPTNextWeb/dependabot/npm_and_yarn/hello-pangea/dnd-16.5.0
chore(deps): bump @hello-pangea/dnd from 16.3.0 to 16.5.0
2023-12-19 15:33:28 +08:00
Yifei Zhang
37b8922348
Merge pull request #3566 from ChatGPTNextWeb/dependabot/npm_and_yarn/tauri-apps/cli-1.5.8
chore(deps-dev): bump @tauri-apps/cli from 1.4.0 to 1.5.8
2023-12-19 15:33:19 +08:00
Yifei Zhang
4a23a0064b
Merge pull request #3567 from ChatGPTNextWeb/dependabot/npm_and_yarn/fuse.js-7.0.0
chore(deps): bump fuse.js from 6.6.2 to 7.0.0
2023-12-19 15:33:10 +08:00
Yifei Zhang
e012b1e5d1
Merge pull request #3061 from ChatGPTNextWeb/dependabot/npm_and_yarn/babel/traverse-7.23.2
chore(deps): bump @babel/traverse from 7.21.3 to 7.23.2
2023-12-19 15:32:55 +08:00
GH Action - Upstream Sync
78ed4f1cbb Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web 2023-12-19 00:37:11 +00:00
dependabot[bot]
4b7139d9ae
chore(deps): bump fuse.js from 6.6.2 to 7.0.0
Bumps [fuse.js](https://github.com/krisk/Fuse) from 6.6.2 to 7.0.0.
- [Release notes](https://github.com/krisk/Fuse/releases)
- [Changelog](https://github.com/krisk/Fuse/blob/main/CHANGELOG.md)
- [Commits](https://github.com/krisk/Fuse/compare/v6.6.2...v7.0.0)

---
updated-dependencies:
- dependency-name: fuse.js
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-18 10:30:29 +00:00
dependabot[bot]
1f35624121
chore(deps-dev): bump @tauri-apps/cli from 1.4.0 to 1.5.8
Bumps [@tauri-apps/cli](https://github.com/tauri-apps/tauri) from 1.4.0 to 1.5.8.
- [Release notes](https://github.com/tauri-apps/tauri/releases)
- [Commits](https://github.com/tauri-apps/tauri/compare/@tauri-apps/cli-v1.4.0...@tauri-apps/cli-v1.5.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-18 10:30:04 +00:00
dependabot[bot]
860c5b8f20
chore(deps): bump @hello-pangea/dnd from 16.3.0 to 16.5.0
Bumps [@hello-pangea/dnd](https://github.com/hello-pangea/dnd) from 16.3.0 to 16.5.0.
- [Release notes](https://github.com/hello-pangea/dnd/releases)
- [Changelog](https://github.com/hello-pangea/dnd/blob/main/CHANGELOG.md)
- [Commits](https://github.com/hello-pangea/dnd/compare/v16.3.0...v16.5.0)

---
updated-dependencies:
- dependency-name: "@hello-pangea/dnd"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-18 10:29:13 +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
sijinhui
fba3d7c8c2 修复部署 2023-12-18 13:47:50 +08:00
sijinhui
c4ca90a924
Merge branch 'ChatGPTNextWeb:main' into main 2023-12-18 11:56:47 +08: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
sijinhui
b43c0b0109 init 2023-12-16 23:05:14 +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
Yifei Zhang
cae4655785
Update tauri.conf.json 2023-12-11 15:59:37 +08:00
Yifei Zhang
28c12606a4
Merge pull request #3455 from H0llyW00dzZ/trimtopic 2023-12-06 18:58:38 +08: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
Yifei Zhang
cf50299b14
Update README_CN.md 2023-11-29 11:39:21 +08: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