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 |
|
odex
|
3e05dc485f
|
fix
|
2024-07-21 12:13:25 +03:00 |
|
odex
|
26b2fe834d
|
fix
|
2024-07-21 11:57:33 +03:00 |
|
odex
|
722fcbfea5
|
fix
|
2024-07-21 11:52:13 +03:00 |
|
odex
|
41846f0b8e
|
fix
|
2024-07-21 11:32:20 +03:00 |
Elyageen
|
b1470ad2c7
|
fix bug
|
2024-07-20 22:40:39 +03:00 |
|
Elyageen
|
ba2043fbd2
|
fix bug
|
2024-07-20 22:10:22 +03:00 |
|
Elyageen
|
dd4866ee53
|
fix bug
|
2024-07-20 22:06:20 +03:00 |
|
Elyageen
|
266cd94676
|
fix bug
|
2024-07-20 21:26:57 +03:00 |
|
Elyageen
|
c0283a39d2
|
fix bug
|
2024-07-20 20:32:08 +03:00 |
|
Elyageen
|
dc40b9f28a
|
fix bug
|
2024-07-20 20:28:34 +03:00 |
|
Elyageen
|
5d3dc114c0
|
fix bug
|
2024-07-20 20:22:02 +03:00 |
|
Elyageen
|
b86e1df134
|
fix bug
|
2024-07-20 20:02:51 +03:00 |
|
Elyageen
|
be3665142a
|
fix bug
|
2024-07-20 19:28:25 +03:00 |
|
Elyageen
|
6b70528c5f
|
fix bug
|
2024-07-20 18:36:00 +03:00 |
|
Elyageen
|
8a1a07cf6c
|
fix bug
|
2024-07-20 18:28:20 +03:00 |
|
Elyageen
|
27407d4a11
|
fix bug
|
2024-07-20 15:15:29 +03:00 |
|
Elyageen
|
08e7ca1cb5
|
fix bug
|
2024-07-20 15:03:52 +03:00 |
|
Elyageen
|
fb682b9f2f
|
fix bug
|
2024-07-20 14:16:13 +03:00 |
|
Elyageen
|
bf8ecce2a7
|
fix bug
|
2024-07-20 13:57:23 +03:00 |
|
Elyageen
|
f0a62ac66b
|
fix bug
|
2024-07-20 13:41:28 +03:00 |
|
Elyageen
|
e43eb5d8da
|
fix bug
|
2024-07-20 12:54:45 +03:00 |
|
odex
|
618238b352
|
some task
|
2024-07-18 17:45:57 +03:00 |
|
odex
|
e5f05bb669
|
some task
|
2024-07-18 17:32:05 +03:00 |
|
odex
|
f9c49f43de
|
some task
|
2024-07-18 16:23:17 +03:00 |
|
odex
|
74eebd7954
|
fix is approve overtime
|
2024-07-17 16:03:16 +03:00 |
|
odex
|
85914bb37d
|
fix is approve overtime
|
2024-07-17 15:41:11 +03:00 |
|
odex
|
7998eb2e18
|
fix is approve overtime
|
2024-07-17 14:57:01 +03:00 |
|
odex
|
5163687b4b
|
fix is approve overtime
|
2024-07-17 14:43:07 +03:00 |
|
odex
|
cc71e36f60
|
fix file
|
2024-07-17 13:43:48 +03:00 |
|
odex
|
11b7e25544
|
fix file
|
2024-07-17 13:29:46 +03:00 |
|
odex
|
e81d1d68e9
|
fix some
|
2024-07-17 11:40:10 +03:00 |
|
odex
|
f008dc18ed
|
fix 001
|
2024-07-16 16:40:02 +03:00 |
|
odex
|
4503af11d3
|
fix 001
|
2024-07-16 16:12:26 +03:00 |
|
odex
|
0b7b487cf0
|
fix 001
|
2024-07-16 15:35:04 +03:00 |
|
odex
|
88075ae4a0
|
fix
|
2024-07-16 15:06:42 +03:00 |
|
odex
|
b8ab6f6a1d
|
fix leave
|
2024-07-15 14:44:30 +03:00 |
|
odex
|
96e071f7a1
|
fix leave
|
2024-07-15 14:05:31 +03:00 |
|
odex
|
d901475f56
|
fix time zone
|
2024-07-14 11:31:15 +03:00 |
|
odex
|
8e8a0ed5b6
|
Merge branch 'dev_odex25_mobile' of github.com:expsa/odex25-standard-modules into fix_api_web
|
2024-07-14 10:27:10 +03:00 |
|
odex
|
83331326c2
|
[FIX] fix some bug api
|
2024-07-14 10:26:04 +03:00 |
AbuzarExp
|
204e745f20
|
Merge pull request #176 from expsa/fix_api_web
fix some bug
|
2024-07-11 18:26:52 +03:00 |
|
odex
|
1d731161f9
|
fix some bug
|
2024-07-11 18:26:02 +03:00 |
|
AbuzarExp
|
a058380eff
|
Merge pull request #174 from expsa/fix_api_web
Fix api web
|
2024-07-11 18:18:08 +03:00 |
|
odex
|
54de749578
|
fix some bug
|
2024-07-11 18:17:29 +03:00 |
|
odex
|
7d2493cbed
|
fix some bug
|
2024-07-11 18:16:42 +03:00 |
|
odex
|
e793c9ba12
|
fix some bug
|
2024-07-11 17:33:28 +03:00 |
|
AbuzarExp
|
5dad3de097
|
Merge pull request #172 from expsa/fix_api_web
fix some bug
|
2024-07-11 17:09:37 +03:00 |
|
odex
|
647998d8fa
|
fix some bug
|
2024-07-11 17:08:01 +03:00 |
|
AbuzarExp
|
be41df14d4
|
Merge pull request #166 from expsa/fix_api_web
fix some bug
|
2024-07-11 16:53:28 +03:00 |
|
odex
|
586dab1293
|
fix some bug
|
2024-07-11 16:51:21 +03:00 |
|
AbuzarExp
|
4e00c90c75
|
Merge pull request #157 from expsa/fix_api_web
fix api 001
|
2024-07-11 12:15:10 +03:00 |
|
odex
|
a00ba03604
|
fix api 001
|
2024-07-11 12:13:55 +03:00 |
|
AbuzarExp
|
5ab3a57af4
|
Merge pull request #155 from expsa/fix_api_web
fix api 001
|
2024-07-11 11:30:01 +03:00 |
|
odex
|
964b74ebdc
|
fix api 001
|
2024-07-11 11:29:28 +03:00 |
|
AbuzarExp
|
b9fcc57f7e
|
Merge pull request #151 from expsa/fix_api_web
fix api
|
2024-07-10 15:06:48 +03:00 |
|
odex
|
a7b4176a90
|
fix api
|
2024-07-10 15:05:13 +03:00 |
|
AbuzarExp
|
1352fc4ae9
|
Merge pull request #147 from expsa/fix_api_web
fix api
|
2024-07-10 15:03:30 +03:00 |
|
odex
|
ca7799f29e
|
fix api
|
2024-07-10 14:58:30 +03:00 |
|
Samir Ladoui
|
15a785fcfe
|
[UPD] odex_web_app: send title in notification to the firebase
|
2024-07-09 13:58:37 +01:00 |
|
odex
|
907a242328
|
fix deleat
|
2024-07-08 15:47:45 +03:00 |
|
odex
|
04d6d16138
|
fix
|
2024-07-08 14:39:38 +03:00 |
|
odex
|
e932f0c730
|
fix
|
2024-07-08 14:38:06 +03:00 |
|
odex
|
5fee16f23a
|
[FIX] add in hr holiday refues in api hr
|
2024-07-08 12:41:27 +03:00 |
|
Samir Ladoui
|
3691313bb5
|
[FIX] odex_web_app: conflicts on message_post function
|
2024-07-08 10:06:16 +01:00 |
|
Samir Ladoui
|
87c463c039
|
[FIX] odex_web_app: conflicts between 2 modules on user_push_notification function
|
2024-07-07 15:38:23 +01:00 |
|
odex
|
b1ee493681
|
fix api hr mobile
|
2024-07-07 17:11:11 +03:00 |
|
odex
|
d038e301d6
|
fix api hr mobile
|
2024-07-07 16:56:04 +03:00 |
|
Samir Ladoui
|
1722e938f7
|
[FIX] odex_web_app: ifix fcm api body
|
2024-07-07 09:19:54 +01:00 |
|
odex
|
0a308af63e
|
fix
|
2024-07-04 17:46:27 +03:00 |
|
odex
|
574bd20c64
|
[FIX] fix api
|
2024-07-04 17:39:34 +03:00 |
|
odex
|
5cb3fbc3b5
|
[FIX] fix api
|
2024-07-04 17:32:08 +03:00 |
|
Samir Ladoui
|
e1d6b70a57
|
[FIX] odex_web_app: import required fields
|
2024-07-04 15:21:50 +01:00 |
|
Samir Ladoui
|
666892afa0
|
[UPD] odex_web_app: add apis
|
2024-07-04 14:54:10 +01:00 |
|
Samir Ladoui
|
6c7075ba2b
|
[FIX] odex_web_app: add access_token model
|
2024-07-04 14:53:58 +01:00 |
|
Samir Ladoui
|
3b63ff52d5
|
ignore caches
|
2024-07-04 09:33:40 +01:00 |
|
Samir Ladoui
|
4f58cef386
|
[UPD] odex_web_app: send notification to firebase when a user received a message
|
2024-07-04 09:33:13 +01:00 |