joseph
/
ManagementSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
388 Commits 21 Branches 0 Tags 44 MiB
Commit Graph

388 Commits

Author SHA1 Message Date
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
joseph 5bc84a10b8 Merge pull request 'Sprint-4/MS-37-FE-Evaluation' (#56) from Sprint-4/MS-37-FE-Evaluation into master 
Reviewed-on: #56
 2024-09-21 10:33:35 +10:00
Truong Vo 0fe9228241 Intergate chức năng staff evaluation 2024-09-20 17:54:46 +07:00
Truong Vo 8ebe9eb57f Cập nhật lại filter api theo ngày hoàn thành sprint 2024-09-20 17:12:24 +07:00
Truong Vo 9d32e3024f Merge branch 'master' into Sprint-4/MS-37-FE-Evaluation 2024-09-20 17:03:56 +07:00
joseph 06ed7722fa Merge pull request 'Sprint-4/MS-38-BE-Evaluation' (#55) from Sprint-4/MS-38-BE-Evaluation into master 
Reviewed-on: #55
 2024-09-20 20:00:51 +10:00
Truong Vo bd4a481aab Intergate api chức năng Staff evaluation 2024-09-20 16:52:56 +07:00
dbdbd9 14fcbd9224 merge code 2024-09-20 16:06:43 +07:00
dbdbd9 977728a22d Evaluation: filter date sprint-review, filter technical name, export report file 2024-09-20 16:02:16 +07:00
vincent.vo a247d08d45 Merge pull request 'Sprint-4/MS-35-BE-Technical' (#54) from Sprint-4/MS-35-BE-Technical into master 
Reviewed-on: #54
 2024-09-20 18:53:05 +10:00
Truong Vo fecb53d294 Merge branch 'master' into Sprint-4/MS-35-BE-Technical 2024-09-20 15:52:40 +07:00
Truong Vo e114d5b3ae Bổ sung api get all user 2024-09-20 15:52:33 +07:00
vincent.vo 890d85ca45 Merge pull request 'Bổ sung api Technical' (#53) from Sprint-4/MS-35-BE-Technical into master 
Reviewed-on: #53
 2024-09-20 18:28:31 +10:00
Truong Vo 1aeda710e1 Bổ sung api Technical 2024-09-20 15:27:32 +07:00
dbdbd9 62df9728c7 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-38-BE-Evaluation 2024-09-20 13:32:03 +07:00
vincent.vo a8a5de20dc Merge pull request 'Sprint-4/MS-35-BE-Technical' (#52) from Sprint-4/MS-35-BE-Technical into master 
Reviewed-on: #52
 2024-09-20 14:51:32 +10:00
Truong Vo 8c767a37af Merge branch 'master' into Sprint-4/MS-35-BE-Technical 2024-09-20 11:51:00 +07:00
Truong Vo 6d4190d8a2 Thực hiện page staff evaluation 2024-09-20 11:50:53 +07:00
joseph 9d20c13670 Merge pull request 'deploy to dev server' (#51) from master into dev 
Reviewed-on: #51
 2024-09-20 13:41:33 +10:00
joseph a599fe6012 Merge pull request 'test CICD' (#50) from joseph.Update_personnel_allocation into master 
Reviewed-on: #50
 2024-09-20 13:41:09 +10:00
JOSEPH LE 16dfdde4fe test CICD 2024-09-20 10:40:48 +07:00
vincent.vo 4daa37ec9f Merge pull request '[TEST REPORT] Đồng bộ project_id và sprint_id lên URL' (#48) from Sprint-4/MS-35-BE-Technical into master 
Reviewed-on: #48
 2024-09-19 20:22:22 +10:00