Commit graph

3404 commits

Author SHA1 Message Date
ccf012ee1d Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-11-12 14:40:36 +07:00
7ca6b28efa Merge branch 'develop' into adiDev 2025-11-12 14:40:10 +07:00
83de71c40c #1945 fix 2025-11-12 14:39:44 +07:00
mamoss
5029890831 check api-key 2025-11-12 01:55:06 +07:00
3195dc7c04 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-10 15:55:07 +07:00
7737f09493 update
Some checks failed
release / release (push) Failing after 8s
2025-11-10 15:54:49 +07:00
b530e08008 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-11-10 15:36:43 +07:00
9eb44d1b38 Merge branch 'develop' into adiDev 2025-11-10 15:35:54 +07:00
b329dcaa0e update clear user in org draft 2025-11-10 15:35:30 +07:00
harid
65b0979f51 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-10 14:11:16 +07:00
harid
7b84f8af7b #1831 2025-11-10 13:48:34 +07:00
be34bd265c Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:
2025-11-08 23:11:24 +07:00
a137c5eaa8 Merge branch 'develop' into dev
* develop:
  fix
  #208 and update migration
  migration
  migration
  revert
  #206
  migration
  fix
  #54
2025-11-08 23:11:18 +07:00
bf5ffcedb1 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
2025-11-07 14:06:06 +07:00
7739af7d44 fix
Some checks failed
release / release (push) Failing after 9s
2025-11-07 14:04:09 +07:00
13ed3450dd #208 and update migration 2025-11-07 13:57:03 +07:00
7d5d6bb43e migration 2025-11-07 12:30:03 +07:00
46ae229619 migration 2025-11-07 10:05:30 +07:00
harid
cb8b2cee28 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-05 10:30:17 +07:00
harid
2f73ae2874 revert 2025-11-05 10:07:22 +07:00
5d742fa8be #206
Some checks failed
release / release (push) Failing after 9s
2025-11-04 15:17:52 +07:00
6cc6bed806 migration 2025-11-04 15:16:53 +07:00
aff895b079 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
2025-11-04 10:10:21 +07:00
b1a9c77c8c fix
Some checks failed
release / release (push) Failing after 8s
2025-11-04 10:03:35 +07:00
c3197c9629 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-04 09:52:48 +07:00
999bfa7cd2 Merge branch 'develop' into adiDev
Some checks failed
release / release (push) Failing after 9s
2025-11-04 09:52:01 +07:00
ca7d2f2a75 #54 2025-11-04 09:51:33 +07:00
96e5fc3b9a Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m5s
* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:
2025-11-04 09:01:40 +07:00
4af26d19e6 Merge branch 'develop' into dev
* develop:
  update org
  fix ผู้เกษียณ ในแบบร่าง ของระบบโครงสร้างไม่ถูกปลด #1912
  migration
  migration
  update Retire Clear Org
  #1767 (#205)
  test commit
2025-11-04 09:01:34 +07:00
mamoss
536cfaa240 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-11-03 21:37:58 +07:00
mamoss
40bc95bb87 update org 2025-11-03 21:37:50 +07:00
harid
ee4bff7f50 fix ผู้เกษียณ ในแบบร่าง ของระบบโครงสร้างไม่ถูกปลด #1912 2025-11-03 18:05:29 +07:00
d6383ec2c4 Merge branch 'adiDev' into develop 2025-11-03 17:36:02 +07:00
3e6ee5d868 migration 2025-11-03 17:35:15 +07:00
mamoss
2094973dd0 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-11-03 16:15:33 +07:00
19d665fd69 migration 2025-11-03 15:57:41 +07:00
mamoss
dcff08db6f update Retire Clear Org 2025-11-03 14:51:42 +07:00
52c3260c06 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 57s
2025-11-03 11:58:43 +07:00
AdisakKanthawilang
39a1a3bbb0
#1767 (#205)
Some checks failed
release / release (push) Failing after 9s
2025-11-03 11:56:26 +07:00
f32debfbb6 test commit 2025-11-03 10:48:04 +07:00
bc481e9aaa Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org 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-api-org:
2025-10-31 16:34:21 +07:00
e4200bf2b4 Merge branch 'develop' into dev
* develop: (25 commits)
  fix + test retirement #1903, #1904, #1892
  fix employee
  fix
  fix
  add employee-temp xlsx template (report5)
  test comment all privilage validate
  test comment _workflow privilage validate
  test try catch avatar profile
  recheck script retire 30/10
  fix(ex/retirement): document
  ที่ตำแหน่งแสดงไม่ตรงกับทะเบียนประวัติ #1899 (#204)
  #1889
  feat(ExRetirment):get document
  import salary
  add api key
  #1885 update
  update timezone
  revert #1885
  #1885
  #1884
  ...
2025-10-31 16:34:16 +07:00
harid
0c523a55a4 fix + test retirement #1903, #1904, #1892 2025-10-30 18:56:03 +07:00
7bd799f26a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 55s
2025-10-30 18:12:50 +07:00
8a96794e53 fix employee 2025-10-30 18:12:31 +07:00
0e706795f2 Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 56s
2025-10-30 18:08:10 +07:00
31d7902b88 fix 2025-10-30 18:07:51 +07:00
cd3963be5a Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-10-30 17:56:22 +07:00
01a17ef323 fix 2025-10-30 17:55:36 +07:00
62f476c1fd Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
2025-10-30 17:41:12 +07:00