Commit Graph

596 Commits

Author SHA1 Message Date
younes d5d0c0651d Display the shifts in the application based on the employee 2025-06-24 15:07:30 +01:00
younes f1cd109908 Add notifcation in mission and other request 2025-06-24 11:01:02 +01:00
kchyounes19 6cc7d407c1
Merge pull request #3597 from expsa/younes_dev_odex25_mobile
Add notifcation in mission and other request
2025-06-23 16:20:36 +01:00
younes b3c3374bb3 Add notifcation in mission and other request 2025-06-23 16:19:40 +01:00
GitHub Actions Bot 1a822b68bc Add or update prevent-invalid-branch-merges workflow 2025-06-23 18:18:03 +03:00
kchyounes19 b67759a6b0
Merge pull request #3546 from expsa/younes_dev_odex25_mobile
fix bug
2025-06-19 15:29:47 +01:00
younes bbf756ee73 fix bug 2025-06-19 15:28:29 +01:00
kchyounes19 cf7f4f7405
Merge pull request #3544 from expsa/younes_dev_odex25_mobile
fix bug
2025-06-19 14:47:42 +01:00
younes a41a0eb301 fix bug 2025-06-19 14:46:20 +01:00
شركة خبير المحدودة 0a15cc711f Update github action file 2025-06-19 10:31:00 +03:00
kchyounes19 07fae0a0d8
Merge pull request #3510 from expsa/younes_dev_odex25_mobile
Fix bug
2025-06-18 10:50:08 +01:00
younes d8cefdabe3 Fix bug 2025-06-18 10:47:42 +01:00
شركة خبير المحدودة 77195ae3ae Update github action file 2025-06-17 07:12:36 +03:00
شركة خبير المحدودة 3d5ba81054
Update production_pull_code.yml 2025-06-16 22:22:04 +03:00
شركة خبير المحدودة a54eeb6f82
Merge branch 'preprod_odex25_mobile' into dev_odex25_mobile 2025-06-16 14:37:42 +03:00
kchyounes19 c187d614f7
Merge pull request #3460 from expsa/younes_dev_odex25_mobile
Correct leave logic for mobile app
2025-06-16 11:59:07 +01:00
younes 2d9c257afe Correct leave logic for mobile app 2025-06-16 11:57:49 +01:00
شركة خبير المحدودة e79c1ccf8e
Update production_pull_code.yml 2025-06-16 11:58:27 +03:00
شركة خبير المحدودة 9898d35841 Update github action file 2025-06-16 10:49:00 +03:00
شركة خبير المحدودة 6ee5cc931a Update github action file 2025-06-16 10:47:56 +03:00
ahmed-nouri051 957836b9a0
Merge pull request #3422 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-06-03 17:26:26 +02:00
ahmed-nouri051 b2ded49372
Merge pull request #3421 from expsa/fixing-mobile
fix template hr employee
2025-06-03 17:25:19 +02:00
ahmed-nouri051 6b8aa0e316 fix template hr employee 2025-06-03 17:23:35 +02:00
kchyounes19 fb51d46d3b
Merge pull request #3414 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-06-03 12:24:48 +01:00
kchyounes19 ba40187902
Merge pull request #3413 from expsa/younes_dev_odex25_mobile
Display first and second shift attendance information in the app via …
2025-06-03 12:23:46 +01:00
younes 9efd0eef24 Display first and second shift attendance information in the app via API. 2025-06-03 12:22:36 +01:00
kchyounes19 a52f13bc47
Merge pull request #3399 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-06-02 15:20:27 +01:00
kchyounes19 6b5b45e165
Merge pull request #3398 from expsa/younes_dev_odex25_mobile
Fix bug
2025-06-02 15:19:45 +01:00
younes 8378b62791 Fix bug 2025-06-02 15:18:28 +01:00
SamirLADOUI-sa 2daccfdb8b
Merge pull request #3356 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-29 10:37:41 +01:00
SamirLADOUI-sa f80aee3e6b
Merge pull request #3355 from expsa/samir-aladawi-print-user-mobile
[UPD] odex_mobile
2025-05-29 10:37:22 +01:00
Samir Ladoui 34ce4f9e66 [UPD] odex_mobile 2025-05-29 10:36:58 +01:00
SamirLADOUI-sa abf2a29278
Merge pull request #3336 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-28 14:49:02 +01:00
SamirLADOUI-sa 0bfc8eb235
Merge pull request #3335 from expsa/samir-aladawi-add-logger-to-mobile-apis
[UPD] odex_mobile
2025-05-28 14:48:26 +01:00
Samir Ladoui 043c9c209e [UPD] odex_mobile 2025-05-28 14:47:43 +01:00
شركة خبير المحدودة d840386d9c Update github action file 2025-05-28 15:32:02 +03:00
شركة خبير المحدودة 833c822b33 Update github action file 2025-05-28 15:29:06 +03:00
mohammed-alkhazrji 4ed94b0000
Merge pull request #3333 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-28 14:56:16 +03:00
mohammed-alkhazrji 213ef0ff86
Merge pull request #3332 from expsa/salarise_endpoin
patch_mission
2025-05-28 14:55:13 +03:00
mohammed-alkhazrji 72234eb1df patch_mission 2025-05-28 14:52:41 +03:00
mohammed-alkhazrji da0ee8cfb0
Merge pull request #3310 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-27 13:02:33 +03:00
mohammed-alkhazrji 4e6853fefe
Merge pull request #3309 from expsa/salarise_endpoin
mission purpose
2025-05-27 13:01:04 +03:00
mohammed-alkhazrji 08274948c4 mission purpose 2025-05-27 13:00:04 +03:00
mohammed-alkhazrji 2a54f450f2
Merge pull request #3283 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-21 23:32:35 +03:00
mohammed-alkhazrji b356f8fdea
Merge pull request #3282 from expsa/salarise_endpoin
fix salarise endpont
2025-05-21 23:31:54 +03:00
mohammed-alkhazrji 60e3dd3d31 fix salarise endpont 2025-05-21 23:30:57 +03:00
mohammed-alkhazrji 2c851d17a2
Merge pull request #3220 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-18 17:08:52 +03:00
mohammed-alkhazrji b5155b64ad
Merge pull request #3219 from expsa/reset_pass_with_hr
make reset pass resusers and employee
2025-05-18 17:08:19 +03:00
mohammed-alkhazrji 3454dee775 make reset pass resusers and employee 2025-05-18 17:06:58 +03:00
mohammed-alkhazrji db5f2e4cba
Merge pull request #3216 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-05-18 12:59:29 +03:00