Commit graph

1465 commits

Author SHA1 Message Date
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e39cce92c3 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 1m22s
2026-02-09 16:35:28 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
43d6a7c69d Merge branch 'develop' into dev 2026-02-09 16:35:20 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
e6cc3142c5 fix:getReport 2026-02-09 16:34:20 +07:00
d149e3b461 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m9s
* develop:
  fix verify email
2026-02-06 10:17:41 +07:00
4b40d051e0 fix verify email 2026-02-06 10:17:18 +07:00
0f5d8d08c8 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m21s
* develop:
  fix:add fiedl email phone
  fix: move menuList To Store
  fix: edit email
  fix
  feat/issue
2026-02-04 13:37:31 +07:00
c86a4760e4
Merge pull request #232 from Frappet/feat/issue
feat/issue
2026-02-04 13:33:53 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
2b3df6368c fix:add fiedl email phone 2026-02-04 13:02:18 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6d6ad6ef52 fix: move menuList To Store 2026-01-30 16:03:09 +07:00
85738041cf Merge branch 'develop' into feat/issue
* develop:
  fix: edit email
  fix:tooltip card organization-chart
  fix: delete import defineProps
  fix:disable organization-chart
  ปิดตารางประวัติตำแหน่งไปก่อน
  ปิดไม่แสดงข้อมูลตำแหน่งและเงินเดือน
  feat: add position and salary review

# Conflicts:
#	src/api/org/api.org.ts
2026-01-30 14:58:25 +07:00
46709c263d fix: edit email 2026-01-30 14:56:24 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
6cfb939a8d Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s
2026-01-29 12:07:49 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
f3449c3786 fix:tooltip card organization-chart 2026-01-29 12:06:59 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
49b3b67edd fix: delete import defineProps 2026-01-29 11:34:16 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b35d2bb44c Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m28s
2026-01-29 11:26:22 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
c61edb3863 fix:disable organization-chart 2026-01-29 11:25:58 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
7484e94aa5 fix 2026-01-28 16:13:36 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
46d5fab4e3 feat/issue 2026-01-28 13:27:14 +07:00
c4fbbd535e Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
* develop:
  ปิดตารางประวัติตำแหน่งไปก่อน
2026-01-27 16:49:05 +07:00
23cecba756 ปิดตารางประวัติตำแหน่งไปก่อน 2026-01-27 16:48:52 +07:00
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