gitadmin/sk_fems_ui
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 08637f6321 Merge pull request 'Update screen 7, 33, 16' (#74) from dev-trungvq7-0729 into dev dev dev 2025-08-18 17:57:22 +09:00
  • ce2c3c6c0e Merge pull request 'Fix selection grid s14 + Remove border legend dashboard' (#73) from dev-nghiantt-fix-bugs into dev dev 2025-08-18 17:56:13 +09:00
  • 9d35712f58 Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 dev-trungvq7-0729 dev 2025-08-18 17:50:07 +09:00
  • 41370aa4df Update 1808 dev 2025-08-18 17:50:04 +09:00
  • d3022582b6 Fix selection grid s14 + Remove border legend dashboard dev-nghiantt-fix-bugs Michael 2025-08-18 17:41:42 +09:00
  • 3c49bd36e9 Merge pull request 'fix bug grid no scroll y margin right' (#72) from dev-manhph1-figbug into dev dev 2025-08-18 16:45:07 +09:00
  • c6eb2b57b2 fix bug grid no scroll y margin right dev-manhph1-figbug Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-18 16:31:29 +09:00
  • 5088769914 Merge pull request 'hotfix bug screen 10' (#71) from dev-dungtv-0818 into dev dev 2025-08-18 11:27:28 +09:00
  • 50698ac661 hotfix bug screen 10 dev-dungtv-0818 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-18 09:25:41 +07:00
  • c815eae2ca Merge pull request 'Fix bug Screen 13' (#70) from dev-trungvq7-0729 into dev dev 2025-08-18 10:50:01 +09:00
  • 8a9dfd9949 Merge pull request 'fix desgin screen 38' (#69) from dev-manhph1-figbug into dev dev 2025-08-18 10:47:00 +09:00
  • 3155258656 Update 1508 dev 2025-08-18 10:44:55 +09:00
  • 68916550e5 Update 1508 dev 2025-08-18 10:40:46 +09:00
  • 1250b3d3af fix desgin screen 38 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-15 15:52:52 +09:00
  • be1e0426e0 Merge pull request 'Add paging and button view detail for S1 dashboard + Fix bugs 156 163' (#68) from dev-nghiantt-fix-bugs into dev dev 2025-08-15 10:10:47 +09:00
  • 81a20d2851 Add paging and button view detail for S1 dashboard + Fix bugs 156 163 Michael 2025-08-14 17:09:19 +09:00
  • 6353ffba57 Merge pull request 'dev-manhph1-figbug' (#67) from dev-manhph1-figbug into dev dev 2025-08-14 16:00:15 +09:00
  • ed9150aae8 Merge pull request 'fix bug grid + buttons' (#66) from dev-dungtv-0814 into dev dev 2025-08-14 15:54:22 +09:00
  • 270279b0c2 add paging for page 38 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-14 15:51:06 +09:00
  • 9a42291cf4 add paging for page 38 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-14 15:50:01 +09:00
  • c810139554 fix bug grid + buttons dev-dungtv-0814 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-14 12:30:55 +07:00
  • 1a5ec4c6a3 Merge pull request 'fixbug' (#65) from dev-luannv24-fixbug-common-screen17 into dev dev 2025-08-14 12:03:40 +09:00
  • 856d0db130 updatecode dev-luannv24-fixbug-common-screen17 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-14 12:01:07 +09:00
  • 6973321137 fixbug Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-14 11:34:02 +09:00
  • 2cea34dbab Merge pull request 'Update screen 13, grid color' (#64) from dev-trungvq7-0729 into dev dev 2025-08-13 19:02:06 +09:00
  • f41bd1283a Update 1308 dev 2025-08-13 18:20:59 +09:00
  • d5c59286ad Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 dev 2025-08-13 17:14:44 +09:00
  • 287c68252b Update 1108 dev 2025-08-13 17:14:39 +09:00
  • 59ec2eda59 Merge pull request 'dev-dungtv-0813' (#63) from dev-dungtv-0813 into dev dev 2025-08-13 16:12:46 +09:00
  • f6c071bdf0 fix menu item:hover style dev-dungtv-0813 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-13 13:37:51 +07:00
  • 24882a21a5 fix bugs style button delete Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-13 13:20:58 +07:00
  • 9aa9939a43 Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0813 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-13 11:47:03 +07:00
  • 0760bde4e1 Merge pull request 'add pagination for screen 27 move pagination screen 28' (#62) from dev-manhph1-figbug into dev dev 2025-08-13 13:46:53 +09:00
  • de99b30485 fix bugs css menu Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-13 11:43:43 +07:00
  • 2802e93a44 add pagination for screen 27 move pagination screen 28 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-13 13:38:12 +09:00
  • 68f3f0f381 fix bugs Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-13 08:18:27 +07:00
  • 39905e6f80 Merge pull request 'update code s32 s17' (#61) from dev-luannv24-s32-s17fixbug into dev dev 2025-08-12 18:47:56 +09:00
  • 0825663c64 Merge pull request 'fix icon datepicker' (#60) from dev-manhph1-figbug into dev dev 2025-08-12 18:47:08 +09:00
  • 8d444eafcd Merge pull request 'Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14' (#59) from dev-nghiantt-fix-bugs into dev dev 2025-08-12 18:43:04 +09:00
  • 71e90064a2 update code s32 s17 dev-luannv24-s32-s17fixbug Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-12 18:37:21 +09:00
  • 7d2bcb9496 fix icon datepicker Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-12 18:00:01 +09:00
  • 84c7e61254 Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14 Michael 2025-08-12 17:07:52 +09:00
  • ffdc56b8f1 Merge pull request 'fix bug screen17 tab3' (#58) from dev-luannv27-s17 into dev dev 2025-08-12 16:42:35 +09:00
  • 245444d5fa fix bug screen17 tab3 dev-luannv27-s17 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-12 16:38:22 +09:00
  • 541ae86068 Merge pull request 'fixbug screen 2 , screen 17 , screen 15' (#57) from dev-luannv24-fixbug-8/12 into dev dev 2025-08-12 15:14:30 +09:00
  • 5c43496282 refactor code dev-luannv24-fixbug-8/12 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-12 15:12:06 +09:00
  • 31413d1e48 update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-12 12:58:41 +09:00
  • dd24592eca Merge pull request 'Fix datepicker icon + add dash line in line chart' (#56) from dev-nghiantt-fix-bugs into dev dev 2025-08-11 18:29:55 +09:00
  • e59078a19c Fix datepicker icon + add dash line in line chart Michael 2025-08-11 17:58:25 +09:00
  • bc96d2ae45 Merge pull request 'fix bug grid not load when change menu tab' (#55) from dev-manhph1-figbug into dev dev 2025-08-11 16:55:41 +09:00
  • 4fd2eac344 add check direction for actionbutton Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-11 16:12:19 +09:00
  • c40352e37c fix bug grid not load when change menu tab Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-11 15:12:01 +09:00
  • 6583d68ea7 Merge pull request 'fix bugs 47, 145' (#54) from dev-dungtv-0811 into dev dev 2025-08-11 14:06:24 +09:00
  • 5859c5d681 Merge pull request 'Add pagination + fix bugs tooltip + fix bugs line chart' (#53) from dev-nghiantt-fix-bugs into dev dev 2025-08-11 13:54:33 +09:00
  • d6dd66c4b3 fix bugs 47, 145 dev-dungtv-0811 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-11 11:51:28 +07:00
  • f666110a1a Add pagination + fix bugs tooltip + fix bugs line chart Michael 2025-08-11 11:55:32 +09:00
  • d22b09cc47 Merge pull request 'fixbug' (#52) from dev-luannv24-fixbug1 into dev dev 2025-08-11 11:25:42 +09:00
  • ecfbeb3afa fixbug dev-luannv24-fixbug1 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-08 19:22:33 +09:00
  • 1ece377457 Merge pull request 'update code' (#51) from dev-luannv24-screen36-32-31-26-17-15 into dev dev 2025-08-08 11:35:28 +09:00
  • 335f93e6cf resovel conflix dev-luannv24-screen36-32-31-26-17-15 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-08 11:30:10 +09:00
  • 9979f32f8c Merge pull request 'dev-trungvq7-0729' (#50) from dev-trungvq7-0729 into dev dev 2025-08-08 10:25:21 +09:00
  • 71394443ac update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-07 19:04:13 +09:00
  • d8c5bd5323 Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 dev 2025-08-07 18:54:21 +09:00
  • c9bc9d3186 Merge 0729 dev 2025-08-07 18:54:14 +09:00
  • a06d2e553d Merge pull request 'dev-dungtv-0807' (#49) from dev-dungtv-0807 into dev dev 2025-08-07 18:43:05 +09:00
  • 6a894df6ec Merge pull request 'add dark mode for editor' (#47) from dev-manhph1-figbug into dev dev 2025-08-07 18:15:02 +09:00
  • e194557753 Merge pull request 'dev-dungtv-0807' (#48) from dev-dungtv-0807 into dev dev 2025-08-07 17:46:32 +09:00
  • d0572dc07c fixbug grid dev-dungtv-0807 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 15:26:53 +07:00
  • ea4910db79 fix bugs screen 10, 20 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 15:18:06 +07:00
  • c636db83bd fix bug screen 8 bug-32 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 13:57:24 +07:00
  • 6871d6034d fix bugs screen 20.1~20.4 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 13:50:37 +07:00
  • 1352223416 Merge pull request 'Fix checkboxes in form' (#46) from dev-nghiantt-fix-bugs into dev dev 2025-08-07 15:42:38 +09:00
  • fa68aa31e6 add dark mode for editor Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK 2025-08-07 13:33:35 +07:00
  • 439079eee8 Fix checkboxes in form Michael 2025-08-07 12:49:14 +09:00
  • 93dd46c225 Merge pull request 'fixbugs screen 10' (#45) from dev-dungtv-0807 into dev dev 2025-08-07 12:45:25 +09:00
  • 537a16fbc7 fixbugs screen 10 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 10:40:23 +07:00
  • 6f6f19349f Merge pull request 'fix bug 07/08/25' (#44) from dev-manhph1-figbug into dev dev 2025-08-07 12:23:53 +09:00
  • 2533d5bb7a fix bug 07/08/25 Hoang Xuan Mai/(Hoang Xuan Mai)/현장대리인/SK 2025-08-07 09:58:49 +07:00
  • 19a634e3a5 Merge pull request 'dev-luannv24-s2s17s15-fixbug' (#41) from dev-luannv24-s2s17s15-fixbug into dev dev 2025-08-07 11:42:33 +09:00
  • e4331ad79f Merge pull request 'fix bug screen 10' (#42) from dev-dungtv-0807 into dev dev 2025-08-07 11:37:15 +09:00
  • 8c7a8d5b29 resolve commit code Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 09:36:18 +07:00
  • 140f73814f update dev-luannv24-s2s17s15-fixbug Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-07 11:29:24 +09:00
  • b53ce8bd83 refactor code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-07 11:27:51 +09:00
  • 8bb0d56a80 Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-luannv24-s2s17s15-fixbug Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-07 11:23:58 +09:00
  • f715405ad2 Merge pull request 'dev-trungvq7-0729' (#40) from dev-trungvq7-0729 into dev dev 2025-08-07 10:58:23 +09:00
  • f80bfc5c71 fix bug screen 10 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-07 08:37:59 +07:00
  • 56607d0770 update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-06 19:08:06 +09:00
  • 6db0ff96c0 Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 dev 2025-08-06 19:03:14 +09:00
  • 2cf00c0880 update code fixbug Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-06 19:02:19 +09:00
  • 9155a2b55e commit 0608 dev 2025-08-06 19:00:29 +09:00
  • 484d8879aa Merge pull request 'fix bugs' (#39) from dev-dungtv-0806 into dev dev 2025-08-06 18:50:46 +09:00
  • 38585f7b4f hotfix layout dev-dungtv-0806 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-06 16:43:12 +07:00
  • b0ad70d33e fix bugs Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-06 16:31:44 +07:00
  • 3f89707a01 Merge pull request 'fixbugs grid' (#38) from dev-dungtv-0805 into dev dev 2025-08-06 12:13:45 +09:00
  • a4007d5697 resolve comment dev-dungtv-0805 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-06 10:12:34 +07:00
  • 3b6c05c70a Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0805 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-06 09:27:47 +07:00
  • 550659475f Merge pull request 'fix bug 18 33 34' (#37) from dev-manhph1-figbug into dev dev 2025-08-06 11:27:22 +09:00
  • 4a7077336d resolve confict Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-06 09:26:53 +07:00
  • ca27167d3d Merge pull request 'Update tooltip s4 + add view button to switch page' (#36) from dev-nghiantt-fix-bugs into dev dev 2025-08-06 10:32:48 +09:00
  • bf6d03df63 fixbugs grid Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-05 17:28:12 +07:00