Commit Graph

433 Commits

Author SHA1 Message Date
vincent.vo bf5dc3d8c1 Merge pull request 'Truong-CreateAutoTicketKPhep' (#94) from Truong-CreateAutoTicketKPhep into master
Reviewed-on: #94
2024-10-14 14:13:38 +11:00
Truong Vo 46d4ffa339 Tạo ticket tự động cho user khi user không check in, check out 2024-10-14 10:11:59 +07:00
Truong Vo d0c1b6894b Tạo ticket tự động cho user khi user không check in, check out 2024-10-14 10:09:04 +07:00
Truong Vo 7fa50478cc Tạo ticket tự động cho user khi user không check in, check out 2024-10-09 10:26:33 +07:00
joseph 0650211f67 Merge pull request 'master' (#93) from master into dev
Reviewed-on: #93
2024-09-25 11:03:07 +10:00
joseph f55ac7e65c Merge pull request 'Sprint-4/MS-36-FE-Technical' (#92) from Sprint-4/MS-36-FE-Technical into master
Reviewed-on: #92
2024-09-25 10:54:42 +10:00
dbdbd9 b836ef48b0 update ui techincal profile and split techincal tab to component in setting 2024-09-25 07:48:13 +07:00
dbdbd9 885dd40dd9 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical 2024-09-25 07:33:13 +07:00
vincent.vo 0b823a226c Merge pull request 'master' (#91) from master into dev
Reviewed-on: #91
2024-09-24 19:23:56 +10:00
vincent.vo ba3209d473 Merge pull request 'Bổ sung sort theo ngày mới nhất' (#90) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #90
2024-09-24 19:23:42 +10:00
Truong Vo 9e83615eeb Bổ sung sort theo ngày mới nhất 2024-09-24 16:23:16 +07:00
vincent.vo 2c2d067e4c Merge pull request 'master' (#89) from master into dev
Reviewed-on: #89
2024-09-24 19:19:13 +10:00
vincent.vo 5f1fa2c1c1 Merge pull request 'Hiệu chỉnh api update technical' (#88) from Sprint-4/MS-37-FE-Evaluation into master
Reviewed-on: #88
2024-09-24 19:18:27 +10:00
Truong Vo c0826f814e Hiệu chỉnh api update technical 2024-09-24 16:18:03 +07:00
joseph 40711691ab Merge pull request 'update some UI' (#87) from joseph.update_navbar_permissions into master
Reviewed-on: #87
2024-09-24 19:04:07 +10:00
JOSEPH LE efd2e0b6b7 update some UI 2024-09-24 16:03:28 +07:00
joseph 84d6ee2630 Merge pull request 'master' (#86) from master into dev
Reviewed-on: #86
2024-09-24 14:21:11 +10:00
joseph 5b7ad04a0f Merge pull request 'update personnel allocation' (#85) from joseph.update_navbar_permissions into master
Reviewed-on: #85
2024-09-24 14:20:57 +10:00
JOSEPH LE a9e93d84d1 update personnel allocation 2024-09-24 11:20:36 +07:00
joseph a7015ceedc Merge pull request 'update permission api' (#84) from joseph.update_navbar_permissions into master
Reviewed-on: #84
2024-09-24 12:46:24 +10:00
JOSEPH LE 5df3959dd8 update permission api 2024-09-24 09:45:48 +07:00
joseph 0ce1b1840a Merge pull request 'update permission api' (#83) from joseph.update_navbar_permissions into master
Reviewed-on: #83
2024-09-24 12:30:42 +10:00
JOSEPH LE 29a3e4de36 update permission api 2024-09-24 09:28:14 +07:00
joseph 5d921e2dd6 Merge pull request 'update roll user management' (#82) from joseph.update_navbar_permissions into master
Reviewed-on: #82
2024-09-24 10:51:18 +10:00
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