Commit Graph

562 Commits

Author SHA1 Message Date
ahmed-nouri051 91d0dcb3fb
Merge pull request #2997 from expsa/chnage-in-membership-system
add valicator membership module
2025-05-06 10:20:59 +02:00
ahmed-nouri051 13e7aef41f membership module 2025-05-06 10:18:33 +02:00
SamirLADOUI-sa 4a2c6ddc97
Merge pull request #2975 from expsa/samir-aladawi-fix-translations-conflicts
[FIX] odex25_website_event_track_gantt
2025-05-05 12:00:43 +01:00
Samir Ladoui acdd537de6 [FIX] odex25_website_event_track_gantt 2025-05-05 12:00:16 +01:00
kchyounes19 23ec64f2ef
Merge pull request #2825 from expsa/younes_dev_odex25_sales
add domain to vendors contact page
2025-04-21 14:38:01 +01:00
younes 4bbd81da7a add domain to vendors contact page 2025-04-21 14:36:46 +01:00
kchyounes19 995fda1afa
Merge pull request #2813 from expsa/younes_dev_odex25_sales
add domain to vendors contact page
2025-04-21 11:27:11 +01:00
younes cd068a987e add domain to vendors contact page 2025-04-21 11:25:17 +01:00
شركة خبير المحدودة 777cdc27bf Update github action file 2025-04-09 06:07:42 +02:00
شركة خبير المحدودة b17bfc8759
Update dev-preprod-servers.yml 2025-04-08 11:58:18 +02:00
Esraa-Exp f211ceab5a
Merge pull request #2724 from expsa/Esraa-ensan-sale_tasks
repor transaltion
2025-04-07 13:57:40 +02:00
Esraa-Exp a4c464f2e4 repor transaltion 2025-04-07 13:56:40 +02:00
Esraa-Exp f8d75d5123
Merge pull request #2723 from expsa/Esraa-ensan-sale_tasks
memebership nomination report
2025-04-07 13:49:13 +02:00
Esraa-Exp 77da368c0a memebership nomination report 2025-04-07 13:43:00 +02:00
شركة خبير المحدودة b965121b30 Update github action file 2025-04-06 15:51:11 +02:00
شركة خبير المحدودة 5a661dcf44 Update github action file 2025-03-16 14:18:46 +03:00
FathiaBMExp 8852f24e96
Merge pull request #2658 from expsa/task_11959
fix(odex25_website_event_track_gantt): Task 11959
2025-03-13 15:28:57 +01:00
FathiaBMExp 6195352b90 fix(odex25_website_event_track_gantt): Task 11959
Enhancement.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-13 15:27:57 +01:00
Esraa-Exp 25d7fe227a
Merge pull request #2654 from expsa/Esraa-ensan-sale_tasks
Esraa ensan sale tasks
2025-03-13 16:04:44 +02:00
Esraa-Exp 00fdec4ce0 event partners 2025-03-13 16:02:19 +02:00
Esraa-Exp f4780ef251 Merge branch 'dev_odex25_sales' of https://github.com/expsa/odex25-standard-modules into Esraa-ensan-sale_tasks 2025-03-13 16:00:11 +02:00
Esraa-Exp 4c4f4020c3 event partners 2025-03-13 15:59:03 +02:00
Esraa-Exp 87970e12a9 event partners 2025-03-13 15:49:09 +02:00
FathiaBMExp c25e2043b0
Merge pull request #2650 from expsa/task_11959
fix(odex25_website_event_track_gantt): Task 11959
2025-03-13 14:11:05 +01:00
FathiaBMExp a1641d663d fix(odex25_website_event_track_gantt): Task 11959
Enhancement.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-13 14:08:57 +01:00
FathiaBMExp 20144958cb
Merge pull request #2648 from expsa/task_11959
fix(odex25_website_event_track_gantt): Task 11959
2025-03-13 13:24:18 +01:00
FathiaBMExp 9ba6db705e fix(odex25_website_event_track_gantt): Task 11959
Missing translation.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-13 13:23:02 +01:00
FathiaBMExp 01ba8a17e0
Merge pull request #2646 from expsa/task_11959
Task 11959
2025-03-13 13:13:51 +01:00
FathiaBMExp 29590996a3 fix(odex25_website_event_track_gantt): Task 11959
Access rights.
Adding field named Contact person.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-13 13:13:04 +01:00
FathiaBMExp dc1212f055 fix(odex25_website_event_track_gantt): Task 11959
Access rights.
Adding field named Contact person.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-13 13:10:43 +01:00
FathiaBMExp da381eaf40
Merge pull request #2638 from expsa/task_11959
fix(odex25_website_event_track_gantt): Task 11959
2025-03-13 09:05:23 +01:00
FathiaBMExp 1a973d8e22 fix(odex25_website_event_track_gantt): Task 11959
Enhancements and Translation.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-13 09:02:00 +01:00
FathiaBMExp 8547f8de34
Merge pull request #2635 from expsa/task_11959
fix(dev_membership): Task 11959
2025-03-13 08:25:21 +01:00
FathiaBMExp 3ad45e0110
fix(dev_membership): Task 11959
Remove unneeded line of code(moved to odex25_website_event_track_gantt)
2025-03-12 16:27:43 +01:00
FathiaBMExp e97bee18d9
Merge pull request #2626 from expsa/task_11959
Task 11959
2025-03-12 12:59:05 +01:00
FathiaBMExp 0f8302fd62 fix(odex25_website_event_track_gantt): Task 11959
Event enhancement.

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-12 12:57:17 +01:00
FathiaBMExp ddd22a495d fix(odex25_event): Task 11959
Delete unneeded line of code (moved to odex25_website_event_track_gantt module).

Signed-off-by: FathiaBMExp <f.mohamed@exp-sa.com>
2025-03-12 12:56:30 +01:00
Esraa-Exp 13ae2b4011
Merge pull request #2612 from expsa/Esraa-ensan-sale_tasks
partner creation in events
2025-03-10 06:27:39 +02:00
Esraa-Exp 1e63f11cc8 partner creation in events 2025-03-10 06:25:46 +02:00
Manar416 1a148a41ff
Merge pull request #2599 from expsa/manar_dev_sales_6_03
UPDATE dev_membership
2025-03-06 13:44:02 +02:00
manar 4fcc58570c UPDATE dev_membership 2025-03-06 13:43:13 +02:00
Esraa-Exp eb1fb772c9
Merge pull request #2459 from expsa/Esraa-ensan-sale_tasks
fix bug
2025-02-18 20:27:32 +02:00
Esraa-Exp d250fa055c fix bug 2025-02-18 20:26:35 +02:00
Manar416 26aa515673
Merge pull request #2453 from expsa/manar_dev_sales_16_2
UPDATE dev_membership
2025-02-18 11:26:25 +02:00
manar 4200689654 UPDATE dev_membership 2025-02-18 11:25:44 +02:00
شركة خبير المحدودة d29672bd90 Update github action file 2024-12-25 21:32:05 +03:00
شركة خبير المحدودة bb63641c09 Update github action file 2024-12-25 21:31:57 +03:00
شركة خبير المحدودة ee48690a2f Update github action file 2024-12-22 13:00:02 +03:00
شركة خبير المحدودة 1c62d91fa3 Update github action file 2024-12-16 07:10:17 +03:00
mazenmuhamad cd5775e972
Merge pull request #1861 from expsa/zen_events_app
link =url
2024-12-02 10:18:56 +02:00