|
f6c071bdf0
|
fix menu item:hover style
|
2025-08-13 13:37:51 +07:00 |
|
|
24882a21a5
|
fix bugs style button delete
|
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
|
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
Reviewed-on: #62
|
2025-08-13 13:46:53 +09:00 |
|
|
de99b30485
|
fix bugs css menu
|
2025-08-13 11:43:43 +07:00 |
|
|
2802e93a44
|
add pagination for screen 27 move pagination screen 28
|
2025-08-13 13:38:12 +09:00 |
|
|
68f3f0f381
|
fix bugs
|
2025-08-13 08:18:27 +07:00 |
|
|
39905e6f80
|
Merge pull request 'update code s32 s17' (#61) from dev-luannv24-s32-s17fixbug into dev
Reviewed-on: #61
|
2025-08-12 18:47:56 +09:00 |
|
|
0825663c64
|
Merge pull request 'fix icon datepicker' (#60) from dev-manhph1-figbug into dev
Reviewed-on: #60
|
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
Reviewed-on: #59
|
2025-08-12 18:43:04 +09:00 |
|
|
71e90064a2
|
update code s32 s17
|
2025-08-12 18:37:21 +09:00 |
|
|
7d2bcb9496
|
fix icon datepicker
|
2025-08-12 18:00:01 +09:00 |
|
|
84c7e61254
|
Update pagination UI + Fix bugs gauge chart line chart + Fix bugs s14
|
2025-08-12 17:07:52 +09:00 |
|
|
ffdc56b8f1
|
Merge pull request 'fix bug screen17 tab3' (#58) from dev-luannv27-s17 into dev
Reviewed-on: #58
|
2025-08-12 16:42:35 +09:00 |
|
|
245444d5fa
|
fix bug screen17 tab3
|
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
Reviewed-on: #57
|
2025-08-12 15:14:30 +09:00 |
|
|
5c43496282
|
refactor code
|
2025-08-12 15:12:06 +09:00 |
|
|
31413d1e48
|
update code
|
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
Reviewed-on: #56
|
2025-08-11 18:29:55 +09:00 |
|
|
e59078a19c
|
Fix datepicker icon + add dash line in line chart
|
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
Reviewed-on: #55
|
2025-08-11 16:55:41 +09:00 |
|
|
4fd2eac344
|
add check direction for actionbutton
|
2025-08-11 16:12:19 +09:00 |
|
|
c40352e37c
|
fix bug grid not load when change menu tab
|
2025-08-11 15:12:01 +09:00 |
|
|
6583d68ea7
|
Merge pull request 'fix bugs 47, 145' (#54) from dev-dungtv-0811 into dev
Reviewed-on: #54
|
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
Reviewed-on: #53
|
2025-08-11 13:54:33 +09:00 |
|
|
d6dd66c4b3
|
fix bugs 47, 145
|
2025-08-11 11:51:28 +07:00 |
|
|
f666110a1a
|
Add pagination + fix bugs tooltip + fix bugs line chart
|
2025-08-11 11:55:32 +09:00 |
|
|
d22b09cc47
|
Merge pull request 'fixbug' (#52) from dev-luannv24-fixbug1 into dev
Reviewed-on: #52
|
2025-08-11 11:25:42 +09:00 |
|
|
ecfbeb3afa
|
fixbug
|
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
Reviewed-on: #51
|
2025-08-08 11:35:28 +09:00 |
|
|
335f93e6cf
|
resovel conflix
|
2025-08-08 11:30:10 +09:00 |
|
|
9979f32f8c
|
Merge pull request 'dev-trungvq7-0729' (#50) from dev-trungvq7-0729 into dev
Reviewed-on: #50
|
2025-08-08 10:25:21 +09:00 |
|
|
71394443ac
|
update code
|
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
|
2025-08-07 18:54:21 +09:00 |
|
|
c9bc9d3186
|
Merge 0729
|
2025-08-07 18:54:14 +09:00 |
|
|
a06d2e553d
|
Merge pull request 'dev-dungtv-0807' (#49) from dev-dungtv-0807 into dev
Reviewed-on: #49
|
2025-08-07 18:43:05 +09:00 |
|
|
6a894df6ec
|
Merge pull request 'add dark mode for editor' (#47) from dev-manhph1-figbug into dev
Reviewed-on: #47
|
2025-08-07 18:15:02 +09:00 |
|
|
e194557753
|
Merge pull request 'dev-dungtv-0807' (#48) from dev-dungtv-0807 into dev
Reviewed-on: #48
|
2025-08-07 17:46:32 +09:00 |
|
|
d0572dc07c
|
fixbug grid
|
2025-08-07 15:26:53 +07:00 |
|
|
ea4910db79
|
fix bugs screen 10, 20
|
2025-08-07 15:18:06 +07:00 |
|
|
c636db83bd
|
fix bug screen 8 bug-32
|
2025-08-07 13:57:24 +07:00 |
|
|
6871d6034d
|
fix bugs screen 20.1~20.4
|
2025-08-07 13:50:37 +07:00 |
|
|
1352223416
|
Merge pull request 'Fix checkboxes in form' (#46) from dev-nghiantt-fix-bugs into dev
Reviewed-on: #46
|
2025-08-07 15:42:38 +09:00 |
|
|
fa68aa31e6
|
add dark mode for editor
|
2025-08-07 13:33:35 +07:00 |
|
|
439079eee8
|
Fix checkboxes in form
|
2025-08-07 12:49:14 +09:00 |
|
|
93dd46c225
|
Merge pull request 'fixbugs screen 10' (#45) from dev-dungtv-0807 into dev
Reviewed-on: #45
|
2025-08-07 12:45:25 +09:00 |
|
|
537a16fbc7
|
fixbugs screen 10
|
2025-08-07 10:40:23 +07:00 |
|
|
6f6f19349f
|
Merge pull request 'fix bug 07/08/25' (#44) from dev-manhph1-figbug into dev
Reviewed-on: #44
|
2025-08-07 12:23:53 +09:00 |
|
|
2533d5bb7a
|
fix bug 07/08/25
|
2025-08-07 09:58:49 +07:00 |
|
|
19a634e3a5
|
Merge pull request 'dev-luannv24-s2s17s15-fixbug' (#41) from dev-luannv24-s2s17s15-fixbug into dev
Reviewed-on: #41
|
2025-08-07 11:42:33 +09:00 |
|