Commit Graph

  • fc6587bcff Merge pull request 'Update Project Review, export' (#102) from that-fe into master joseph 2025-02-07 18:59:52 +1100
  • 174c8889ce Update Project Review, export nguentrungthat 2025-02-07 14:42:31 +0700
  • 4fd18b988e Update nguentrungthat 2025-02-06 13:16:07 +0700
  • 9532845bc3 update Joseph 2025-02-03 16:20:00 +0700
  • 38780c56a8 update Joseph 2025-01-21 15:47:13 +0700
  • b908185658 update tracking Joseph 2025-01-21 13:35:04 +0700
  • 07d28e24cd add script detect face root 2025-01-17 14:50:09 +0700
  • d80e7c0957 update jwt expried Joseph 2025-01-16 14:30:04 +0700
  • eb5c6e655f update select month in timekeeping page Joseph 2025-01-02 07:36:39 +0700
  • af52952946 update export button Joseph 2024-12-06 09:27:06 +0700
  • 1443d01685 Merge pull request 'dev' (#101) from dev into master joseph 2024-12-06 13:10:35 +1100
  • a6b5d83535 Merge pull request 'Bổ sung nút report excel trang timekeeping , leave management' (#100) from truong-report-excel into dev joseph 2024-12-06 13:10:11 +1100
  • 7fdf6f3e25 Bổ sung nút report excel trang timekeeping , leave management Truong Vo 2024-12-06 09:07:54 +0700
  • 824b2fd87c Merge pull request 'dev' (#99) from dev into master joseph 2024-12-06 11:36:59 +1100
  • cfba5175a6 Merge pull request 'truong-report-excel' (#98) from truong-report-excel into dev joseph 2024-12-06 11:36:26 +1100
  • 93030b73c7 Bổ sung nút report excel trang timekeeping , leave management Truong Vo 2024-12-05 17:25:07 +0700
  • fcaa2926fd update send mail warning Joseph 2024-11-11 16:26:47 +0700
  • 0e875d7cf9 update send mail warning Joseph 2024-11-08 16:45:55 +0700
  • 14e9e17273 update accoutant role Joseph 2024-11-04 07:44:41 +0700
  • f96f445c7f update accoutant role Joseph 2024-11-04 07:39:36 +0700
  • 1d9e428587 update $morning_condition_time Joseph 2024-10-24 07:28:26 +0700
  • a830791648 update mail subject Joseph 2024-10-23 07:54:50 +0700
  • 8d8985a6be update send mail warning checkin late Joseph 2024-10-21 14:23:03 +0700
  • d53b786daf update root folder by enviroment Joseph 2024-10-16 16:09:56 +0700
  • 79b3cbe916 update root folder by enviroment Joseph 2024-10-16 15:54:58 +0700
  • 2eed0f006b Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem Joseph 2024-10-16 15:38:05 +0700
  • e226ad41d7 create page manage profiles, page add profile user Joseph 2024-10-16 15:35:58 +0700
  • cc0a62f746 Merge pull request 'BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày' (#97) from Truong-CreateAutoTicketKPhep into master joseph 2024-10-16 13:47:36 +1100
  • 4334f3e73d Bổ sung check điều kiện có user check in check out (ngày hợp lệ) Truong-CreateAutoTicketKPhep Truong Vo 2024-10-16 09:44:29 +0700
  • 1c16b4b164 BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày Truong Vo 2024-10-16 09:03:52 +0700
  • 2c6a6a81dd Merge pull request 'BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày' (#96) from Truong-CreateAutoTicketKPhep into master joseph 2024-10-16 11:57:27 +1100
  • 34b6698696 BỔ SUNG CHECK THÊM điều kiện user ticket nguyên ngày Truong Vo 2024-10-16 07:54:38 +0700
  • 7c8267d6e3 Merge pull request 'Bỏ bắt buộc field Admin notes khi admin duyệt or từ chối ticket' (#95) from Truong-CreateAutoTicketKPhep into master joseph 2024-10-14 15:06:15 +1100
  • ceb925f571 Bỏ bắt buộc field Admin notes khi admin duyệt or từ chối ticket Truong Vo 2024-10-14 11:04:44 +0700
  • bf5dc3d8c1 Merge pull request 'Truong-CreateAutoTicketKPhep' (#94) from Truong-CreateAutoTicketKPhep into master vincent.vo 2024-10-14 14:13:38 +1100
  • 46d4ffa339 Tạo ticket tự động cho user khi user không check in, check out Truong Vo 2024-10-14 10:11:59 +0700
  • d0c1b6894b Tạo ticket tự động cho user khi user không check in, check out Truong Vo 2024-10-14 10:09:04 +0700
  • 7fa50478cc Tạo ticket tự động cho user khi user không check in, check out Truong Vo 2024-10-09 10:26:33 +0700
  • 0650211f67 Merge pull request 'master' (#93) from master into dev joseph 2024-09-25 11:03:07 +1000
  • f55ac7e65c Merge pull request 'Sprint-4/MS-36-FE-Technical' (#92) from Sprint-4/MS-36-FE-Technical into master Sprint-4/MS-37-FE-Evaluation joseph 2024-09-25 10:54:42 +1000
  • b836ef48b0 update ui techincal profile and split techincal tab to component in setting Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-25 07:48:13 +0700
  • 885dd40dd9 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-25 07:33:13 +0700
  • 0b823a226c Merge pull request 'master' (#91) from master into dev vincent.vo 2024-09-24 19:23:56 +1000
  • ba3209d473 Merge pull request 'Bổ sung sort theo ngày mới nhất' (#90) from Sprint-4/MS-37-FE-Evaluation into master vincent.vo 2024-09-24 19:23:42 +1000
  • 9e83615eeb Bổ sung sort theo ngày mới nhất Truong Vo 2024-09-24 16:23:16 +0700
  • 2c2d067e4c Merge pull request 'master' (#89) from master into dev vincent.vo 2024-09-24 19:19:13 +1000
  • 5f1fa2c1c1 Merge pull request 'Hiệu chỉnh api update technical' (#88) from Sprint-4/MS-37-FE-Evaluation into master vincent.vo 2024-09-24 19:18:27 +1000
  • c0826f814e Hiệu chỉnh api update technical Truong Vo 2024-09-24 16:18:03 +0700
  • 40711691ab Merge pull request 'update some UI' (#87) from joseph.update_navbar_permissions into master joseph 2024-09-24 19:04:07 +1000
  • efd2e0b6b7 update some UI joseph.update_navbar_permissions JOSEPH LE 2024-09-24 16:03:28 +0700
  • 84d6ee2630 Merge pull request 'master' (#86) from master into dev joseph 2024-09-24 14:21:11 +1000
  • 5b7ad04a0f Merge pull request 'update personnel allocation' (#85) from joseph.update_navbar_permissions into master joseph 2024-09-24 14:20:57 +1000
  • a9e93d84d1 update personnel allocation JOSEPH LE 2024-09-24 11:20:36 +0700
  • a7015ceedc Merge pull request 'update permission api' (#84) from joseph.update_navbar_permissions into master joseph 2024-09-24 12:46:24 +1000
  • 5df3959dd8 update permission api JOSEPH LE 2024-09-24 09:45:48 +0700
  • 0ce1b1840a Merge pull request 'update permission api' (#83) from joseph.update_navbar_permissions into master joseph 2024-09-24 12:30:42 +1000
  • 29a3e4de36 update permission api JOSEPH LE 2024-09-24 09:28:14 +0700
  • 5d921e2dd6 Merge pull request 'update roll user management' (#82) from joseph.update_navbar_permissions into master joseph 2024-09-24 10:51:18 +1000
  • 1f4eec2165 update roll user management JOSEPH LE 2024-09-24 07:50:55 +0700
  • 81f633cde7 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-24 07:36:51 +0700
  • 6aff6093a6 Merge pull request 'master' (#81) from master into dev joseph 2024-09-24 10:36:02 +1000
  • 7cd728be5a Merge pull request 'Sprint-4/MS-36-FE-Technical' (#80) from Sprint-4/MS-36-FE-Technical into master joseph 2024-09-24 10:35:38 +1000
  • ff86cc34cc Merge branch 'dev' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-23 07:55:09 +0700
  • 235dce3800 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-23 07:31:20 +0700
  • 0e1d1d9d64 Merge pull request 'master' (#79) from master into dev joseph 2024-09-21 14:29:47 +1000
  • 555934ac5c Technical: fix ui profile technical dbdbd9 2024-09-21 11:29:37 +0700
  • bf39d05010 Merge pull request 'Technical: fix ui add technical, api Evaluation/Technical' (#78) from Sprint-4/MS-36-FE-Technical into master joseph 2024-09-21 14:29:29 +1000
  • 738645c787 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-21 11:29:07 +0700
  • ff5e31ee94 Merge pull request 'master' (#77) from master into dev vincent.vo 2024-09-21 14:21:53 +1000
  • ffe51046b6 Merge pull request 'fix error' (#76) from Sprint-4/MS-37-FE-Evaluation into master vincent.vo 2024-09-21 14:21:37 +1000
  • db90658482 fix error Truong Vo 2024-09-21 11:21:13 +0700
  • 96587e7f4d Technical: fix ui add technical, api Evaluation/Technical dbdbd9 2024-09-21 11:19:42 +0700
  • 0db0ddb48b Merge pull request 'master' (#75) from master into dev joseph 2024-09-21 13:50:59 +1000
  • 73f762b822 Merge pull request 'update cache and UI' (#74) from joseph.update_navbar_permissions into master joseph 2024-09-21 13:50:39 +1000
  • 7622e7a95b update cache and UI JOSEPH LE 2024-09-21 10:50:03 +0700
  • a7f75c686b Merge pull request 'Bổ sung view badge cho nội dung level' (#73) from Sprint-4/MS-37-FE-Evaluation into master vincent.vo 2024-09-21 13:46:35 +1000
  • 323a5b0df6 Merge branch 'master' into Sprint-4/MS-37-FE-Evaluation Truong Vo 2024-09-21 10:46:18 +0700
  • 9d0dd9bbab Bổ sung view badge cho nội dung level Truong Vo 2024-09-21 10:46:03 +0700
  • fd4ed6fa8d Merge pull request 'master' (#72) from master into dev joseph 2024-09-21 13:40:40 +1000
  • d2f5273703 Merge pull request 'Sprint-4/MS-36-FE-Technical' (#71) from Sprint-4/MS-36-FE-Technical into master joseph 2024-09-21 13:40:20 +1000
  • 4f918de659 Technical: fix confict dbdbd9 2024-09-21 10:38:51 +0700
  • 3a9123a114 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-21 10:38:19 +0700
  • 7afe034606 Merge pull request 'deploy to dev server' (#70) from master into dev joseph 2024-09-21 13:35:40 +1000
  • 67516faa3d Merge pull request 'Sprint-4/MS-36-FE-Technical' (#63) from Sprint-4/MS-36-FE-Technical into master joseph 2024-09-21 13:35:10 +1000
  • db60dd1a83 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-21 10:32:55 +0700
  • 9b9b615d1d Merge pull request 'master' (#69) from master into dev vincent.vo 2024-09-21 13:32:23 +1000
  • 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 vincent.vo 2024-09-21 13:32:11 +1000
  • f38e19f1d7 Hiệu chỉnh format cột bảng dữ liệu export Truong Vo 2024-09-21 10:31:57 +0700
  • edb873f1f1 Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-21 10:29:01 +0700
  • e6aa179bcc Merge pull request 'master' (#67) from master into dev vincent.vo 2024-09-21 13:28:39 +1000
  • 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 vincent.vo 2024-09-21 13:28:23 +1000
  • 2e3cf4702c Hiệu chỉnh format cột bảng dữ liệu export Truong Vo 2024-09-21 10:28:09 +0700
  • abb79653e4 Merge pull request 'master' (#65) from master into dev vincent.vo 2024-09-21 13:24:55 +1000
  • 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 vincent.vo 2024-09-21 13:24:39 +1000
  • eb68634582 Hiệu chỉnh format cột bảng dữ liệu export Truong Vo 2024-09-21 10:24:20 +0700
  • 4d520a664d Merge branch 'master' of https://gitea.nswteam.net/joseph/ManagementSystem into Sprint-4/MS-36-FE-Technical dbdbd9 2024-09-21 10:19:12 +0700
  • bb40261a0d Technical: add Profile page, Organization Settings page dbdbd9 2024-09-21 10:19:04 +0700
  • 8325e90081 Merge pull request 'master' (#62) from master into dev vincent.vo 2024-09-21 13:14:07 +1000
  • 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 vincent.vo 2024-09-21 13:13:46 +1000
  • ceb807a170 Merge branch 'master' into Sprint-4/MS-37-FE-Evaluation Truong Vo 2024-09-21 10:13:19 +0700