Commit Graph

122 Commits (e53ba65dddfd332ea0a57e4748ec3cfcd010a9f1)

Author SHA1 Message Date
Sikander Saleem e3bf988df5 map picker, firebase improvement and changes for v2.5 3 years ago
haroon amjad 90b821a37d Offers & packages UI completed 3 years ago
haroon amjad b752b42a34 Updates & fixes 3 years ago
haroon amjad f995a9fa8e Ambulance request UI revamped 3 years ago
haroon amjad 894cc0e336 Updates & fixes 3 years ago
haroon amjad 72784f68b9 Fixes & updates 3 years ago
haroon amjad f029aaa1c6 Fixes & code optimizations 3 years ago
Sikander Saleem d8476df6dd Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_one_page.dart
#	lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_home_health_care_page.dart
3 years ago
Sikander Saleem 4858f8883a blood donation dialog change & improvements. 3 years ago
haroon amjad be91844868 Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sikander Saleem 7641da8122 Merge branch 'new_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/widgets/hospital_location.dart
3 years ago
Sikander Saleem 7c4edf971a emergency nearest ui changes 3 years ago
haroon amjad 1fff2dad25 Smartwatch updates 3 years ago
Mirza.Shafique 0ba4e9047b design fixes 1.0 3 years ago
Sikander Saleem 706832a1cb Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/core/viewModels/pharmacyModule/pharmacy_module_view_model.dart
#	lib/core/viewModels/pharmacyModule/product_detail_view_model.dart
#	lib/locator.dart
#	lib/main.dart
#	lib/pages/final_products_page.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/parent_categorise_page.dart
#	lib/pages/pharmacies/product_detail.dart
#	lib/pages/pharmacies/screens/cart-order-preview.dart
#	lib/pages/pharmacies/screens/pharmacy_module_page.dart
#	lib/pages/pharmacies/widgets/ProductTileItem.dart
#	lib/pages/search_products_page.dart
#	lib/services/pharmacy_services/product_detail_service.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/buttons/secondary_button.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	lib/widgets/others/app_scafold_detail_page.dart
#	lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart
3 years ago
haroon amjad 5f963b0327 Translation updates, CMC, HHC & RRT APIs updates 3 years ago
Sikander Saleem 0b4305de03 all dialog changes and improvements (cont). 3 years ago
haroon amjad cb220031dd Updates & fixes 3 years ago
haroon amjad 259581c4f8 updates & fixes 3 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
3 years ago
Sultan Khan 2c1d7c511e family file changes 3 years ago
haroon amjad 01ca8b8f84 updates & fixes 3 years ago
haroon amjad 46a572674f Merge branch 'development_new_design_2.0' into haroon-new-design 3 years ago
Sultan Khan 1b387c2dbf changes pushed 3 years ago
haroon amjad 2690bddcac Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/AppointmentDetails.dart
#	lib/uitl/translations_delegate_base.dart
3 years ago
haroon amjad 5163c826ad Updates & fixes 3 years ago
Sultan Khan d514f64870 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 3 years ago
Sultan Khan 76e16594ba FAMILY FILES 3 years ago
Elham Rababh 055b888ba2 fix address 3 years ago
haroon amjad 89e1aa70c0 updates 3 years ago
haroon amjad 22c6a8ce42 no message 3 years ago
Sultan Khan fee23de1fd hhc changes 3 years ago
haroon amjad f6d779431a fixes 3 years ago
Sultan Khan 5fe0214e04 bug fixes 3 years ago
Sultan Khan 5b988dff4f BUG FIXES 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
haroon amjad 46d800c0c6 UI updates & fixes 3 years ago
haroon amjad a075d53dd5 UI updates & fixes 3 years ago
haroon amjad 92bfe27a6e updates & fixes 3 years ago
haroon amjad 7467da7409 Imports organized 3 years ago
haroon amjad 0fe4a21388 updates & fixes 3 years ago
haroon amjad 9ffe064a3b updates & fixes 3 years ago
Sikander Saleem d9c1b8b8ea Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/main.dart
#	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/medical/ask_doctor/ask_doctor_home_page.dart
#	lib/pages/medical/eye/EyeMeasurementsPage.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
3 years ago
haroon amjad 4469ae1209 updates & fixes 3 years ago
Sikander Saleem ef5f737084 Merge branch 'development' into development_new_design_2.0 3 years ago
haroon amjad e679c7df0d updates & fixes 3 years ago
Sikander Saleem 62ca009404 improvement. 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 b83318faf8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!382
3 years ago