Commit Graph

  • 0bf3af329b Merge pull request 'change background color popup input screen 13' (#111) from dev-manhph1-figbug into dev dev dev 2025-09-08 12:29:44 +09:00
  • f263e54e52 change background color popup input screen 13 dev-manhph1-figbug Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-08 12:28:41 +09:00
  • b81ef3c125 Merge pull request 'change style editor link button match desgin' (#110) from dev-manhph1-figbug into dev dev-nghiantt-fix-bugs dev 2025-09-05 19:01:13 +09:00
  • fd2a4d0a59 change style editor link button match desgin Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-05 19:00:30 +09:00
  • 70e92dc130 Merge pull request 'Update datepicker select' (#109) from dev-nghiantt-fix-bugs into dev dev 2025-09-05 18:51:15 +09:00
  • 66f73f40f4 Update datepicker select Michael 2025-09-05 18:50:41 +09:00
  • dd28f5c620 Merge pull request 'change style editor link button match desgin' (#108) from dev-manhph1-figbug into dev dev 2025-09-05 18:43:26 +09:00
  • f4964feaa5 change style editor link button match desgin Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-05 17:42:30 +09:00
  • e34ac7de95 Merge pull request 'change style editor link button match desgin' (#107) from dev-manhph1-figbug into dev dev 2025-09-05 17:18:00 +09:00
  • 7fdf63a6cc change style editor link button match desgin Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-05 17:17:17 +09:00
  • 44bb88dda9 Merge pull request 'change style editor link button match desgin' (#106) from dev-manhph1-figbug into dev dev 2025-09-05 15:24:55 +09:00
  • 63ff503f9c change style editor link button match desgin Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-05 15:23:52 +09:00
  • 8ff6812a05 Merge pull request 'change style editor link button match desgin' (#105) from dev-manhph1-figbug into dev dev 2025-09-04 13:46:33 +09:00
  • 4f6c86a626 change style editor link button match desgin Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-04 13:44:36 +09:00
  • 3f844a81b4 Merge pull request 'fix bug button color dark mode editor' (#104) from dev-manhph1-figbug into dev dev 2025-09-04 11:28:59 +09:00
  • e3b5716aaf fix bug button color dark mode editor Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-09-04 11:25:43 +09:00
  • efea4d9d49 Merge pull request 'Limit tab to 7 tabs' (#103) from dev-nghiantt-fix-bugs into dev dev 2025-09-04 11:22:01 +09:00
  • 4cc5ad8e05 Limit tab to 7 tabs Michael 2025-09-03 18:43:52 +09:00
  • 1c9546a99a Merge pull request 'add rowSeq for screen 7' (#102) from dev-manhph1-figbug into dev dev 2025-08-28 14:25:24 +09:00
  • 4bcf6d6a4c add rowSeq for screen 7 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-28 11:31:41 +09:00
  • d5c5d48485 Merge pull request 'update' (#101) from dev-luannv24-fix into dev dev 2025-08-28 11:17:25 +09:00
  • 25d30d7926 update dev-luannv24-fix Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-28 11:14:38 +09:00
  • 094d8a03f3 Merge pull request 'Update 2708' (#100) from dev-trungvq7-0729 into dev dev 2025-08-27 17:58:46 +09:00
  • df64326d0d Merge pull request 'update code' (#99) from dev-luannv24-fixbug into dev dev 2025-08-27 17:55:16 +09:00
  • 6dcaf56eee Update 2708 dev-trungvq7-0729 dev 2025-08-27 17:53:09 +09:00
  • 38bbd95ad4 update code dev-luannv24-fixbug Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-27 16:51:07 +09:00
  • 931e2e237e update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-27 16:08:19 +09:00
  • 42a2555671 Merge pull request 'updatecode' (#98) from dev-luannv24-fixbug into dev dev 2025-08-27 15:22:49 +09:00
  • abc6709a31 updatecode Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-27 12:16:53 +09:00
  • 2ef474fda4 Merge pull request 'Apply same style for button favorite' (#97) from dev-nghiantt-fix-bugs into dev dev 2025-08-27 10:39:27 +09:00
  • 9eaad1a2e4 Apply same style for button favorite Michael 2025-08-27 10:38:41 +09:00
  • 7ece26bdfb Merge pull request 'update code' (#96) from dev-luannv24-fixbug into dev dev 2025-08-27 10:33:34 +09:00
  • 3702c59f20 reconfict Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-26 18:23:59 +09:00
  • b2a0f1cde2 update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-26 17:28:37 +09:00
  • d4c39c577f Merge pull request 'Update default item per page by 10' (#95) from dev-nghiantt-fix-bugs into dev dev 2025-08-26 16:00:38 +09:00
  • ac5bb1eb6e Update default item per page by 10 Michael 2025-08-26 15:59:28 +09:00
  • 70aa21c78d Merge pull request 'fix bug ui scrren 12 28' (#94) from dev-manhph1-figbug into dev dev 2025-08-25 18:40:11 +09:00
  • 39502ae8fb fix bug ui scrren 12 28 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-25 13:23:49 +09:00
  • bcea171273 Merge pull request 'Update default pagination' (#93) from dev-nghiantt-fix-bugs into dev dev 2025-08-25 12:42:33 +09:00
  • 08d2918a6d Update color of pagination ellipsis Michael 2025-08-25 12:22:31 +09:00
  • 2dde396442 Update default pagination Michael 2025-08-25 11:59:01 +09:00
  • 4a20707c62 Merge pull request 'Update 0729' (#92) from dev-trungvq7-0729 into dev dev 2025-08-21 18:24:20 +09:00
  • f35924aac8 Update 0729 dev 2025-08-21 18:18:44 +09:00
  • 8d613e14d3 Merge pull request 'fix bug screen 8' (#91) from dev-dungtv-0821 into dev dev 2025-08-21 17:49:11 +09:00
  • 9212c636cf fix bug screen 8 dev-dungtv-0821 Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-21 15:47:41 +07:00
  • 50fee505fe Merge pull request 'add effect loading when change theme mode' (#90) from dev-dungtv-0821 into dev dev 2025-08-21 16:38:13 +09:00
  • 9459291a8e Merge pull request 'Add not hide grid when paging' (#89) from dev-nghiantt-fix-bugs into dev dev 2025-08-21 16:37:14 +09:00
  • f633eb413a Merge pull request 'fix bug' (#88) from dev-manhph1-figbug into dev dev 2025-08-21 16:36:03 +09:00
  • 9000afc00d add effect loading when change theme mode Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-21 14:33:38 +07:00
  • ee1bd87817 Add not hide grid when paging Michael 2025-08-21 15:49:38 +09:00
  • 8bfcebdd10 fix bug Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-21 15:48:01 +09:00
  • af3a7c78f2 Merge pull request 'fix bugs grid on popup' (#86) from dev-dungtv-0821 into dev dev 2025-08-21 12:47:10 +09:00
  • 60b7cfa7e9 Merge pull request 'update code' (#87) from dev-luannv24-fixbugs17 into dev dev 2025-08-21 12:46:45 +09:00
  • 4074f0cfca update code dev-luannv24-fixbugs17 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-21 12:44:21 +09:00
  • cd1abec719 resolve comment Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-21 10:43:44 +07:00
  • 20211168e9 fix bugs grid on popup Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-21 10:37:17 +07:00
  • b20bf33b28 Merge pull request 'update code' (#85) from dev-luannv24-fixheader into dev dev 2025-08-21 12:24:35 +09:00
  • 3b16421518 update code dev-luannv24-fixheader Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-21 11:32:37 +09:00
  • 85a14633be Merge pull request 'updatecode' (#84) from luannv24-fixbug-input into dev dev 2025-08-20 19:21:30 +09:00
  • ce4dd0c2a4 Merge pull request 'Fix bugs screen 13, 17, 7' (#83) from dev-trungvq7-0729 into dev dev 2025-08-20 19:20:53 +09:00
  • bbf332019f Merge pull request 'Update loading + Combine 2 api call in paging + Add dynamic font size for gauge chart' (#82) from dev-nghiantt-fix-bugs into dev dev 2025-08-20 19:19:39 +09:00
  • c67f9f56bd updatecode luannv24-fixbug-input Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-20 18:42:36 +09:00
  • 6350c31c50 Update 2008 dev 2025-08-20 17:28:15 +09:00
  • 50aefda2a0 Update loading + Combine 2 api call in paging + Add dynamic font size for gauge chart Michael 2025-08-20 17:19:39 +09:00
  • f5465885d8 Update 2008 dev 2025-08-20 17:14:37 +09:00
  • 89ad4c11f6 Merge pull request 'add paging for screen 2 12' (#81) from dev-manhph1-figbug into dev dev 2025-08-20 15:27:43 +09:00
  • 1d6c49f944 add paging for screen 2 12 Pham Hoang Manh/(Pham Hoang Manh)/현장대리인/SK 2025-08-20 12:38:22 +09:00
  • 8744da1900 Merge pull request 'updatecode' (#80) from dev-luannv24-fixbug-s28 into dev dev 2025-08-20 11:08:38 +09:00
  • c77ee52c19 Merge pull request 'optimize-css' (#76) from dev-dungtv-optimize-css into dev dev 2025-08-20 11:08:18 +09:00
  • fe9e12e7ed updatecode dev-luannv24-fixbug-s28 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-20 11:05:53 +09:00
  • b7f83002c1 Merge pull request 'Update screen 7, 13' (#79) from dev-trungvq7-0729 into dev dev 2025-08-20 11:03:51 +09:00
  • f0c47a132b Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729 dev 2025-08-20 10:18:13 +09:00
  • 7baa87df12 Update 1908 dev 2025-08-20 10:17:23 +09:00
  • b82589978d Merge pull request 'Update paging disable style + Fix bug line chart + Fix paging function hide grid' (#78) from dev-nghiantt-fix-bugs into dev dev 2025-08-19 18:56:30 +09:00
  • c1911f2ebc Rename default s11 card when there're no data Michael 2025-08-19 18:09:24 +09:00
  • d405e5bf6d Update paging disable style + Fix bug line chart + Fix paging function hide grid Michael 2025-08-19 17:27:35 +09:00
  • 99168acab1 Merge pull request 'update code' (#77) from dev-luannv24-fixbug-s36 into dev dev 2025-08-19 16:45:34 +09:00
  • 2fcc719721 update dev-luannv24-fixbug-s36 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-19 16:44:01 +09:00
  • 06f16f82ff update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-19 16:41:01 +09:00
  • dc43264503 fix bugs change theme model dev-dungtv-optimize-css Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-19 14:26:27 +07:00
  • 5abba695b2 optimize-css Tran Van Dung/(Tran Van Dung)/현장대리인/SK 2025-08-19 13:43:44 +07:00
  • a074e0e6e9 Merge pull request 'update code' (#75) from dev-luannv24-fixbug-17 into dev dev 2025-08-19 12:45:53 +09:00
  • a5c35809fa refactor code dev-luannv24-fixbug-17 Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-19 12:45:19 +09:00
  • 7e9bd540ed update code Nguyen Van Luan/(Nguyen Van Luan)/현장대리인/SK 2025-08-19 12:32:34 +09:00
  • 08637f6321 Merge pull request 'Update screen 7, 33, 16' (#74) from dev-trungvq7-0729 into 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 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 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 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