Commit Graph

656 Commits (a59c60f79a2ed5d0bbf3c1a238697940530ce771)

Author SHA1 Message Date
Elham Rababh 7dfc700d26 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into product_detail_page 3 years ago
Elham Rababh 47e19c4ab5 add loader and cache on images 3 years ago
Sikander Saleem 5410b826c3 prescriptions new ui updated. 3 years ago
Mohammad Aljammal b175fb7ce0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_product_tile 3 years ago
mosazaid 6acb8031d0 fix bugs pharmacy home 3 years ago
mosazaid 594b2710b3 fix bugs pharmacy home 3 years ago
haroon amjad 22c6a8ce42 no message 3 years ago
haroon amjad 85d68b0388 ereferral fixes 3 years ago
Mohammad Aljammal 9e31d497ed fix wish list issue 3 years ago
Sikander Saleem 28c0450544 lab result filterName improvement. 3 years ago
haroon amjad f6d779431a fixes 3 years ago
haroon amjad 46cc73bdd7 CMC changes 3 years ago
haroon amjad 8cc36ae848 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad dfafb6b664 fixes 3 years ago
mosazaid 185d66e342 fix bugs pharmacy home 3 years ago
Sikander Saleem 3403e07aba recall prescription order log when refill or cancel order. 3 years ago
mosazaid f47d59c43f fix bugs pharmacy home 3 years ago
Haroon Amjad 062ca5c11c EReferral fixes 3 years ago
haroon amjad c91b8ce777 My Vaccines design revamped 3 years ago
haroon amjad dfeb249a54 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
haroon amjad a4a2389a78 updates & fixes 3 years ago
mosazaid fdb61c78c5 fix bugs pharmacy home 3 years ago
Sultan Khan fc9f2fc34e Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 08933632d3 tracker services done rrt in progress 3 years ago
mosazaid a398ede172 fix bugs pharmacy home 3 years ago
haroon amjad 184942e891 Covid Payment fixes 3 years ago
mosazaid f329eea798 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_fix_bugs 3 years ago
mosazaid 01a77d5352 fix bugs pharmacy 3 years ago
Mohammad Aljammal 8c7f397ac8 Merge branch 'pharmacy_fix' into 'development'
Pharmacy fix

See merge request Cloud_Solution/diplomatic-quarter!397
3 years ago
hussam al-habibeh dbf7ebf287 fix most viewed & best sellers moduls 3 years ago
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
Elham Rababh cc88f0f81e first step of fixing 3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
haroon amjad af7b27258c Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan d535cb421d bug fixes 3 years ago
haroon amjad 4ac0845003 updates & fixes 3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
haroon amjad bf4709fef6 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/medical/prescriptions/prescription_details_page.dart
3 years ago
haroon amjad 304ba8afa4 bas app client fixes 3 years ago
haroon amjad 05354f72cc pharmacy import fixes 3 years ago
haroon amjad b51989e798 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/pharmacies/compare.dart
#	lib/pages/pharmacies/my_reviews.dart
#	lib/pages/pharmacies/wishlist.dart
3 years ago
Sikander Saleem f0bb94c422 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 298a8f4cff Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/config/config.dart
#	lib/core/service/AlHabibMedicalService/customer_addresses_service.dart
#	lib/pages/DrawerPages/family/my-family.dart
3 years ago
Sultan Khan 1d36076320 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan dd58b8637b bug fixs 3 years ago
Fatimah Alshammari 7ebeb8cb4b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/parent_categorise_page.dart
#	lib/pages/sub_categorise_page.dart
3 years ago
Mohammad Aljammal 473f372a85 Merge branch 'blood_pressure' into 'development'
fix pharmacy products filtering

See merge request Cloud_Solution/diplomatic-quarter!388
3 years ago
hussam al-habibeh cb9d8cb9d9 fix pharmacy products filtering 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
Fatimah Alshammari 8c0dca781c fixed compare issues and arabic version 3 years ago
Mirza.Shafique 96b971ef01 CMC 1.6 3 years ago
Sultan Khan 32f62fbe56 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
haroon amjad 948f4fc6b8 CMC Add address fixes 3 years ago
Sultan Khan 4d00664045 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan c6404a2a0b tracker services 3 years ago
haroon amjad 2d7c7239c5 Health Converters fixes 3 years ago
haroon amjad 2bba42b574 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
haroon amjad f795ba24c5 updates & fixes 3 years ago
Mirza.Shafique e890c80831 CMC 1.3 3 years ago
haroon amjad aadcfdc7bc Insurance Approval fixes 3 years ago
haroon amjad 25fb5decc0 Ask Doctor page fixes 3 years ago
haroon amjad d4a4165ef3 Minor fixes in Eye Measurements 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
haroon amjad 45272d251c Updates & fixes 3 years ago
Fatimah Alshammari 62167baec5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 6d72be2a73 fixed cart order issues 3 years ago
Sultan Khan d2d22ff1fc Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development_new_design_2.0 3 years ago
Sultan Khan 73ff5c4707 Bug fixes 3 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 3 years ago
Mirza.Shafique 4f85652562 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique f577905dcb eye measurment new design 3 years ago
haroon amjad e679c7df0d updates & fixes 3 years ago
haroon amjad a10253736a Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/confirm-login.dart
#	lib/pages/login/login.dart
3 years ago
haroon amjad 44d59ed01a updates & fixes 3 years ago
Sikander Saleem fab051f9e7 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/others/app_scaffold_widget.dart
3 years ago
Mohammad Aljammal 55f9bbcba4 Merge branch 'fatima-new' into 'development'
Fatima new

See merge request Cloud_Solution/diplomatic-quarter!379
3 years ago
Sikander Saleem a61fea551c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/ErService/AmbulanceRequestIndexPages/Summary.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 8cb9a5e619 updates 3 years ago
haroon amjad faff3b90cb Merge branch 'development' into Haroon
# Conflicts:
#	lib/core/service/er/am_service.dart
3 years ago
haroon amjad e9ec2e2faf Ambulance request APIs revamped 3 years ago
Sultan Khan abcd207554 schedule page fix 3 years ago
Fatimah Alshammari f09cdd944d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 1a0e1f47a6 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/BookAppointment/components/DocAvailableAppointments.dart
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sultan Khan 1726f8cc11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
haroon amjad 4c2b70fcb5 Merge branch 'development' into Haroon 3 years ago
haroon amjad 21c3686e05 Ambulance request services revamping 3 years ago
Sikander Saleem bdb7f29d4c Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/BookAppointment/DentalComplaints.dart
#	lib/pages/login/login.dart
3 years ago
Fatimah Alshammari b6981299d9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari 239ad530ce fixed isuues 3 years ago
Mohammad Aljammal 36142f0f6d Merge branch 'fix_bug_pharmacy' into 'development'
fix bugs pharmacy

See merge request Cloud_Solution/diplomatic-quarter!375
3 years ago
mosazaid a2e60e7584 fix bugs pharmacy 3 years ago
Sikander Saleem ca363adee2 merge & improvements 3 years ago
Sikander Saleem 6191377914 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
#	lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
3 years ago
Fatimah Alshammari 72ba0c7c74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new 3 years ago
Fatimah Alshammari f3b545ff74 fixed products issues 3 years ago
Sultan Khan b116079843 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 4325bd3448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan 5fe6a6c3dd doctor schedule 3 years ago
haroon amjad e96157c74a Covid certificate passport CR implemented 3 years ago
haroon amjad 73097d15de Covid Lab result generate certificate implemented 3 years ago