 朱浩
|
415a4c17c1
|
Merge pull request 'zhuhao_dev' (#61) from zhuhao_dev into main
Reviewed-on: #61
|
2024-07-25 09:20:57 +08:00 |
|
朱浩
|
88e306e8a2
|
Merge branch 'main' into zhuhao_dev
|
2024-07-25 09:19:56 +08:00 |
|
朱浩
|
e5c55cefda
|
二期：文件上传图标修复
|
2024-07-25 09:19:43 +08:00 |
 lyc
|
78e666d6c1
|
Merge pull request 'lyc-dev' (#60) from lyc-dev into main
|
2024-07-25 09:15:03 +08:00 |
|
lyc
|
580ab2ee5b
|
Merge branch 'main' into lyc-dev
|
2024-07-25 09:14:35 +08:00 |
|
lyc
|
cda6e3e2c4
|
edit
|
2024-07-25 09:12:52 +08:00 |
|
lyc
|
75595562db
|
Merge pull request 'lyc-dev' (#59) from lyc-dev into main
|
2024-07-24 15:27:57 +08:00 |
|
lyc
|
ea5a069f85
|
Merge branch 'main' into lyc-dev
|
2024-07-24 15:24:03 +08:00 |
|
lyc
|
bf9e7c96ff
|
平台资源管理员
|
2024-07-24 15:23:26 +08:00 |
|
朱浩
|
d0bf9c0768
|
Merge pull request 'zhuhao_dev' (#58) from zhuhao_dev into main
Reviewed-on: #58
|
2024-07-24 14:49:32 +08:00 |
|
朱浩
|
eff5688e42
|
Merge branch 'main' into zhuhao_dev
|
2024-07-24 14:48:36 +08:00 |
|
朱浩
|
4e9c93da15
|
二期：头像相关问题修复
|
2024-07-24 14:48:18 +08:00 |
|
lyc
|
e6da6ef65f
|
打开外部链接
|
2024-07-24 14:03:59 +08:00 |
|
lyc
|
a618032d25
|
Merge branch 'main' into lyc-dev
|
2024-07-23 16:04:16 +08:00 |
|
朱浩
|
a25be335e6
|
Merge pull request 'zhuhao_dev' (#57) from zhuhao_dev into main
Reviewed-on: #57
|
2024-07-23 16:02:27 +08:00 |
|
朱浩
|
62248dfafa
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-07-23 16:01:53 +08:00 |
|
朱浩
|
2926b4bd63
|
二期：自动同步功能开发
|
2024-07-23 15:59:52 +08:00 |
|
lyc
|
ac5cafe1e8
|
Merge branch 'main' into lyc-dev
|
2024-07-23 14:33:18 +08:00 |
|
lyc
|
0086ce4236
|
open win cookie
|
2024-07-23 14:33:07 +08:00 |
|
朱浩
|
af941a22b7
|
Merge pull request '二期：自动同步功能开发' (#56) from zhuhao_dev into main
Reviewed-on: #56
|
2024-07-23 14:32:01 +08:00 |
|
朱浩
|
4dc180a26f
|
二期：自动同步功能开发
|
2024-07-23 14:31:33 +08:00 |
|
lyc
|
3487cabc02
|
Merge pull request 'lyc-dev' (#55) from lyc-dev into main
|
2024-07-23 14:08:22 +08:00 |
|
lyc
|
5712e77a29
|
openwindow
|
2024-07-23 14:08:00 +08:00 |
|
朱浩
|
7106d75964
|
Merge pull request '二期：自动同步功能开发' (#54) from zhuhao_dev into main
Reviewed-on: #54
|
2024-07-23 14:07:13 +08:00 |
|
朱浩
|
4c635e9fe3
|
二期：自动同步功能开发
|
2024-07-23 14:06:42 +08:00 |
|
lyc
|
4a5fb04362
|
Merge branch 'main' into lyc-dev
|
2024-07-23 13:46:32 +08:00 |
|
lyc
|
d91f08d398
|
布置作业
|
2024-07-23 13:46:09 +08:00 |
|
朱浩
|
5afa31b8c3
|
Merge pull request 'zhuhao_dev' (#53) from zhuhao_dev into main
Reviewed-on: #53
|
2024-07-23 13:45:27 +08:00 |
|
朱浩
|
c8f1047124
|
Merge branch 'main' into zhuhao_dev
# Conflicts:
# src/renderer/src/views/prepare/index.vue
|
2024-07-23 13:44:44 +08:00 |
|
朱浩
|
e1fc883870
|
二期：自动同步功能开发
|
2024-07-23 13:43:41 +08:00 |
|
lyc
|
c81b74b9de
|
Merge pull request 'lyc-dev' (#52) from lyc-dev into main
|
2024-07-23 10:23:45 +08:00 |
|
lyc
|
2fbc3e272b
|
Merge branch 'main' into lyc-dev
|
2024-07-23 10:23:34 +08:00 |
|
lyc
|
125962b859
|
备课-增加头部布局
|
2024-07-23 10:23:18 +08:00 |
|
lyc
|
5f05ad8bea
|
Merge pull request '打开新网页窗口' (#51) from lyc-dev into main
|
2024-07-22 16:25:13 +08:00 |
|
lyc
|
3dc478e724
|
打开新网页窗口
|
2024-07-22 16:24:32 +08:00 |
|
lyc
|
d72d0ae956
|
Merge pull request '登录窗口/主窗口调整' (#50) from lyc-dev into main
|
2024-07-22 15:11:06 +08:00 |
|
lyc
|
cefb6ae5a7
|
登录窗口/主窗口调整
|
2024-07-22 15:10:28 +08:00 |
|
lyc
|
7b09c8ec81
|
Merge pull request 'window-tools' (#49) from lyc-dev into main
|
2024-07-22 11:25:26 +08:00 |
|
lyc
|
de1e0c5a2e
|
window-tools
|
2024-07-22 11:24:36 +08:00 |
|
lyc
|
8ed27fc925
|
Merge pull request '退出 跳转' (#48) from lyc-dev into main
|
2024-07-19 11:10:12 +08:00 |
|
lyc
|
e5e4359b5d
|
退出 跳转
|
2024-07-19 11:09:55 +08:00 |
|
lyc
|
1ce8fd1714
|
Merge pull request '请求地址修改' (#47) from lyc-dev into main
|
2024-07-19 10:31:59 +08:00 |
|
lyc
|
6dbe3c6202
|
请求地址修改
|
2024-07-19 10:31:41 +08:00 |
|
lyc
|
78b30feb13
|
Merge pull request '删除一些无用图片' (#46) from lyc-dev into main
|
2024-07-19 09:37:57 +08:00 |
|
lyc
|
b16f067cee
|
删除一些无用图片
|
2024-07-19 09:33:52 +08:00 |
|
lyc
|
0228bc3084
|
Merge pull request 'lyc-dev' (#44) from lyc-dev into main
|
2024-07-18 17:54:03 +08:00 |
|
lyc
|
be0a34f03e
|
edit
|
2024-07-18 17:53:43 +08:00 |
|
朱浩
|
d5c1d08fa2
|
Merge pull request '基础文件上传核心开发' (#45) from zhuhao_dev into main
Reviewed-on: #45
|
2024-07-18 16:38:14 +08:00 |
|
朱浩
|
21ff546429
|
基础文件上传核心开发
|
2024-07-18 16:37:46 +08:00 |
|
lyc
|
7d80846e0c
|
Merge branch 'main' into lyc-dev
|
2024-07-18 16:33:21 +08:00 |