Commit Graph

2034 Commits

Author SHA1 Message Date
sijinhui
7ffabb77f9 test 2024-03-27 20:03:13 +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
sijinhui
d6b5c86e84 Merge remote-tracking branch 'origin/main' into users 2024-03-24 19:01:56 +08:00
sijinhui
79aa8c1065 暂存 2024-03-24 18:50:36 +08:00
sijinhui
bf6528ce30
Merge branch 'ChatGPTNextWeb:main' into main 2024-03-24 17:30:40 +08:00
fred-bf
f1b4c083a4
Merge pull request #4379 from EasonQwQ/main
Fix: Handle empty server response in API call
2024-03-24 14:18:14 +08:00
fred-bf
90af4e3b77
Merge pull request #4381 from ChatGPTNextWeb/fred-bf-patch-3
patch: disable webdav redirect
2024-03-24 14:17:11 +08:00
fred-bf
e8d76a513d
patch: disable webdav redirect 2024-03-24 14:15:04 +08:00
kidv
29e03b88c7 Fix: Handle empty server response in API call 2024-03-24 04:07:25 +08:00
sijinhui
d534c4422d 修复地图对齐问题 2024-03-22 18:49:14 +08:00
sijinhui
054d3b78e0 测试增加邮件认证-修复 2024-03-22 17:01:20 +08:00
sijinhui
c536ea7d48
Merge pull request #33 from sijinhui/dev
Dev
2024-03-22 16:55:01 +08:00
sijinhui
5dd6f713c5 测试增加邮件认证-修复 2024-03-22 16:53:37 +08:00
sijinhui
cf930bcb9a Merge remote-tracking branch 'upstream/main' into dev 2024-03-22 16:53:17 +08:00
sijinhui
223c6980d0 测试增加邮件认证-debug-3 2024-03-22 16:40:19 +08:00
sijinhui
f2a0a34f0d 测试增加邮件认证-debug-2 2024-03-22 16:19:41 +08:00
sijinhui
e692b34093 测试增加邮件认证-debug 2024-03-22 15:55:23 +08:00
sijinhui
f34375f13b 测试增加邮件认证-debug 2024-03-22 15:38:00 +08:00
sijinhui
c84e223ca5 测试增加邮件认证 2024-03-22 14:49:10 +08:00
sijinhui
8efbed2c28 优化地图加载报错问题 2024-03-22 10:45:02 +08:00
fred-bf
ebbd870150
Merge pull request #4353 from H0llyW00dzZ/cherry-pick-webdav
[Cherry Pick] Fix Webdav Syncing Issues
2024-03-21 18:56:26 +08:00
sijinhui
202cb7b947 修复小警告 2024-03-21 14:10:02 +08:00
sijinhui
b8d8b8353f 图表增加了适配窗口大小 2024-03-21 14:07:42 +08:00
sijinhui
c1a37cdf53
Merge pull request #32 from sijinhui/clean
优化导入组件
2024-03-21 12:00:05 +08:00
sijinhui
3207168877 优化导入组件 2024-03-21 11:42:07 +08:00
sijinhui
f3faa17f9d
Merge branch 'ChatGPTNextWeb:main' into main 2024-03-20 22:52:09 +08:00