Commit Graph

1429 Commits (9f355440fcad412e917def2d292e53ded423bd56)
 

Author SHA1 Message Date
enadhilal 0cb493d56c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/pages/pharmacies/product_detail.dart
4 years ago
enadhilal 0c6fb67718 fixed issues 4 years ago
Fatimah Alshammari 42bf76f712 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
4 years ago
Zohaib Iqbal Kambrani 15ec3ec9b9 Translation Track Driver, enhancement, initial camera 4 years ago
Zohaib Iqbal Kambrani 63663f1b24 Track Delivery Driver Completed 4 years ago
Fatimah Alshammari ac32ba998c fixed order isuee 4 years ago
Mohammad Aljammal d84d60dc56 Merge branch 'pharmacy-bugs' into 'development'
pharmacy bugs fixed

See merge request Cloud_Solution/diplomatic-quarter!272
4 years ago
Zohaib Iqbal Kambrani 516df96e21 no message 4 years ago
hussam al-habibeh e050f87a64 pharmacy bugs 4 years ago
hussam al-habibeh 8c58dced7d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/core/service/pharmacy_categorise_service.dart
	lib/pages/final_products_page.dart
4 years ago
hussam al-habibeh 1b76d9c192 pharmacy bugs fixed 4 years ago
Mohammad Aljammal a211248cfa Merge branch 'fix-pharmacy' into 'development'
Fix pharmacy

See merge request Cloud_Solution/diplomatic-quarter!271
4 years ago
mosazaid 125dd27a00 Merge branch 'development' into fix-pharmacy 4 years ago
mosazaid 5d0a122689 fix bugs 4 years ago
Mohammad Aljammal 30d525791d Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!268
4 years ago
Mohammad Aljammal e6da54c201 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 2ec9331d2f Merge branch 'fix-pharmacy' into 'development'
Fix pharmacy

See merge request Cloud_Solution/diplomatic-quarter!269
4 years ago
Mohammad Aljammal 20ad10b9dc Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal b9d043fd7c Merge branch 'prescription_delivery' into 'development'
Done Prescription Delivery Address

See merge request Cloud_Solution/diplomatic-quarter!270
4 years ago
Mohammad Aljammal 8899bdf460 Done Prescription Delivery Address 4 years ago
mosazaid d02b74142a Merge branch 'development' into fix-pharmacy
# Conflicts:
#	lib/core/service/client/base_app_client.dart
4 years ago
mosazaid 1a45f99606 some fixes on pharmacy 4 years ago
haroon amjad 5e8e3806d6 Covid Drive-Thru implemented 4 years ago
Sultan Khan 3e947dda37 Merge branch 'sultan-patientapp' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan e20eed2f6e voice command changes merged 4 years ago
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
haroon amjad ba10014b46 Merge branch 'development' into Haroon 4 years ago
enadhilal 60648d368f Merge branch 'development' into enad_pharmacy2 4 years ago
enadhilal 830e871e2c Merge branch 'development' into enad_pharmacy2
# Conflicts:
#	lib/config/config.dart
#	lib/core/viewModels/AlHabibMedicalService/health-calculator/Bariatrics-viewmodel.dart
4 years ago
Mohammad Aljammal 4d950d3933 Merge branch 'prescription_delivery' into 'development'
Fix the Authentication Pharmacy

See merge request Cloud_Solution/diplomatic-quarter!267
4 years ago
Mohammad Aljammal 0632af3fb5 Fix the Authentication Pharmacy 4 years ago
Mohammad Aljammal b8ded38dc2 Merge branch 'prescription_delivery' into 'development'
add Prescription Delivery Address Page and fix the Authentication Pharmacy

See merge request Cloud_Solution/diplomatic-quarter!266
4 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 4 years ago
haroon amjad 83cca264f1 Merge branch 'LamaHerbish' into Haroon 4 years ago
HMG\Lama.Herbish 031be1ac56 fixes 4 years ago
haroon amjad 0dc35f1270 Merge branch 'development' into Haroon 4 years ago
Mohammad Aljammal 2ed1d244d8 Merge branch 'fix-pharmacy' into 'development'
fix pharmacy auth

See merge request Cloud_Solution/diplomatic-quarter!265
4 years ago
mosazaid b70c7d7d05 fix pharmacy auth 4 years ago
enadhilal 292e983614 fixing issues 4 years ago
enadhilal de4af313fa Merge branch 'development' into enad_pharmacy2 4 years ago
enadhilal 57e9599f78 Merge branch 'development' into enad_pharmacy2 4 years ago
haroon amjad f72c860516 Merge branch 'development' into Haroon 4 years ago
haroon amjad 60ea0465fd fixes & updates 4 years ago
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

See merge request Cloud_Solution/diplomatic-quarter!264
4 years ago
haroon amjad 13f6015cf0 Merge branch 'development' into Haroon 4 years ago
haroon amjad 69649ff7f8 added verified icon in homepage when patient is logged in 4 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
Mohammad Aljammal ddea17a87c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!263
4 years ago
haroon amjad 9ecf745747 fixes 4 years ago