 JOSEPH LE
|
1f4eec2165
|
update roll user management
|
2024-09-24 07:50:55 +07:00 |
dbdbd9
|
81f633cde7
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-24 07:36:51 +07:00 |
|
joseph
|
6aff6093a6
|
Merge pull request 'master' (#81) from master into dev
Reviewed-on: #81
|
2024-09-24 10:36:02 +10:00 |
|
joseph
|
7cd728be5a
|
Merge pull request 'Sprint-4/MS-36-FE-Technical' (#80) from Sprint-4/MS-36-FE-Technical into master
Reviewed-on: #80
|
2024-09-24 10:35:38 +10:00 |
|
dbdbd9
|
ff86cc34cc
|
Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-23 07:55:09 +07:00 |
|
dbdbd9
|
235dce3800
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-23 07:31:20 +07:00 |
|
joseph
|
0e1d1d9d64
|
Merge pull request 'master' (#79) from master into dev
Reviewed-on: #79
|
2024-09-21 14:29:47 +10:00 |
|
dbdbd9
|
555934ac5c
|
Technical: fix ui profile technical
|
2024-09-21 11:29:37 +07:00 |
|
joseph
|
bf39d05010
|
Merge pull request 'Technical: fix ui add technical, api Evaluation/Technical' (#78) from Sprint-4/MS-36-FE-Technical into master
Reviewed-on: #78
|
2024-09-21 14:29:29 +10:00 |
|
dbdbd9
|
738645c787
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-21 11:29:07 +07:00 |
 vincent.vo
|
ff5e31ee94
|
Merge pull request 'master' (#77) from master into dev
Reviewed-on: #77
|
2024-09-21 14:21:53 +10:00 |
|
vincent.vo
|
ffe51046b6
|
Merge pull request 'fix error' (#76) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #76
|
2024-09-21 14:21:37 +10:00 |
Truong Vo
|
db90658482
|
fix error
|
2024-09-21 11:21:13 +07:00 |
|
dbdbd9
|
96587e7f4d
|
Technical: fix ui add technical, api Evaluation/Technical
|
2024-09-21 11:19:42 +07:00 |
|
joseph
|
0db0ddb48b
|
Merge pull request 'master' (#75) from master into dev
Reviewed-on: #75
|
2024-09-21 13:50:59 +10:00 |
|
joseph
|
73f762b822
|
Merge pull request 'update cache and UI' (#74) from joseph.update_navbar_permissions into master
Reviewed-on: #74
|
2024-09-21 13:50:39 +10:00 |
|
JOSEPH LE
|
7622e7a95b
|
update cache and UI
|
2024-09-21 10:50:03 +07:00 |
|
vincent.vo
|
a7f75c686b
|
Merge pull request 'Bổ sung view badge cho nội dung level' (#73) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #73
|
2024-09-21 13:46:35 +10:00 |
|
Truong Vo
|
323a5b0df6
|
Merge branch 'master' into Sprint-4/MS-37-FE-Evaluation
|
2024-09-21 10:46:18 +07:00 |
|
Truong Vo
|
9d0dd9bbab
|
Bổ sung view badge cho nội dung level
|
2024-09-21 10:46:03 +07:00 |
|
joseph
|
fd4ed6fa8d
|
Merge pull request 'master' (#72) from master into dev
Reviewed-on: #72
|
2024-09-21 13:40:40 +10:00 |
|
joseph
|
d2f5273703
|
Merge pull request 'Sprint-4/MS-36-FE-Technical' (#71) from Sprint-4/MS-36-FE-Technical into master
Reviewed-on: #71
|
2024-09-21 13:40:20 +10:00 |
|
dbdbd9
|
4f918de659
|
Technical: fix confict
|
2024-09-21 10:38:51 +07:00 |
|
dbdbd9
|
3a9123a114
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-21 10:38:19 +07:00 |
|
joseph
|
7afe034606
|
Merge pull request 'deploy to dev server' (#70) from master into dev
Reviewed-on: #70
|
2024-09-21 13:35:40 +10:00 |
|
joseph
|
67516faa3d
|
Merge pull request 'Sprint-4/MS-36-FE-Technical' (#63) from Sprint-4/MS-36-FE-Technical into master
Reviewed-on: #63
|
2024-09-21 13:35:10 +10:00 |
|
dbdbd9
|
db60dd1a83
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-21 10:32:55 +07:00 |
|
vincent.vo
|
9b9b615d1d
|
Merge pull request 'master' (#69) from master into dev
Reviewed-on: #69
|
2024-09-21 13:32:23 +10:00 |
|
vincent.vo
|
33a7bce4fd
|
Merge pull request 'Hiệu chỉnh format cột bảng dữ liệu export' (#68) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #68
|
2024-09-21 13:32:11 +10:00 |
|
Truong Vo
|
f38e19f1d7
|
Hiệu chỉnh format cột bảng dữ liệu export
|
2024-09-21 10:31:57 +07:00 |
|
dbdbd9
|
edb873f1f1
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-21 10:29:01 +07:00 |
|
vincent.vo
|
e6aa179bcc
|
Merge pull request 'master' (#67) from master into dev
Reviewed-on: #67
|
2024-09-21 13:28:39 +10:00 |
|
vincent.vo
|
033599402e
|
Merge pull request 'Hiệu chỉnh format cột bảng dữ liệu export' (#66) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #66
|
2024-09-21 13:28:23 +10:00 |
|
Truong Vo
|
2e3cf4702c
|
Hiệu chỉnh format cột bảng dữ liệu export
|
2024-09-21 10:28:09 +07:00 |
|
vincent.vo
|
abb79653e4
|
Merge pull request 'master' (#65) from master into dev
Reviewed-on: #65
|
2024-09-21 13:24:55 +10:00 |
|
vincent.vo
|
2e9a1af501
|
Merge pull request 'Hiệu chỉnh format cột bảng dữ liệu export' (#64) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #64
|
2024-09-21 13:24:39 +10:00 |
|
Truong Vo
|
eb68634582
|
Hiệu chỉnh format cột bảng dữ liệu export
|
2024-09-21 10:24:20 +07:00 |
|
dbdbd9
|
4d520a664d
|
Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical
|
2024-09-21 10:19:12 +07:00 |
|
dbdbd9
|
bb40261a0d
|
Technical: add Profile page, Organization Settings page
|
2024-09-21 10:19:04 +07:00 |
|
vincent.vo
|
8325e90081
|
Merge pull request 'master' (#62) from master into dev
Reviewed-on: #62
|
2024-09-21 13:14:07 +10:00 |
|
vincent.vo
|
d69150254e
|
Merge pull request 'Hiệu chỉnh api download: cập nhật filter fromdate, todate, bổ sung thêm dữ liệu technicals' (#61) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #61
|
2024-09-21 13:13:46 +10:00 |
|
Truong Vo
|
ceb807a170
|
Merge branch 'master' into Sprint-4/MS-37-FE-Evaluation
|
2024-09-21 10:13:19 +07:00 |
|
Truong Vo
|
dff092348a
|
Hiệu chỉnh api download: cập nhật filter fromdate, todate, bổ sung thêm dữ liệu technicals
|
2024-09-21 10:11:39 +07:00 |
|
joseph
|
f90ea5ee53
|
Merge pull request 'deploy to dev server' (#60) from master into dev
Reviewed-on: #60
|
2024-09-21 11:54:05 +10:00 |
|
joseph
|
8d60f126b4
|
Merge pull request 'udpate navbar permissions' (#59) from joseph.update_navbar_permissions into master
Reviewed-on: #59
|
2024-09-21 11:53:41 +10:00 |
|
joseph
|
387e6ce80b
|
Merge pull request 'Intergate api export file' (#58) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #58
|
2024-09-21 11:53:22 +10:00 |
|
JOSEPH LE
|
9f8c069142
|
udpate navbar permissions
|
2024-09-21 08:53:05 +07:00 |
|
Truong Vo
|
21ef986ee8
|
fix
|
2024-09-21 08:25:04 +07:00 |
|
Truong Vo
|
51de925f7c
|
Intergate api export file
|
2024-09-21 08:20:53 +07:00 |
|
joseph
|
3a187f3d7a
|
Merge pull request 'master' (#57) from master into dev
Reviewed-on: #57
|
2024-09-21 10:34:08 +10:00 |