Commit graph

1445 commits

Author SHA1 Message Date
d009c17e07 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s
* develop:
  ปิดไม่แสดงข้อมูลตำแหน่งและเงินเดือน
2026-01-27 16:46:11 +07:00
f89857e6cc ปิดไม่แสดงข้อมูลตำแหน่งและเงินเดือน 2026-01-27 16:45:37 +07:00
2cef4b4a2f Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m4s
* develop:
  feat: add position and salary review
2026-01-27 16:22:59 +07:00
9f5d1f7913 feat: add position and salary review 2026-01-27 16:21:25 +07:00
8f3b72b8be Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m2s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user:
2026-01-23 10:11:24 +07:00
12d2b23ede Merge branch 'develop' into dev
* develop:
  fix:calculateDurationYmd
2026-01-23 10:11:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3ac5cb3a06 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m6s
2026-01-22 18:13:09 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
226469dd85 fix:calculateDurationYmd 2026-01-22 18:12:52 +07:00
97d3da0cf7 Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m11s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user:
2026-01-19 12:40:55 +07:00
8950f509d2 Merge branch 'develop' into dev
* develop:
  fix(leave):display_dateLeave
2026-01-19 12:40:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b0dc2aa449 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m13s
2026-01-19 11:15:15 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3f1ce284e3 fix(leave):display_dateLeave 2026-01-19 11:14:50 +07:00
72d0989fcc Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m4s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user:
2026-01-13 18:47:49 +07:00
510182765a Merge branch 'develop' into dev
* develop:
  fix:function removeDuplicateWords
2026-01-13 18:47:44 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
95769adf87 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m8s
2026-01-12 14:47:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ef04a94a69 fix:function removeDuplicateWords 2026-01-12 14:47:34 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2422ea3a5d Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 58s
2025-12-09 09:31:43 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6765e5d90b fix(scholarship):fundTypeOp 2025-12-09 09:24:51 +07:00
c199fb3134 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
* develop:
  fix: leave commander position
2025-12-08 17:44:46 +07:00
9176cf4fa7 fix: leave commander position 2025-12-08 17:43:59 +07:00
81cd297193 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
* develop:
  fix
2025-12-03 16:10:29 +07:00
1542ff854e
Merge pull request #231 from Frappet/fix/resetpass
fix
2025-12-03 16:09:25 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
de82f0ad04 fix 2025-12-03 15:47:43 +07:00
b658413810 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
* develop:
  feat:resetpass
2025-12-02 17:23:22 +07:00
e9be4aff8f
Merge pull request #230 from Frappet/feat/resetPass
feat:resetpass
2025-12-02 17:10:30 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
ca8851f945 feat:resetpass 2025-12-02 10:45:27 +07:00
25b5715a9d Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m17s
* develop:
  แก้ไฟล์ "ก.พ.7/ก.ก.1" เป็น "ทปอ. สามัญ" เฉพาะที่เป็น ทะเบียนประวัติอิเล็กทรอนิกส์
2025-11-17 16:07:59 +07:00
be7f116b99 แก้ไฟล์ "ก.พ.7/ก.ก.1" เป็น "ทปอ. สามัญ" เฉพาะที่เป็น ทะเบียนประวัติอิเล็กทรอนิกส์ 2025-11-17 16:06:25 +07:00
8c7ba564dd Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user:
2025-10-31 16:24:16 +07:00
d9f0b214b5 Merge branch 'develop' into dev
* develop:
  fix:evaluationReqEdit
2025-10-31 16:24:11 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7bc9cd05ce Merge branch 'fix_status' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
2025-10-30 16:35:50 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
19dc153482 fix:evaluationReqEdit 2025-10-30 16:35:23 +07:00
7f13dabaca Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m0s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-user:
2025-10-29 15:18:22 +07:00
516d8a1469 Merge branch 'develop' into dev
* develop:
  fix:display fullname
2025-10-29 15:18:17 +07:00
87a7f097dd
Merge pull request #229 from Frappet/fix/kpi
fix:display fullname
2025-10-29 15:17:32 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
79fbab0f5f Merge branch 'fix/kpi' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m1s
2025-10-28 17:28:19 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b1d166b55a fix:display fullname 2025-10-28 17:26:36 +07:00
85ab43cb1f Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
* develop:
  fix:display prefix
2025-10-21 12:03:54 +07:00
bdfef9c31d
Merge pull request #228 from Frappet/fix/registry
fix:display prefix
2025-10-16 09:43:04 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
3a627db704 fix:display prefix 2025-10-15 17:14:14 +07:00
a720984473 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
* develop:
  fix(scholarship)delete codeComment
  fix(scholarship):display budgetSourceOther
  fix(leave) : bug watch
  fix(leave):bug watch
  fix:add function calculateFiscalYear
2025-10-14 12:45:07 +07:00
f9a5c4e88f
Merge pull request #227 from Frappet/add_budgetSourceOther
ระบบพัฒนาบุคลากร >> ทุนกาารศึกษา/ฝึกอบรม
2025-10-09 11:03:39 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c0065d618f fix(scholarship)delete codeComment 2025-10-08 17:50:35 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
df91679357 fix(scholarship):display budgetSourceOther 2025-10-08 17:44:03 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
8d22f98004 fix(leave) : bug watch 2025-10-07 14:18:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7175fac96b fix(leave):bug watch 2025-10-07 10:52:23 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
27280c393f fix:add function calculateFiscalYear 2025-10-02 13:21:41 +07:00
27ef434b22 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m25s
* develop:
  fix(retire): delete style width columns
  fix(leave):close sort status
2025-09-30 16:26:25 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
72aa6f44ac fix(retire): delete style width columns 2025-09-26 17:19:46 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
d3ce230d93 fix(leave):close sort status 2025-09-17 09:27:59 +07:00