|
d6dd66c4b3
|
fix bugs 47, 145
|
2025-08-11 11:51:28 +07: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 |
|
|
e4331ad79f
|
Merge pull request 'fix bug screen 10' (#42) from dev-dungtv-0807 into dev
Reviewed-on: #42
|
2025-08-07 11:37:15 +09:00 |
|
|
8c7a8d5b29
|
resolve commit code
|
2025-08-07 09:36:18 +07:00 |
|
|
140f73814f
|
update
|
2025-08-07 11:29:24 +09:00 |
|
|
b53ce8bd83
|
refactor code
|
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
|
2025-08-07 11:23:58 +09:00 |
|
|
f715405ad2
|
Merge pull request 'dev-trungvq7-0729' (#40) from dev-trungvq7-0729 into dev
Reviewed-on: #40
|
2025-08-07 10:58:23 +09:00 |
|
|
f80bfc5c71
|
fix bug screen 10
|
2025-08-07 08:37:59 +07:00 |
|
|
56607d0770
|
update code
|
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
|
2025-08-06 19:03:14 +09:00 |
|
|
2cf00c0880
|
update code fixbug
|
2025-08-06 19:02:19 +09:00 |
|
|
9155a2b55e
|
commit 0608
|
2025-08-06 19:00:29 +09:00 |
|
|
484d8879aa
|
Merge pull request 'fix bugs' (#39) from dev-dungtv-0806 into dev
Reviewed-on: #39
|
2025-08-06 18:50:46 +09:00 |
|
|
38585f7b4f
|
hotfix layout
|
2025-08-06 16:43:12 +07:00 |
|
|
b0ad70d33e
|
fix bugs
|
2025-08-06 16:31:44 +07:00 |
|
|
3f89707a01
|
Merge pull request 'fixbugs grid' (#38) from dev-dungtv-0805 into dev
Reviewed-on: #38
|
2025-08-06 12:13:45 +09:00 |
|
|
a4007d5697
|
resolve comment
|
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
|
2025-08-06 09:27:47 +07:00 |
|
|
550659475f
|
Merge pull request 'fix bug 18 33 34' (#37) from dev-manhph1-figbug into dev
Reviewed-on: #37
|
2025-08-06 11:27:22 +09:00 |
|
|
4a7077336d
|
resolve confict
|
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
Reviewed-on: #36
|
2025-08-06 10:32:48 +09:00 |
|
|
bf6d03df63
|
fixbugs grid
|
2025-08-05 17:28:12 +07:00 |
|
|
8cadade514
|
fix bug 18 33 34
|
2025-08-05 15:00:22 +07:00 |
|
|
f929ad2c28
|
Update tooltip s4 + add view button to switch page
|
2025-08-05 15:29:25 +09:00 |
|
|
53b8b89e68
|
Merge pull request 'dev-trungvq7-0729' (#35) from dev-trungvq7-0729 into dev
Reviewed-on: #35
|
2025-08-05 11:15:47 +09:00 |
|
|
b32aa1d5bb
|
Merge branch 'dev' of http://218.237.212.51:30003/gitadmin/sk_fems_ui into dev-trungvq7-0729
|
2025-08-04 19:40:08 +09:00 |
|
|
8f7f5c598d
|
Update 0408
|
2025-08-04 19:39:58 +09:00 |
|
|
e96d012d17
|
Merge pull request 'fixbug' (#34) from dev-luannv24-fixbugs32s2 into dev
Reviewed-on: #34
|
2025-08-04 19:01:26 +09:00 |
|
|
efee1098ba
|
Merge pull request 'dev-manhph1-figbug' (#33) from dev-manhph1-figbug into dev
Reviewed-on: #33
|
2025-08-04 18:56:50 +09:00 |
|