Commit Graph

230 Commits

Author SHA1 Message Date
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 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 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 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 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
mohammed-alkhazrji 0f02f5147e get endpoin request employee and mission 2025-05-18 11:30:02 +03:00
SamirLADOUI-sa 728ed37199
Merge pull request #2917 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-04-28 16:18:34 +01:00
Esraa-Exp c5fa53ca9d attendance aone in employee 2025-04-24 18:07:49 +02:00
Bakry f7e1c9fecc fix gosi sanad 2025-02-13 11:22:31 +03:00
SamirLADOUI-sa 77b7badf97
Merge pull request #2377 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-02-12 15:19:27 +01:00
Samir Ladoui 42d916e27b [FIX] odex_mobile: get back restrictions single sign in 2025-02-12 15:18:09 +01:00
SamirLADOUI-sa 3ad8bd67db
Merge pull request #2370 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-02-12 15:06:56 +01:00
Samir Ladoui 3ea8fab104 [FIX] odex_mobile: remove instruction that makes an attachment public 2025-02-12 15:04:39 +01:00
SamirLADOUI-sa c10a8bdda1
Merge pull request #2341 from expsa/dev_odex25_mobile
Dev odex25 mobile
2025-02-10 10:24:54 +01:00
Samir Ladoui bc18b380e3 [UPD] odex_mobile: possibility to create multiple sign in 2025-02-10 10:18:08 +01:00
SamirLADOUI-sa 8a16b65099
Merge pull request #1825 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-11-25 08:08:14 +01:00
Mazen Abdo f6eb243701 mobile id = 2 2024-11-21 15:30:10 +02:00
Samir Ladoui 5ed981fb4a [UPD] odex_web_app: add feature multiple databases 2024-11-12 15:30:19 +01:00
SamirLADOUI-sa c5d3f0cc9c
Merge pull request #1735 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-11-11 08:58:22 +01:00
Samir Ladoui 0cbaf8c1c1 [UPD] odex_mobile: add feature permission type 2024-11-06 14:44:50 +01:00
SamirLADOUI-sa 9766d12648
Merge pull request #1643 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-28 13:27:18 +01:00
Samir Ladoui 8b56d364e6 [FIX] odex_mobile: employee access 2024-10-28 13:24:07 +01:00
SamirLADOUI-sa c4e2e6ef64
Merge pull request #1634 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-27 13:39:01 +01:00
Samir Ladoui 9b5dc5a900 [UPD] odex_mobile: add jwt expire days configuration 2024-10-27 13:33:36 +01:00
SamirLADOUI-sa 46b0fba02c
Merge pull request #1613 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-24 10:07:40 +01:00
Samir Ladoui ca1971246c [FIX] odex_mobile: use token instead of auth user 2024-10-24 09:50:52 +01:00
SamirLADOUI-sa 816533a6ae
Merge pull request #1606 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-23 14:31:29 +01:00
Samir Ladoui 8374ee1733 [FIX] odex_mobile: reset last_active_time 2024-10-23 09:09:11 +01:00
Samir Ladoui ce32cbbc45 [UPD] odex_mobile: add app close timeout 2024-10-22 13:46:15 +01:00
eslam e27375a60b
Merge pull request #1524 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-13 14:22:43 +03:00
eslamabady 01a32a4d77 fix 2024-10-13 14:09:11 +03:00
eslam 9dbf1b5957
Merge pull request #1486 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-09 10:31:34 +03:00
eslamabady 564d314d00 fix-refuse 2024-10-09 10:19:21 +03:00
eslam a8c5b78928
Merge pull request #1465 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-07 14:25:50 +03:00
eslamabady 648953d22a fix 2024-10-07 14:21:20 +03:00
eslam c682ecbbf4
Merge pull request #1457 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-07 10:36:03 +03:00
eslamabady 906fdb4aa8 fix-duplicate 2024-10-07 01:51:27 +03:00
eslamabady a5038cf60a updtate-workflow 2024-10-07 01:50:34 +03:00
bakry 63ae0167a6
Merge pull request #1426 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-03 15:11:49 +03:00
Bakry 317aba1c37 fix attendance 2024-10-03 15:02:36 +03:00
Bakry a6970a6f4a fix attendance 2024-10-03 14:29:11 +03:00
Bakry 4f9497ab7c Merge branch 'dev_odex25_mobile' of https://github.com/expsa/odex25-standard-modules into bakry_mobile 2024-10-03 14:16:06 +03:00
Bakry 10cd3cac61 fix attendance 2024-10-03 14:14:15 +03:00
Bakry b28afaa627 fix attendance 2024-10-03 14:10:07 +03:00
eslam fa1a0d9e04
Merge pull request #1396 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-10-02 15:14:02 +03:00
eslamabady a49c4e019f fix notification 2024-10-02 15:02:22 +03:00
zainab2097 fd5ed064c0
Merge pull request #1267 from expsa/dev_odex25_mobile
Update mail_activity.py
2024-09-24 13:55:51 +03:00
zainab2097 a3e6a37c1b
Update mail_activity.py 2024-09-24 13:54:46 +03:00
eslam 02a15556a9
Merge pull request #1266 from expsa/dev_odex25_mobile
Dev odex25 mobile
2024-09-24 13:20:41 +03:00
eslamabady 812006061f mobile notification 2024-09-24 11:26:25 +03:00
eslamabady 056a3b3a87 fix 2024-09-22 18:04:10 +03:00
eslamabady c7a27501c3 fix 2024-09-22 16:47:37 +03:00
eslamabady bb2eacea9b fix 2024-09-22 16:46:01 +03:00
eslamabady 7635f89681 fix 2024-09-22 15:29:00 +03:00
eslamabady 9ba29268d1 fix 2024-09-11 12:01:16 +03:00
eslam abc593628a
Merge branch 'preprod_odex25_mobile' into dev_odex25_mobile 2024-09-11 11:16:39 +03:00
eslamabady 3c58229e3c fix date 2024-09-11 10:30:16 +03:00
eslamabady 35308f77a8 fix date 2024-09-11 10:29:07 +03:00
eslamabady 5874c85e32 fix date 2024-09-11 10:26:17 +03:00
eslamabady 73737b2ed9 fix del 2024-09-10 12:24:17 +03:00
Samir Ladoui 5bccc54707 [FIX] odex_web_app: exclude message type user notification 2024-09-09 13:51:04 +01:00
Samir Ladoui 02bfe1c837 [FIX] odex_web_app: firebase api body 2024-09-08 15:22:49 +01:00
Samir Ladoui e42a8799f8 [UPD] odex_web_app: firebase changed documentation 2024-09-08 14:35:27 +01:00
Samir Ladoui b6716bab0c [FIX] odex_web_app 2024-09-08 10:49:36 +01:00
Samir Ladoui c77053d27e [FIX] odex_web_app: get all notifications (activity, message, followers) 2024-09-08 10:23:00 +01:00
eslamabady 747afa7da6 fix 2024-09-04 15:58:53 +03:00
eslamabady 1fc34895b0 fix company 2024-08-26 15:32:44 +03:00
eslamabady 62fd9448e2 fix version 2024-08-25 09:11:08 +03:00
eslam 66ff733f0e
Merge pull request #868 from expsa/fix-reset-password
fix reset password
2024-08-22 10:08:36 +03:00
eslamabady a998de3201 fix reset password 2024-08-22 09:54:57 +03:00
eslam 2ea3b17297
Merge pull request #866 from expsa/fix-reset-password
fix reset password
2024-08-22 09:52:15 +03:00
eslamabady 4108086710 fix reset password 2024-08-22 01:11:18 +03:00
Bakry 8824fb4a2d Merge remote-tracking branch 'origin/dev_odex25_mobile' into dev_odex25_mobile 2024-08-14 16:51:46 +03:00
odex af3727091a [IMP] FIX CALA HOLDAYS DURATION 2024-08-14 13:36:54 +03:00
odex 180e7aa233 [IMP] repalce file data api 2024-08-13 12:31:17 +03:00
odex 31158c087e [IMP] repalce file data api 2024-08-13 12:02:17 +03:00
Bakry 43a591fb56 Merge remote-tracking branch 'origin/dev_odex25_mobile' into dev_odex25_mobile 2024-08-08 14:35:04 +03:00
odex 2dd68ec76e fix bug 2024-08-08 13:37:53 +03:00
Bakry d02e52c2cd Merge remote-tracking branch 'origin/dev_odex25_mobile' into dev_odex25_mobile 2024-08-08 13:06:08 +03:00
AHIDev 7e6f7d37b6 [UPD] terms of use & privacy template 2024-08-07 18:48:35 +04:00
odex ca1f657eb2 [FIX] fix domaine 2024-08-07 16:43:47 +03:00
Bakry 75851e341e Merge remote-tracking branch 'origin/dev_odex25_mobile' into dev_odex25_mobile 2024-08-05 11:45:35 +03:00
odex 8b444e389d [FIX] fix trans 2024-08-04 11:45:50 +03:00
odex 9a9c41abe7 [FIX] fix data time new end month 2024-08-04 11:21:37 +03:00
odex d0aac9d941 [FIX] fix view notifaction 2024-08-04 11:14:46 +03:00
Bakry aba4745ecc Merge remote-tracking branch 'origin/dev_odex25_mobile' into dev_odex25_mobile 2024-08-04 10:54:52 +03:00
odex 95eff02e7c fix bug 2024-08-01 11:22:00 +03:00
odex aa83a200e4 fix bug 2024-08-01 11:12:51 +03:00
odex 0f4c47c417 add month data in attandec 2024-07-31 15:45:27 +03:00
odex f0994d7f0f fix chanhe password 2024-07-30 12:00:54 +03:00
odex 07775e6682 add some data api get attantc 2024-07-29 17:59:37 +03:00
Bakry 06f41542d3 fix 2024-07-29 11:07:31 +03:00
odex 14ea99263b fix 2024-07-21 16:56:23 +03:00
odex d1a6f09ccb fix 2024-07-21 16:17:10 +03:00
odex 06c6b3e215 fix 2024-07-21 13:18:25 +03:00
odex 8c5804ba22 fix 00100 2024-07-21 12:37:21 +03:00