|
|
719e7cee69
|
fix style grid
|
2025-07-30 17:09:09 +07:00 |
|
|
|
a2e7e8d74e
|
pull dev
|
2025-07-30 14:07:08 +07:00 |
|
|
|
d37f23512a
|
Merge pull request 'Update s14 s29 + Fix bugs s1 + Update datepicker height' (#22) from dev-nghiantt-s1s29 into dev
Reviewed-on: #22
|
2025-07-30 16:05:38 +09:00 |
|
|
|
1a23077421
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv44-0730
|
2025-07-30 14:04:11 +07:00 |
|
|
|
9603353ab3
|
update screen 33, 44, 20, fix bug Grid
|
2025-07-30 14:03:41 +07:00 |
|
|
|
6077dddb74
|
Remove mockdata screen 5
|
2025-07-30 15:35:41 +09:00 |
|
|
|
2338bbf2ec
|
Remove log + fix click chart top 10
|
2025-07-30 15:01:44 +09:00 |
|
|
|
c2e2c10a8a
|
Update s14 s29 + Fix bugs s1 + Update datepicker height
|
2025-07-30 12:35:12 +09:00 |
|
|
|
d790249743
|
Merge pull request 'fix ui EvtObjPop' (#21) from dev-manhph1-fixbug-18-19-21-28 into dev
Reviewed-on: #21
|
2025-07-30 11:43:21 +09:00 |
|
|
|
205821fc11
|
fix ui EvtObjPop
|
2025-07-30 11:39:45 +09:00 |
|
|
|
fade079b06
|
Merge pull request 'dev-manhph1-fixbug-18-19-21-28' (#18) from dev-manhph1-fixbug-18-19-21-28 into dev
Reviewed-on: #18
|
2025-07-30 11:24:55 +09:00 |
|
|
|
98c26a156e
|
Merge pull request 'update screen 34, fix bug grid - select item' (#20) from dev-dungtv44-0730 into dev
Reviewed-on: #20
|
2025-07-30 11:22:38 +09:00 |
|
|
|
b4f8e41c7e
|
update screen 34, fix bug grid - select item
|
2025-07-30 09:15:11 +07:00 |
|
|
|
e9bdd80f14
|
Merge pull request 'update screen 34, 20' (#19) from dev-dungtv44-0730 into dev
Reviewed-on: #19
|
2025-07-30 10:35:21 +09:00 |
|
|
|
eeadcd254d
|
remove console log
|
2025-07-30 08:32:27 +07:00 |
|
|
|
b56bd12bb7
|
update screen 34, 20
|
2025-07-30 08:23:13 +07:00 |
|
|
|
bea1e0889b
|
dev-manhph1-add-pagination-28
|
2025-07-29 18:30:19 +09:00 |
|
|
|
0f66d84b48
|
Merge pull request 'hotfix grid' (#17) from dev-dungtv-fix-grid into dev
Reviewed-on: #17
|
2025-07-29 17:45:00 +09:00 |
|
|
|
34d03b2546
|
dev-manhph1-fixbug-18-19-21-28
|
2025-07-29 17:18:41 +09:00 |
|
|
|
8f83e1d60c
|
hotfix grid
|
2025-07-29 14:58:37 +07:00 |
|
|
|
54220aa4eb
|
Merge pull request 'update screen 12, 20' (#15) from dev-dungtv-0729 into dev
Reviewed-on: #15
|
2025-07-29 15:39:16 +09:00 |
|
|
|
315aafc528
|
update screen 12, 20
|
2025-07-29 13:20:29 +07:00 |
|
|
|
8963a92475
|
update screen15-screen31
|
2025-07-29 12:06:11 +09:00 |
|
|
|
d66a03626b
|
updatenew-code-new
|
2025-07-29 12:04:09 +09:00 |
|
|
|
665a178f82
|
Merge pull request 'update screen 2, 8, 9, 10, 27, 33, 34' (#12) from dev-dungtv-0728 into dev
Reviewed-on: #12
|
2025-07-29 11:52:11 +09:00 |
|
|
|
7e2383efda
|
update-subtitle-screen15
|
2025-07-29 11:39:05 +09:00 |
|
|
|
13cedc7337
|
resolve conflict
|
2025-07-29 09:36:40 +07:00 |
|
|
|
e128375aeb
|
Merge pull request 'Update Screen 16, 22' (#13) from dev-trungvq7-2207 into dev
Reviewed-on: #13
|
2025-07-29 11:30:56 +09:00 |
|
|
|
710714116e
|
Remove inline style
|
2025-07-29 11:30:05 +09:00 |
|
|
|
33dbe93290
|
Merge pull request '- Update screen 14 29 - Remove mock data dashboard' (#11) from dev-nghiantt-s14 into dev
Reviewed-on: #11
|
2025-07-29 11:25:51 +09:00 |
|
|
|
708b648080
|
updatecode
|
2025-07-29 11:20:59 +09:00 |
|
|
|
2845672723
|
Update 16, 22
|
2025-07-29 10:51:49 +09:00 |
|
|
|
bbaf26af86
|
Fix comment
|
2025-07-28 18:34:29 +09:00 |
|
|
|
c3d01c998c
|
update screen 2, 8, 9, 10, 27, 33, 34
|
2025-07-28 16:12:24 +07:00 |
|
|
|
aec9353ab2
|
- Update screen 14 29 - Remove mock data dashboard
|
2025-07-28 17:22:38 +09:00 |
|
|
|
2dd0c6a72c
|
Merge pull request 'dev-trungvq7-2207' (#10) from dev-trungvq7-2207 into dev
Reviewed-on: #10
|
2025-07-28 14:39:36 +09:00 |
|
|
|
631637a8e1
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-2207
|
2025-07-28 14:31:49 +09:00 |
|
|
|
3ff87852e5
|
Update 2507
|
2025-07-28 14:31:41 +09:00 |
|
|
|
117e0adeb9
|
Merge pull request 'dev-dungtv-0725' (#9) from dev-dungtv-0725 into dev
Reviewed-on: #9
|
2025-07-28 10:59:55 +09:00 |
|
|
|
402b09440f
|
fix code comment
|
2025-07-28 08:59:17 +07:00 |
|
|
|
71f7cf4d30
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0725
|
2025-07-28 08:45:04 +07:00 |
|
|
|
d3984182e8
|
update screen 8, 10
|
2025-07-28 08:44:51 +07:00 |
|
|
|
933d4b751f
|
Merge pull request 'dev-luannv27-2407' (#7) from dev-luannv27-2407 into dev
Reviewed-on: #7
|
2025-07-28 10:35:21 +09:00 |
|
|
|
020432d5ac
|
update code
|
2025-07-25 19:05:38 +09:00 |
|
|
|
3f99958fe3
|
update slected header
|
2025-07-25 19:03:41 +09:00 |
|
|
|
898df6743a
|
Merge pull request 'dev-manhph1-screen18-19-21-28' (#5) from dev-manhph1-screen18-19-21-28 into dev
Reviewed-on: #5
|
2025-07-25 18:50:19 +09:00 |
|
|
|
dd559629ab
|
dev-manhph1-screen18-19-21-28
|
2025-07-25 18:11:31 +09:00 |
|
|
|
d45d141c3c
|
Update 2507
|
2025-07-25 17:59:38 +09:00 |
|
|
|
1453e75f9a
|
Merge pull request 'Update to original menu' (#4) from dev-nghiantt-menu into dev
Reviewed-on: #4
|
2025-07-25 16:04:04 +09:00 |
|
|
|
7227d5d56c
|
Update to original menu
|
2025-07-25 12:36:03 +09:00 |
|
