Commit graph

7533 commits

Author SHA1 Message Date
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b7329370d6 fix: dialog pagination 2025-12-06 13:50:23 +07:00
e76ac8184d Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m27s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
2025-12-03 09:57:44 +07:00
dff885b361 Merge branch 'develop' into dev
* develop:
  fix: commandTypeCodeArray  shortCode === OCT
  fix:command-type-code-array
  fix
2025-12-03 09:57:37 +07:00
81cf45756d
Merge pull request #1526 from Frappet/fix/salary
fix:command-type-code-array
2025-12-03 09:55:33 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
628befff93 fix: commandTypeCodeArray shortCode === OCT 2025-12-03 09:54:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
626cc338f8 fix:command-type-code-array 2025-12-03 09:33:58 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
de035b2f8a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m7s
2025-12-02 17:43:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6ce1d01ee4 fix 2025-12-02 17:43:04 +07:00
d544d673e0 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m16s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
2025-12-02 17:22:21 +07:00
f737fe26b1 Merge branch 'develop' into dev
* develop:
  roll back leave fix commander
  fix
  fix
  ระบบลา: ไม่บังคับเลือกผู้บังคับบัญชา
  fix:education
  fix: api
  fix: probation api
  fix(probation):status
  fix
  fix(probation): statusProbationMain
  fix(leave-report) diable  btn search
2025-12-02 17:22:16 +07:00
5cf6edd2f2 roll back leave fix commander 2025-12-02 17:14:30 +07:00
734c688e2a
Merge pull request #1525 from Frappet/fix/discipline
fix
2025-12-02 17:09:02 +07:00
4c227ac8da
Merge pull request #1524 from Frappet/fix/develop
fix
2025-12-02 17:06:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cac4ff2bfa fix 2025-12-02 16:40:08 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e51db11fe0 fix 2025-12-02 13:28:58 +07:00
ffa3631986 ระบบลา: ไม่บังคับเลือกผู้บังคับบัญชา 2025-12-01 12:03:02 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c08657a94c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m13s
2025-11-28 15:21:57 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
cb30bc0c5e fix:education 2025-11-28 15:12:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
717b486337 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m17s
2025-11-28 13:07:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b036e80092 fix: api 2025-11-28 12:02:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
699997401e fix: probation api 2025-11-28 11:39:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
23573e00eb Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m19s
2025-11-28 10:03:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
663c4a9262 fix(probation):status 2025-11-28 10:02:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b20d0fbce6 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m4s
2025-11-27 15:55:03 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
74f8363001 fix 2025-11-27 15:54:33 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c0baab29a8 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m19s
2025-11-27 15:45:48 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e686ee5019 fix(probation): statusProbationMain 2025-11-27 15:44:42 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
800d8d6cae Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m4s
2025-11-27 15:40:01 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
094f227bf8 fix(leave-report) diable btn search 2025-11-27 15:39:30 +07:00
3458ae6331 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m18s
* develop:
  remove editor toolbar
2025-11-26 17:58:39 +07:00
d6a6883f95 remove editor toolbar 2025-11-26 17:57:48 +07:00
6063f21e25 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m20s
* develop:
  ปิด/เปิด ให้ดาวน์โหลดใบสมัครสรรหา
2025-11-26 17:41:29 +07:00
55ab6e157f ปิด/เปิด ให้ดาวน์โหลดใบสมัครสรรหา 2025-11-26 17:39:18 +07:00
78924b4d71 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m0s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
  fix(probation):fix min-width columns organization
2025-11-25 17:21:26 +07:00
0d78dbf425 Merge branch 'develop' into dev
* develop:
  สรรหาแก้ไขวันที่สมัครให้แสดงเวลา
  fix
  fix(placement):filter
  fix(salary): status isPunish
  fix(probation): probationPersonalList  status
2025-11-25 17:21:20 +07:00
5aa48d73d3 สรรหาแก้ไขวันที่สมัครให้แสดงเวลา 2025-11-25 17:20:38 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ada4f4c010 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m49s
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2025-11-25 16:56:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d72551f90b fix 2025-11-25 16:55:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6a97b5d9f2 fix(probation):fix min-width columns organization
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m9s
2025-11-25 16:52:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
63e43d2893 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m6s
2025-11-25 15:42:45 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b5f54c05a0 fix(placement):filter 2025-11-25 15:42:07 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
5be1215ed9 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m9s
2025-11-25 11:45:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
273487cb50 fix(salary): status isPunish 2025-11-25 10:39:51 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
38fc145e93 fix(probation): probationPersonalList status 2025-11-25 09:43:44 +07:00
7ba7bb3e21 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m31s
* develop:
  fix: education placement ปีเริ่ม-สิ้นสุดการศึกษา
2025-11-24 20:30:21 +07:00
f5c09829b8 fix: education placement ปีเริ่ม-สิ้นสุดการศึกษา 2025-11-24 20:27:54 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c7aff2a1f5 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m13s
2025-11-24 17:49:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3f318941ab fix:positionLevelName 2025-11-24 17:48:40 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e32a1e7cf0 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m14s
2025-11-24 14:01:27 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
a109289e1c Noiti success 2025-11-24 14:00:46 +07:00