|
|
cc128ccbb9
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 4m2s
* develop:
add: leaveCount in permission leave
|
2026-02-05 12:16:32 +07:00 |
|
|
|
91c870955b
|
add: leaveCount in permission leave
|
2026-02-05 12:16:18 +07:00 |
|
|
|
1da61d9be9
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 4m10s
* develop:
fix: upload file
|
2026-02-05 11:07:55 +07:00 |
|
|
|
906c6066e3
|
fix: upload file
|
2026-02-05 11:06:10 +07:00 |
|
|
|
13c14c7382
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 5m3s
* develop:
issue: add menu issue
|
2026-02-04 21:49:07 +07:00 |
|
|
|
af54914bbb
|
issue: add menu issue
|
2026-02-04 21:48:48 +07:00 |
|
|
|
d25d4a8213
|
Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
Build & Deploy on Dev / build (push) Successful in 5m44s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
|
2026-02-04 21:05:43 +07:00 |
|
|
|
4d65ed9991
|
Merge branch 'develop' into dev
* develop:
fix(registry-officer):add btn delete btn edit
fix:add btn delete development
|
2026-02-04 21:05:27 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
49bcb5673a
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 2m40s
|
2026-02-04 16:29:24 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
7daf29d974
|
fix(registry-officer):add btn delete btn edit
|
2026-02-04 16:29:08 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
e5a44f4b64
|
Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
Build & Deploy on Dev / build (push) Successful in 2m30s
|
2026-02-04 15:06:45 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
6737b5b5f1
|
Merge branch 'develop' into dev
|
2026-02-04 15:06:37 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
488e959809
|
fix:add btn delete development
|
2026-02-04 15:06:19 +07:00 |
|
|
|
56b1d800ef
|
Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
Build & Deploy on Dev / build (push) Successful in 2m35s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
|
2026-02-04 13:44:46 +07:00 |
|
|
|
c9e5f1cd71
|
Merge branch 'develop' into dev
* develop:
fix:add fiedl email phone
fix: show workflow EMP
fix:disable radio Digital
fix:profileId To citizenId
fix: form upload Attachment
fix:bug
fix:btn position
fix: img
fix:interface
feat:page issues
fix:org name
fix:path upload
fix
fix: max-file-size="5000000"
feat:issue
|
2026-02-04 13:44:40 +07:00 |
|
|
|
8646e76d70
|
Merge pull request #1538 from Frappet/feat/issue
feat:issue
|
2026-02-04 13:44:04 +07:00 |
|
|
|
e3f35a189c
|
Merge branch 'develop' into feat/issue
* develop:
fix: show workflow EMP
fix:disable radio Digital
fix:profileId To citizenId
fix: form upload Attachment
fix:bug
fix: active act org level 0 only
add: บันทึกรักษาการในตำแหน่ง (owner only)
fix: convertCommandCodeName columns commandCode
test
fix:default profileAvatar
fix:show btn delete avatar active
fix: approveCheck
fix: statusCheck PENDING
fix(leave):approveCheck logic for commander approval status
fix: disabled organization view
fix(indicator-plan):fix nodeDnaId
fix: title by issue #2156 ปรับระดับชั้นงาน-ย้ายลูกจ้าง (ข้อความเมนูไม่เหมือนกัน)
fix(timestamp):clear_rowData
ปิดปุ่มแก้ไข และเพิ่มของประวัติตำแหน่ง เงินเดือน แก้ได้แค่ owner เท่านั้น
# Conflicts:
# src/api/02_organizational/api.organization.ts
|
2026-02-04 13:43:52 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
5c7be2e4a8
|
fix:add fiedl email phone
|
2026-02-04 13:01:41 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
a40fe7605e
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 3m0s
|
2026-02-03 16:36:19 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
2c25c2838e
|
fix: show workflow EMP
|
2026-02-03 16:35:42 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
6ad94b760c
|
fix:disable radio Digital
|
2026-02-03 16:34:16 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
ae4e874f42
|
fix:profileId To citizenId
|
2026-02-03 16:23:08 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
79d1a14ec4
|
fix: form upload Attachment
|
2026-02-03 15:08:24 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
b1609de979
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 2m47s
|
2026-02-03 10:58:15 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
a8c3b77bce
|
fix:bug
|
2026-02-03 10:57:32 +07:00 |
|
|
|
d7bdd82b85
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 2m34s
* develop:
fix: active act org level 0 only
|
2026-02-02 17:21:11 +07:00 |
|
|
|
e1969db62e
|
fix: active act org level 0 only
|
2026-02-02 17:20:57 +07:00 |
|
|
|
67066797fd
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 2m42s
* develop:
add: บันทึกรักษาการในตำแหน่ง (owner only)
|
2026-02-02 17:06:03 +07:00 |
|
|
|
81fcb1253f
|
add: บันทึกรักษาการในตำแหน่ง (owner only)
|
2026-02-02 17:05:47 +07:00 |
|
|
|
57a28a2b8d
|
Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt into dev
Build & Deploy on Dev / build (push) Successful in 5m55s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-mgt:
fix:test build
|
2026-01-31 12:56:56 +07:00 |
|
|
|
8d4a9d8c72
|
Merge branch 'develop' into dev
* develop:
fix: convertCommandCodeName columns commandCode
test
fix:default profileAvatar
fix:show btn delete avatar active
fix: approveCheck
fix: statusCheck PENDING
fix(leave):approveCheck logic for commander approval status
|
2026-01-31 12:56:50 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
72f3cdcdc0
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 3m48s
|
2026-01-30 18:08:18 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
28fa6fbaf7
|
fix: convertCommandCodeName columns commandCode
|
2026-01-30 17:55:09 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
6676113c2c
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Failing after 10s
# Conflicts:
# src/modules/04_registryPerson/views/listView.vue
|
2026-01-30 17:41:41 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
444a150fd2
|
test
|
2026-01-30 17:41:09 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
e80e4d6dfd
|
fix:test build
Build & Deploy on Dev / build (push) Failing after 1m47s
|
2026-01-30 17:35:23 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
0252d7d7f2
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Failing after 2m14s
|
2026-01-30 15:53:19 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
af588e0e54
|
fix:default profileAvatar
|
2026-01-30 15:52:46 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
0ca65c44a2
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 3m6s
|
2026-01-30 14:52:27 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
2fc2625699
|
fix:show btn delete avatar active
|
2026-01-30 14:51:39 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
a0628caf74
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 3m21s
|
2026-01-30 10:26:51 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
802e63da13
|
fix: approveCheck
|
2026-01-30 10:25:43 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
00304b3bc8
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 3m53s
|
2026-01-30 09:41:43 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
6280ab2e17
|
fix: statusCheck PENDING
|
2026-01-30 09:41:24 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
aff177e2f1
|
fix(leave):approveCheck logic for commander approval status
|
2026-01-30 09:29:31 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
3e568267ba
|
fix:btn position
|
2026-01-29 14:58:29 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
ffce0164b4
|
fix: img
|
2026-01-29 14:56:51 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
c6c1fe93c1
|
fix:interface
|
2026-01-29 14:07:54 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
9c9fb561b5
|
Merge branch 'develop' into dev
Build & Deploy on Dev / build (push) Successful in 2m58s
|
2026-01-29 12:03:27 +07:00 |
|
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
|
b82b489a8b
|
fix: disabled organization view
|
2026-01-29 12:03:08 +07:00 |
|