|
|
dcdcf772ce
|
fixbug screen 20.4
|
2025-07-31 16:18:44 +07:00 |
|
|
|
40addfe639
|
fixbug active menu item
|
2025-07-31 15:05:33 +07:00 |
|
|
|
238fdb5fc5
|
remove console
|
2025-07-31 14:18:29 +07:00 |
|
|
|
bfe206a2bf
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-dungtv-0731
|
2025-07-31 13:52:37 +07:00 |
|
|
|
a6e8e6cf86
|
fixbug screen 20
|
2025-07-31 13:52:28 +07:00 |
|
|
|
f9643f46a0
|
Merge pull request 'Commit 3107' (#27) from dev-trungvq7-0729 into dev
Reviewed-on: #27
|
2025-07-31 15:39:36 +09:00 |
|
|
|
056d1a1e17
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-07-31 15:03:33 +09:00 |
|
|
|
a58062a7b7
|
Commit 3107
|
2025-07-31 14:54:02 +09:00 |
|
|
|
44077048e6
|
Merge pull request 'dev-trungvq7-0729' (#26) from dev-trungvq7-0729 into dev
Reviewed-on: #26
|
2025-07-31 14:43:43 +09:00 |
|
|
|
e32f03c9ae
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-07-31 11:33:52 +09:00 |
|
|
|
58bb7f915c
|
Update screen 30, 13, 22
|
2025-07-31 11:31:53 +09:00 |
|
|
|
a85f9f98f6
|
Merge pull request 'fix style grid' (#25) from dev-dungtv44-0730 into dev
Reviewed-on: #25
|
2025-07-31 10:49:24 +09:00 |
|
|
|
791b291c30
|
Merge pull request 'dev-luannv24-s32s17' (#24) from dev-luannv24-s32s17 into dev
Reviewed-on: #24
|
2025-07-30 19:18:37 +09:00 |
|
|
|
e6e1703942
|
update date pickker
|
2025-07-30 19:16:42 +09:00 |
|
|
|
719e7cee69
|
fix style grid
|
2025-07-30 17:09:09 +07:00 |
|
|
|
9b89a5625b
|
update code fix bug and revert screen 2
|
2025-07-30 18:34:46 +09:00 |
|
|
|
e600089f7e
|
fix bug
|
2025-07-30 18:15:08 +09:00 |
|
|
|
adbf220770
|
merge file
|
2025-07-30 18:14:21 +09:00 |
|
|
|
51b59bf4c9
|
Merge pull request 'dev-dungtv44-0730' (#23) from dev-dungtv44-0730 into dev
Reviewed-on: #23
|
2025-07-30 17:41:07 +09:00 |
|
|
|
b2e50837fd
|
update code
|
2025-07-30 16:21:52 +09:00 |
|
|
|
88b59f5f33
|
update code merge
|
2025-07-30 16:19:54 +09: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 |
|
|
|
1faf49056d
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-07-29 15:59:34 +09:00 |
|
|
|
e9ab3faa51
|
update
|
2025-07-29 15:59:32 +09: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 |
|
